fix(android_intent_plus): Remove embedding v1 reference & update dependencies

packages/android_intent_plus/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.0.1
+
+- Upgrade dependencies and Android compile version
+- Remove some leftover code of Android v1 embedding
+
 ## 3.0.0
 
 - Remove deprecated method `registerWith` (of Android v1 embedding)

packages/android_intent_plus/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
     }
 }
 
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
@@ -37,9 +37,9 @@ android {
 }
 
 dependencies {
-    compileOnly 'androidx.annotation:annotation:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
-    testImplementation 'androidx.test:core:1.0.0'
+    compileOnly 'androidx.annotation:annotation:1.1.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:3.11.1'
+    testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'org.robolectric:robolectric:4.3'
 }

packages/android_intent_plus/android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="dev.fluttercommunity.plus.androidintent">
+<manifest package="dev.fluttercommunity.plus.androidintent">
 </manifest>

packages/android_intent_plus/example/android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,7 +34,7 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.androidintentexample"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -54,8 +54,8 @@ flutter {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }

packages/android_intent_plus/example/android/app/src/main/AndroidManifest.xml

@@ -14,14 +14,9 @@
     android:name="io.flutter.app.FlutterApplication"
     android:icon="@mipmap/ic_launcher"
     android:label="android_intent_example">
-    <activity
-      android:name=".EmbeddingV1Activity"
-      android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
-      android:hardwareAccelerated="true"
-      android:theme="@android:style/Theme.Black.NoTitleBar"
-      android:windowSoftInputMode="adjustResize"></activity>
     <activity
       android:name=".MainActivity"
+      android:exported="true"
       android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
       android:hardwareAccelerated="true"
       android:theme="@android:style/Theme.Black.NoTitleBar"
@@ -41,9 +36,10 @@
       android:name="flutterEmbedding"
       android:value="2" />
 
-    <receiver android:name=".MyBroadcastReceiver">
+    <receiver android:name=".MyBroadcastReceiver"
+      android:exported="true">
       <intent-filter>
-        <action android:name="com.example.broadcast"></action>
+        <action android:name="com.example.broadcast" />
       </intent-filter>
     </receiver>
   </application>

packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/MainActivity.java

@@ -2,18 +2,14 @@
 
 import android.content.IntentFilter;
 import android.os.Bundle;
-import dev.fluttercommunity.plus.androidintent.AndroidIntentPlugin;
-import io.flutter.app.FlutterActivity;
+import io.flutter.embedding.android.FlutterActivity;
 
 public class MainActivity extends FlutterActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-    AndroidIntentPlugin.registerWith(
-        registrarFor("dev.fluttercommunity.plus.androidintent.AndroidIntentPlugin"));
-
     IntentFilter filter = new IntentFilter("com.example.broadcast");
     MyBroadcastReceiver receiver = new MyBroadcastReceiver();
     registerReceiver(receiver, filter);

packages/android_intent_plus/example/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
     }
 }
 

packages/android_intent_plus/example/android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8=true

packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Oct 05 13:40:15 CEST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+zipStoreBase=GRADLE_USER_HOME

packages/android_intent_plus/pubspec.yaml

@@ -1,6 +1,6 @@
 name: android_intent_plus
 description: Flutter plugin for launching Android Intents. Not supported on iOS.
-version: 3.0.0
+version: 3.0.1
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/