diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md index 6b1b3780c4c2..8ccb04d4a6e8 100644 --- a/packages/connectivity/CHANGELOG.md +++ b/packages/connectivity/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.5+1 + +* 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 * Support the v2 Android embedder. diff --git a/packages/connectivity/android/build.gradle b/packages/connectivity/android/build.gradle index 3012844d8778..1767ef4546cd 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/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/pubspec.yaml b/packages/connectivity/pubspec.yaml index 636c43af2fae..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.5 +version: 0.4.5+1 flutter: plugin: