From b2f515b3d3dce13ffaa60ff2f3464e7946e49c5b Mon Sep 17 00:00:00 2001 From: Xiao Yu Date: Wed, 11 Dec 2019 13:30:01 -0800 Subject: [PATCH 1/5] post-stable Android cleanup for battery plugin --- packages/battery/android/build.gradle | 26 ------------------- .../plugins/battery/BatteryPlugin.java | 2 +- .../android/app/src/main/AndroidManifest.xml | 5 +++- .../batteryexample/EmbedderV1Activity.java | 6 +++-- .../plugins/batteryexample/MainActivity.java | 16 ------------ 5 files changed, 9 insertions(+), 46 deletions(-) delete mode 100644 packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/MainActivity.java diff --git a/packages/battery/android/build.gradle b/packages/battery/android/build.gradle index ecd2e1cbb2c8..ff485fbc6b29 100644 --- a/packages/battery/android/build.gradle +++ b/packages/battery/android/build.gradle @@ -32,29 +32,3 @@ android { disable 'InvalidPackage' } } - -// TODO(amirh): 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/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java b/packages/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java index 1bf3c249552d..e8c9177beafa 100644 --- a/packages/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java +++ b/packages/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java @@ -40,7 +40,7 @@ public static void registerWith(PluginRegistry.Registrar registrar) { @Override public void onAttachedToEngine(FlutterPluginBinding binding) { onAttachedToEngine( - binding.getApplicationContext(), binding.getFlutterEngine().getDartExecutor()); + binding.getApplicationContext(), binding.getBinaryMessenger()); } private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) { diff --git a/packages/battery/example/android/app/src/main/AndroidManifest.xml b/packages/battery/example/android/app/src/main/AndroidManifest.xml index e76af9c8dbfe..d44a8ac5757a 100644 --- a/packages/battery/example/android/app/src/main/AndroidManifest.xml +++ b/packages/battery/example/android/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ - + diff --git a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java index f04a2e2ca2f9..8c2818c8e86d 100644 --- a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java +++ b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java @@ -6,12 +6,14 @@ import android.os.Bundle; import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; +import io.flutter.plugins.battery.BatteryPlugin; +import dev.flutter.plugins.e2e.E2EPlugin; public class EmbedderV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); + BatteryPlugin.registerWith(registrarFor("io.flutter.plugins.battery.BatteryPlugin")); + E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); } } diff --git a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/MainActivity.java b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/MainActivity.java deleted file mode 100644 index 26ae8ecc2091..000000000000 --- a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/MainActivity.java +++ /dev/null @@ -1,16 +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.batteryexample; - -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; -import io.flutter.plugins.battery.BatteryPlugin; - -public class MainActivity extends FlutterActivity { - @Override - public void configureFlutterEngine(FlutterEngine flutterEngine) { - flutterEngine.getPlugins().add(new BatteryPlugin()); - } -} From a9515f92d2e6300db86dd11a184d603045d0612b Mon Sep 17 00:00:00 2001 From: Xiao Yu Date: Wed, 11 Dec 2019 13:31:45 -0800 Subject: [PATCH 2/5] bump version --- packages/battery/CHANGELOG.md | 4 ++++ packages/battery/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/battery/CHANGELOG.md b/packages/battery/CHANGELOG.md index 64ccd1cb641e..ac419795c0e3 100644 --- a/packages/battery/CHANGELOG.md +++ b/packages/battery/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.1+7 + +* Clean up various Android workarounds no longer needed after framework v1.12. + ## 0.3.1+6 * Remove the deprecated `author:` field from pubspec.yaml diff --git a/packages/battery/pubspec.yaml b/packages/battery/pubspec.yaml index 615f6edaf0bc..48011fc60f13 100644 --- a/packages/battery/pubspec.yaml +++ b/packages/battery/pubspec.yaml @@ -2,7 +2,7 @@ name: battery description: Flutter plugin for accessing information about the battery state (full, charging, discharging) on Android and iOS. homepage: https://github.com/flutter/plugins/tree/master/packages/battery -version: 0.3.1+6 +version: 0.3.1+7 flutter: plugin: From 3c577e0f4f2fe2a99b090c5e424f7ad9d89fc8c6 Mon Sep 17 00:00:00 2001 From: Xiao Yu Date: Wed, 11 Dec 2019 13:44:56 -0800 Subject: [PATCH 3/5] autoformat --- .../main/java/io/flutter/plugins/battery/BatteryPlugin.java | 3 +-- .../io/flutter/plugins/batteryexample/EmbedderV1Activity.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java b/packages/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java index e8c9177beafa..c17cfc133176 100644 --- a/packages/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java +++ b/packages/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java @@ -39,8 +39,7 @@ public static void registerWith(PluginRegistry.Registrar registrar) { @Override public void onAttachedToEngine(FlutterPluginBinding binding) { - onAttachedToEngine( - binding.getApplicationContext(), binding.getBinaryMessenger()); + onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); } private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) { diff --git a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java index 8c2818c8e86d..7ccc9c1e2fd3 100644 --- a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java +++ b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java @@ -5,9 +5,9 @@ package io.flutter.plugins.batteryexample; import android.os.Bundle; +import dev.flutter.plugins.e2e.E2EPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.battery.BatteryPlugin; -import dev.flutter.plugins.e2e.E2EPlugin; public class EmbedderV1Activity extends FlutterActivity { @Override From d95fce57bc8ad81b1a21890bcd52d007387df921 Mon Sep 17 00:00:00 2001 From: Xiao Yu Date: Tue, 17 Dec 2019 10:43:46 -0800 Subject: [PATCH 4/5] move test to no mainactivity too --- .../java/io/flutter/plugins/battery/MainActivityTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/MainActivityTest.java b/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/MainActivityTest.java index 16165ad2e66f..922dc6a74cc1 100644 --- a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/MainActivityTest.java +++ b/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/MainActivityTest.java @@ -6,10 +6,11 @@ import androidx.test.rule.ActivityTestRule; import dev.flutter.plugins.e2e.FlutterRunner; +import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; @RunWith(FlutterRunner.class) -public class MainActivityTest { - @Rule public ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class); +public class FlutterActivityTest { + @Rule public ActivityTestRule rule = new ActivityTestRule<>(FlutterActivity.class); } From ddd41e6729fe9db26294c8b3bf69b207813bad40 Mon Sep 17 00:00:00 2001 From: Xiao Yu Date: Tue, 17 Dec 2019 15:20:28 -0800 Subject: [PATCH 5/5] autoformat --- .../{MainActivityTest.java => FlutterActivityTest.java} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/{MainActivityTest.java => FlutterActivityTest.java} (81%) diff --git a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/MainActivityTest.java b/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java similarity index 81% rename from packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/MainActivityTest.java rename to packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java index 922dc6a74cc1..1986d0a55c32 100644 --- a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/MainActivityTest.java +++ b/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java @@ -12,5 +12,6 @@ @RunWith(FlutterRunner.class) public class FlutterActivityTest { - @Rule public ActivityTestRule rule = new ActivityTestRule<>(FlutterActivity.class); + @Rule + public ActivityTestRule rule = new ActivityTestRule<>(FlutterActivity.class); }