diff --git a/packages/android_intent_plus/CHANGELOG.md b/packages/android_intent_plus/CHANGELOG.md index c1a992f3f3..d6d505bc8a 100644 --- a/packages/android_intent_plus/CHANGELOG.md +++ b/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) diff --git a/packages/android_intent_plus/android/build.gradle b/packages/android_intent_plus/android/build.gradle index 47f58e4907..c455cd43a7 100644 --- a/packages/android_intent_plus/android/build.gradle +++ b/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' } diff --git a/packages/android_intent_plus/android/src/main/AndroidManifest.xml b/packages/android_intent_plus/android/src/main/AndroidManifest.xml index 978d04ae70..e513927522 100644 --- a/packages/android_intent_plus/android/src/main/AndroidManifest.xml +++ b/packages/android_intent_plus/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + diff --git a/packages/android_intent_plus/example/android/app/build.gradle b/packages/android_intent_plus/example/android/app/build.gradle index 7862f2a7af..d286eb003e 100644 --- a/packages/android_intent_plus/example/android/app/build.gradle +++ b/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' } diff --git a/packages/android_intent_plus/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java b/packages/android_intent_plus/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java deleted file mode 100644 index db000f0f99..0000000000 --- a/packages/android_intent_plus/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.flutter.plugins.androidintentexample; - -import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterRunner; -import org.junit.Rule; -import org.junit.runner.RunWith; - -@RunWith(FlutterRunner.class) -public class EmbeddingV1ActivityTest { - @Rule - public ActivityTestRule rule = - new ActivityTestRule<>(EmbeddingV1Activity.class); -} diff --git a/packages/android_intent_plus/example/android/app/src/main/AndroidManifest.xml b/packages/android_intent_plus/example/android/app/src/main/AndroidManifest.xml index c955419551..eb1c0f3547 100644 --- a/packages/android_intent_plus/example/android/app/src/main/AndroidManifest.xml +++ b/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"> - - + - + diff --git a/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java b/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java deleted file mode 100644 index c510fc8f16..0000000000 --- a/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package io.flutter.plugins.androidintentexample; - -import android.os.Bundle; -import dev.fluttercommunity.plus.androidintent.AndroidIntentPlugin; -import io.flutter.app.FlutterActivity; - -public class EmbeddingV1Activity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - AndroidIntentPlugin.registerWith( - registrarFor("dev.fluttercommunity.plus.androidintent.AndroidIntentPlugin")); - } -} diff --git a/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/MainActivity.java b/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/MainActivity.java index 0c26573915..6b054db8d4 100644 --- a/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/MainActivity.java +++ b/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/MainActivity.java @@ -2,8 +2,7 @@ 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 { @@ -11,9 +10,6 @@ public class MainActivity extends FlutterActivity { 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); diff --git a/packages/android_intent_plus/example/android/build.gradle b/packages/android_intent_plus/example/android/build.gradle index 456d020f6e..9971094448 100644 --- a/packages/android_intent_plus/example/android/build.gradle +++ b/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' } } diff --git a/packages/android_intent_plus/example/android/gradle.properties b/packages/android_intent_plus/example/android/gradle.properties index d2032bce8b..08f2b5f91b 100644 --- a/packages/android_intent_plus/example/android/gradle.properties +++ b/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 diff --git a/packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties index 019065d1d6..a0acea0e80 100644 --- a/packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/packages/android_intent_plus/pubspec.yaml b/packages/android_intent_plus/pubspec.yaml index 73351a6330..578316d946 100644 --- a/packages/android_intent_plus/pubspec.yaml +++ b/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/