From c6bf7d1febe5c060fb67293533420318c2d30288 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Mon, 9 Mar 2020 07:25:36 +0000 Subject: [PATCH 1/5] Update V2 plugin migration to match current flutter stable --- packages/device_info/android/build.gradle | 26 ------------------- .../plugins/deviceinfo/DeviceInfoPlugin.java | 3 +-- .../android/app/src/main/AndroidManifest.xml | 11 +------- .../EmbeddingV1Activity.java | 5 ++-- .../deviceinfoexample/MainActivity.java | 20 -------------- .../deviceinfoexample/MainActivityTest.java | 15 ----------- packages/device_info/example/pubspec.yaml | 5 ---- packages/device_info/pubspec.yaml | 2 +- 8 files changed, 6 insertions(+), 81 deletions(-) delete mode 100644 packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/MainActivity.java delete mode 100644 packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/MainActivityTest.java diff --git a/packages/device_info/android/build.gradle b/packages/device_info/android/build.gradle index d1dd790732f1..92dc70f6ed72 100644 --- a/packages/device_info/android/build.gradle +++ b/packages/device_info/android/build.gradle @@ -32,29 +32,3 @@ android { disable 'InvalidPackage' } } - -// TODO(cyanglaz): Remove this hack once androidx.lifecycle is included on stable. https://github.com/flutter/flutter/issues/42348 -afterEvaluate { - def containsEmbeddingDependencies = false - for (def configuration : configurations.all) { - for (def dependency : configuration.dependencies) { - if (dependency.group == 'io.flutter' && - dependency.name.startsWith('flutter_embedding') && - dependency.isTransitive()) - { - containsEmbeddingDependencies = true - break - } - } - } - if (!containsEmbeddingDependencies) { - android { - dependencies { - def lifecycle_version = "1.1.1" - compileOnly "android.arch.lifecycle:runtime:$lifecycle_version" - compileOnly "android.arch.lifecycle:common:$lifecycle_version" - compileOnly "android.arch.lifecycle:common-java8:$lifecycle_version" - } - } - } -} diff --git a/packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java b/packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java index a0435a46e837..8061959c2047 100644 --- a/packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java +++ b/packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java @@ -23,8 +23,7 @@ public static void registerWith(Registrar registrar) { @Override public void onAttachedToEngine(FlutterPlugin.FlutterPluginBinding binding) { - setupMethodChannel( - binding.getFlutterEngine().getDartExecutor(), binding.getApplicationContext()); + setupMethodChannel(binding.getBinaryMessenger(), binding.getApplicationContext()); } @Override diff --git a/packages/device_info/example/android/app/src/main/AndroidManifest.xml b/packages/device_info/example/android/app/src/main/AndroidManifest.xml index 45242ab08b69..99e6291ad3ac 100644 --- a/packages/device_info/example/android/app/src/main/AndroidManifest.xml +++ b/packages/device_info/example/android/app/src/main/AndroidManifest.xml @@ -12,15 +12,6 @@ android:exported="true" android:windowSoftInputMode="adjustResize"> - - - - - - + diff --git a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java b/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java index 0bfaee848dbf..370319e0b790 100644 --- a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java +++ b/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java @@ -6,12 +6,13 @@ import android.os.Bundle; import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; +import io.flutter.plugins.deviceinfo.DeviceInfoPlugin; public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); + DeviceInfoPlugin.registerWith( + registrarFor("io.flutter.plugins.deviceinfo.DeviceInfoPlugin")); } } diff --git a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/MainActivity.java b/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/MainActivity.java deleted file mode 100644 index b820542706e0..000000000000 --- a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/MainActivity.java +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2019 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.deviceinfoexample; - -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; -import io.flutter.plugins.deviceinfo.DeviceInfoPlugin; - -public class MainActivity extends FlutterActivity { - - // TODO(cyanglaz): Remove this once v2 of GeneratedPluginRegistrant rolls to stable. - // https://github.com/flutter/flutter/issues/42694 - @Override - public void configureFlutterEngine(FlutterEngine flutterEngine) { - super.configureFlutterEngine(flutterEngine); - flutterEngine.getPlugins().add(new DeviceInfoPlugin()); - } -} diff --git a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/MainActivityTest.java b/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/MainActivityTest.java deleted file mode 100644 index 36967ebf4564..000000000000 --- a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/MainActivityTest.java +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2019 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.deviceinfoexample; - -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 MainActivityTest { - @Rule public ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class); -} diff --git a/packages/device_info/example/pubspec.yaml b/packages/device_info/example/pubspec.yaml index 89bf430d971c..dc63d8b66126 100644 --- a/packages/device_info/example/pubspec.yaml +++ b/packages/device_info/example/pubspec.yaml @@ -15,8 +15,3 @@ dev_dependencies: flutter: uses-material-design: true - -environment: - sdk: ">=2.0.0-dev.28.0 <3.0.0" - flutter: ">=1.9.1+hotfix.2 <2.0.0" - diff --git a/packages/device_info/pubspec.yaml b/packages/device_info/pubspec.yaml index 06a530bcaab7..02f26c985a65 100644 --- a/packages/device_info/pubspec.yaml +++ b/packages/device_info/pubspec.yaml @@ -26,4 +26,4 @@ dev_dependencies: environment: sdk: ">=2.0.0-dev.28.0 <3.0.0" - flutter: ">=1.10.0 <2.0.0" + flutter: ">=1.12.13+hotfix.5 <2.0.0" From 2d300e0cf1bcf50ceee4068ab8aa1aff07bb8f64 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Mon, 9 Mar 2020 07:26:25 +0000 Subject: [PATCH 2/5] Bumps version, adds changelog --- packages/device_info/CHANGELOG.md | 6 ++++++ packages/device_info/pubspec.yaml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/device_info/CHANGELOG.md b/packages/device_info/CHANGELOG.md index 68aeed8c2cbf..f8ebc409cf79 100644 --- a/packages/device_info/CHANGELOG.md +++ b/packages/device_info/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.4.2+1 + +* Bump the minimum Flutter version to 1.12.13+hotfix.5. +* Remove deprecated API usage warning in AndroidIntentPlugin.java. +* Migrates the Android example to V2 embedding. + ## 0.4.2 * Add systemFeatures to AndroidDeviceInfo. diff --git a/packages/device_info/pubspec.yaml b/packages/device_info/pubspec.yaml index 02f26c985a65..0769f98c83c3 100644 --- a/packages/device_info/pubspec.yaml +++ b/packages/device_info/pubspec.yaml @@ -2,7 +2,7 @@ name: device_info description: Flutter plugin providing detailed information about the device (make, model, etc.), and Android or iOS version the app is running on. homepage: https://github.com/flutter/plugins/tree/master/packages/device_info -version: 0.4.2 +version: 0.4.2+1 flutter: plugin: From cddb3705813cb1a5bea54247e6f65ecc236cba58 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Mon, 9 Mar 2020 09:50:05 +0000 Subject: [PATCH 3/5] Formatting. --- .../flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java b/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java index 370319e0b790..48678a7e6ad1 100644 --- a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java +++ b/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java @@ -12,7 +12,6 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - DeviceInfoPlugin.registerWith( - registrarFor("io.flutter.plugins.deviceinfo.DeviceInfoPlugin")); + DeviceInfoPlugin.registerWith(registrarFor("io.flutter.plugins.deviceinfo.DeviceInfoPlugin")); } } From d122fd9d77015531ed4c57b46f215c2e06ed4233 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Mon, 9 Mar 2020 11:05:37 +0000 Subject: [PATCH 4/5] Bump AGP to 3.6.1 --- packages/device_info/CHANGELOG.md | 1 + packages/device_info/android/build.gradle | 2 +- packages/device_info/example/android/build.gradle | 2 +- .../example/android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/device_info/CHANGELOG.md b/packages/device_info/CHANGELOG.md index f8ebc409cf79..c6f8fb2d2616 100644 --- a/packages/device_info/CHANGELOG.md +++ b/packages/device_info/CHANGELOG.md @@ -3,6 +3,7 @@ * Bump the minimum Flutter version to 1.12.13+hotfix.5. * Remove deprecated API usage warning in AndroidIntentPlugin.java. * Migrates the Android example to V2 embedding. +* Bumps AGP to 3.6.1. ## 0.4.2 diff --git a/packages/device_info/android/build.gradle b/packages/device_info/android/build.gradle index 92dc70f6ed72..58bdfd327631 100644 --- a/packages/device_info/android/build.gradle +++ b/packages/device_info/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.6.1' } } diff --git a/packages/device_info/example/android/build.gradle b/packages/device_info/example/android/build.gradle index 541636cc492a..83f114c21e31 100644 --- a/packages/device_info/example/android/build.gradle +++ b/packages/device_info/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.6.1' } } diff --git a/packages/device_info/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/device_info/example/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1fd..c243e25a0fff 100644 --- a/packages/device_info/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/device_info/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Mon Mar 09 11:05:13 GMT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip From b40b173401f739a27718fb32670832aaee443b0d Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Tue, 10 Mar 2020 07:41:11 +0000 Subject: [PATCH 5/5] Revert the FlutterActivity removal from AndroidManifest.xml --- .../android/app/src/main/AndroidManifest.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/packages/device_info/example/android/app/src/main/AndroidManifest.xml b/packages/device_info/example/android/app/src/main/AndroidManifest.xml index 99e6291ad3ac..f9f91fa39dae 100644 --- a/packages/device_info/example/android/app/src/main/AndroidManifest.xml +++ b/packages/device_info/example/android/app/src/main/AndroidManifest.xml @@ -12,6 +12,20 @@ android:exported="true" android:windowSoftInputMode="adjustResize"> + + + + + + + +