Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[battery] cleanup for Android embedding post 1.12 #2400

Merged
xster merged 5 commits into from
Dec 18, 2019
Merged

[battery] cleanup for Android embedding post 1.12 #2400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2f515b
post-stable Android cleanup for battery plugin
xster Dec 11, 2019
a9515f9
bump version
xster Dec 11, 2019
3c577e0
autoformat
xster Dec 11, 2019
d95fce5
move test to no mainactivity too
xster Dec 17, 2019
ddd41e6
autoformat
xster Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/battery/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
26 changes: 0 additions & 26 deletions packages/battery/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Copy link

@blasten blasten Dec 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

Copy link

@blasten blasten Dec 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this wait a little longer though to wait for the traffic to ramp up?

Copy link
Member Author

@xster xster Dec 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right. Let's not merge this for now. It was just an exercise for us to look at what the new code would look like.

Copy link
Member Author

@xster xster Dec 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

raised the min sdk version to 1.12. Merging on green.

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"
}
}
}
}
3 changes: 1 addition & 2 deletions packages/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ public static void registerWith(PluginRegistry.Registrar registrar) {

@Override
public void onAttachedToEngine(FlutterPluginBinding binding) {
onAttachedToEngine(
binding.getApplicationContext(), binding.getFlutterEngine().getDartExecutor());
onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger());
}

private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) {
Expand Down
6 changes: 4 additions & 2 deletions ...ter/plugins/battery/MainActivityTest.java → .../plugins/battery/FlutterActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@

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<MainActivity> rule = new ActivityTestRule<>(MainActivity.class);
public class FlutterActivityTest {
@Rule
public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);
}
5 changes: 4 additions & 1 deletion packages/battery/example/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<uses-permission android:name="android.permission.INTERNET"/>

<application android:name="io.flutter.app.FlutterApplication" android:label="battery_example" android:icon="@mipmap/ic_launcher">
<activity android:name=".MainActivity"
<activity android:name="io.flutter.embedding.android.FlutterActivity"
android:launchMode="singleTop"
android:theme="@android:style/Theme.Black.NoTitleBar"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
Expand All @@ -22,5 +22,8 @@
android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize">
</activity>
<meta-data
android:name="flutterEmbedding"
android:value="2" />
</application>
</manifest>
6 changes: 4 additions & 2 deletions ...ample/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
package io.flutter.plugins.batteryexample;

import android.os.Bundle;
import dev.flutter.plugins.e2e.E2EPlugin;
import io.flutter.app.FlutterActivity;
import io.flutter.plugins.GeneratedPluginRegistrant;
import io.flutter.plugins.battery.BatteryPlugin;

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"));
Copy link
Member Author

@xster xster Dec 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is a bit unfortunate but we built infra to generate for v1 embedding or v2 embedding toggling between v1 and v2 plugins. We never build infra for toggling between v1 and v2 embedding.

This is probably ok since it's mostly transient but we have to document it in flutter/website#3388

E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin"));
}
}
16 changes: 0 additions & 16 deletions ...ery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/MainActivity.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/battery/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down