From 0b53ccadc88944d4dd945c3449d316e6c97722a0 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 17 Oct 2019 20:15:59 -0700 Subject: [PATCH 1/8] remove AndroidX constraint --- packages/connectivity/CHANGELOG.md | 4 ++++ .../java/io/flutter/plugins/connectivity/Connectivity.java | 7 ------- .../connectivity/ConnectivityBroadcastReceiver.java | 3 +-- .../connectivity/ConnectivityMethodChannelHandler.java | 3 +-- .../connectivity/example/android/app/gradle.properties | 2 -- packages/connectivity/example/android/gradle.properties | 6 +++--- packages/connectivity/ios/Classes/ConnectivityPlugin.m | 4 +++- packages/connectivity/pubspec.yaml | 2 +- 8 files changed, 13 insertions(+), 18 deletions(-) delete mode 100644 packages/connectivity/example/android/app/gradle.properties diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md index 6b1b3780c4c2..3ea86e81878a 100644 --- a/packages/connectivity/CHANGELOG.md +++ b/packages/connectivity/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.6 + +* Fix a regression in 0.4.5 that requires the app to migrate to AndroidX to use the plugin. + ## 0.4.5 * Support the v2 Android embedder. diff --git a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/Connectivity.java b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/Connectivity.java index 605acdb73948..2d07641a42c1 100644 --- a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/Connectivity.java +++ b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/Connectivity.java @@ -11,8 +11,6 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Build; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; /** Reports connectivity related information such as connectivity type and wifi information. */ class Connectivity { @@ -24,7 +22,6 @@ class Connectivity { this.wifiManager = wifiManager; } - @NonNull String getNetworkType() { if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { Network network = connectivityManager.getActiveNetwork(); @@ -44,7 +41,6 @@ String getNetworkType() { return getNetworkTypeLegacy(); } - @Nullable String getWifiName() { WifiInfo wifiInfo = getWifiInfo(); String ssid = null; @@ -53,7 +49,6 @@ String getWifiName() { return ssid; } - @Nullable String getWifiBSSID() { WifiInfo wifiInfo = getWifiInfo(); String bssid = null; @@ -63,7 +58,6 @@ String getWifiBSSID() { return bssid; } - @Nullable String getWifiIPAddress() { WifiInfo wifiInfo = null; if (wifiManager != null) wifiInfo = wifiManager.getConnectionInfo(); @@ -81,7 +75,6 @@ String getWifiIPAddress() { return ip; } - @Nullable private WifiInfo getWifiInfo() { return wifiManager == null ? null : wifiManager.getConnectionInfo(); } diff --git a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityBroadcastReceiver.java b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityBroadcastReceiver.java index d046eceb0fa6..be8b47eff944 100644 --- a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityBroadcastReceiver.java +++ b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityBroadcastReceiver.java @@ -9,7 +9,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; -import androidx.annotation.NonNull; import io.flutter.plugin.common.EventChannel; /** @@ -26,7 +25,7 @@ class ConnectivityBroadcastReceiver extends BroadcastReceiver private Connectivity connectivity; private EventChannel.EventSink events; - ConnectivityBroadcastReceiver(@NonNull Context context, @NonNull Connectivity connectivity) { + ConnectivityBroadcastReceiver(Context context, Connectivity connectivity) { this.context = context; this.connectivity = connectivity; } diff --git a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityMethodChannelHandler.java b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityMethodChannelHandler.java index 488c8efdd15f..931b702d442a 100644 --- a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityMethodChannelHandler.java +++ b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityMethodChannelHandler.java @@ -4,7 +4,6 @@ package io.flutter.plugins.connectivity; -import androidx.annotation.NonNull; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; @@ -21,7 +20,7 @@ class ConnectivityMethodChannelHandler implements MethodChannel.MethodCallHandle * Construct the ConnectivityMethodChannelHandler with a {@code connectivity}. The {@code * connectivity} must not be null. */ - ConnectivityMethodChannelHandler(@NonNull Connectivity connectivity) { + ConnectivityMethodChannelHandler(Connectivity connectivity) { assert (connectivity != null); this.connectivity = connectivity; } diff --git a/packages/connectivity/example/android/app/gradle.properties b/packages/connectivity/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/connectivity/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/connectivity/example/android/gradle.properties b/packages/connectivity/example/android/gradle.properties index a6738207fd15..68a79b123364 100644 --- a/packages/connectivity/example/android/gradle.properties +++ b/packages/connectivity/example/android/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx1536M -android.useAndroidX=true -android.enableJetifier=true -android.enableR8=true +# android.useAndroidX=true +# android.enableJetifier=true +# android.enableR8=true diff --git a/packages/connectivity/ios/Classes/ConnectivityPlugin.m b/packages/connectivity/ios/Classes/ConnectivityPlugin.m index c69871175b01..346e5f1777e2 100644 --- a/packages/connectivity/ios/Classes/ConnectivityPlugin.m +++ b/packages/connectivity/ios/Classes/ConnectivityPlugin.m @@ -155,7 +155,9 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status case kCLAuthorizationStatusAuthorizedWhenInUse: { return @"authorizedWhenInUse"; } - default: { return @"unknown"; } + default: { + return @"unknown"; + } } } diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml index 636c43af2fae..97e6052c112e 100644 --- a/packages/connectivity/pubspec.yaml +++ b/packages/connectivity/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi & mobile/cellular) connectivity on Android and iOS. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity -version: 0.4.5 +version: 0.4.6 flutter: plugin: From dae1f25ca4ab062cc946b5c1fe8e08b770e9dde0 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 17 Oct 2019 20:24:50 -0700 Subject: [PATCH 2/8] remove comments --- packages/connectivity/example/android/gradle.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/connectivity/example/android/gradle.properties b/packages/connectivity/example/android/gradle.properties index 68a79b123364..8bd86f680510 100644 --- a/packages/connectivity/example/android/gradle.properties +++ b/packages/connectivity/example/android/gradle.properties @@ -1,4 +1 @@ org.gradle.jvmargs=-Xmx1536M -# android.useAndroidX=true -# android.enableJetifier=true -# android.enableR8=true From 3040f84d1c8c7a52f1b2b575fd8b85f900aa2183 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 17 Oct 2019 20:31:44 -0700 Subject: [PATCH 3/8] Update ConnectivityPlugin.m --- packages/connectivity/ios/Classes/ConnectivityPlugin.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/connectivity/ios/Classes/ConnectivityPlugin.m b/packages/connectivity/ios/Classes/ConnectivityPlugin.m index 346e5f1777e2..c69871175b01 100644 --- a/packages/connectivity/ios/Classes/ConnectivityPlugin.m +++ b/packages/connectivity/ios/Classes/ConnectivityPlugin.m @@ -155,9 +155,7 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status case kCLAuthorizationStatusAuthorizedWhenInUse: { return @"authorizedWhenInUse"; } - default: { - return @"unknown"; - } + default: { return @"unknown"; } } } From 0d896ebb8a46e359da3849619ae3512afbb60a00 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 17 Oct 2019 22:03:01 -0700 Subject: [PATCH 4/8] fix ci --- packages/connectivity/example/android/gradle.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/connectivity/example/android/gradle.properties b/packages/connectivity/example/android/gradle.properties index 8bd86f680510..a6738207fd15 100644 --- a/packages/connectivity/example/android/gradle.properties +++ b/packages/connectivity/example/android/gradle.properties @@ -1 +1,4 @@ org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true +android.enableR8=true From c098244f961178a768ee7fb5b3a499f2c21a12ea Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 18 Oct 2019 10:18:46 -0700 Subject: [PATCH 5/8] add androidX to plugin's gradle.properties --- packages/connectivity/android/gradle.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/connectivity/android/gradle.properties b/packages/connectivity/android/gradle.properties index 8bd86f680510..4d3226abc21b 100644 --- a/packages/connectivity/android/gradle.properties +++ b/packages/connectivity/android/gradle.properties @@ -1 +1,3 @@ org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file From 438326f3b9633ac45617ad78a563e45240d940dc Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 18 Oct 2019 10:23:51 -0700 Subject: [PATCH 6/8] Update gradle.properties --- packages/connectivity/android/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/connectivity/android/gradle.properties b/packages/connectivity/android/gradle.properties index 4d3226abc21b..94adc3a3f97a 100644 --- a/packages/connectivity/android/gradle.properties +++ b/packages/connectivity/android/gradle.properties @@ -1,3 +1,3 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file +android.enableJetifier=true From db0b6e98c0399a054b3c2b39373080631d4f9a9d Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 18 Oct 2019 12:54:28 -0700 Subject: [PATCH 7/8] fix --- packages/connectivity/CHANGELOG.md | 4 ++-- packages/connectivity/android/build.gradle | 7 ++++--- packages/connectivity/android/gradle.properties | 4 +--- packages/connectivity/pubspec.yaml | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md index 3ea86e81878a..8ccb04d4a6e8 100644 --- a/packages/connectivity/CHANGELOG.md +++ b/packages/connectivity/CHANGELOG.md @@ -1,6 +1,6 @@ -## 0.4.6 +## 0.4.5+1 -* Fix a regression in 0.4.5 that requires the app to migrate to AndroidX to use the plugin. +* Android: Use android.arch.lifecycle instead of androidx.lifecycle:lifecycle in `build.gradle` to support apps that has not been migrated to AndroidX. ## 0.4.5 diff --git a/packages/connectivity/android/build.gradle b/packages/connectivity/android/build.gradle index 3012844d8778..10386e80d8d8 100644 --- a/packages/connectivity/android/build.gradle +++ b/packages/connectivity/android/build.gradle @@ -63,9 +63,10 @@ afterEvaluate { if (!containsEmbeddingDependencies) { android { dependencies { - def lifecycle_version = "2.1.0" - api "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" - api "androidx.lifecycle:lifecycle-runtime:$lifecycle_version" + def lifecycle_version = "1.1.1" + api 'android.arch.lifecycle:runtime:$lifecycle_version' + api 'android.arch.lifecycle:common:$lifecycle_version' + api 'android.arch.lifecycle:common-java8:$lifecycle_version' } } } diff --git a/packages/connectivity/android/gradle.properties b/packages/connectivity/android/gradle.properties index 4d3226abc21b..f98a4cc29f97 100644 --- a/packages/connectivity/android/gradle.properties +++ b/packages/connectivity/android/gradle.properties @@ -1,3 +1 @@ -org.gradle.jvmargs=-Xmx1536M -android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file +org.gradle.jvmargs=-Xmx1536M \ No newline at end of file diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml index 97e6052c112e..fa90f1a6f56f 100644 --- a/packages/connectivity/pubspec.yaml +++ b/packages/connectivity/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi & mobile/cellular) connectivity on Android and iOS. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity -version: 0.4.6 +version: 0.4.5+1 flutter: plugin: From 51f7ce8a672e2826f0db0fff40cfbf81962d381d Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 18 Oct 2019 14:25:25 -0700 Subject: [PATCH 8/8] remove quotes --- packages/connectivity/android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/connectivity/android/build.gradle b/packages/connectivity/android/build.gradle index 10386e80d8d8..1767ef4546cd 100644 --- a/packages/connectivity/android/build.gradle +++ b/packages/connectivity/android/build.gradle @@ -64,9 +64,9 @@ afterEvaluate { android { dependencies { def lifecycle_version = "1.1.1" - api 'android.arch.lifecycle:runtime:$lifecycle_version' - api 'android.arch.lifecycle:common:$lifecycle_version' - api 'android.arch.lifecycle:common-java8:$lifecycle_version' + api "android.arch.lifecycle:runtime:$lifecycle_version" + api "android.arch.lifecycle:common:$lifecycle_version" + api "android.arch.lifecycle:common-java8:$lifecycle_version" } } }