Once this method is executed, an instance of {@code AndroidAlarmManagerPlugin} will be - * connected to, and running against, the associated Flutter execution context. - */ - public static void registerWith(Registrar registrar) { - if (instance == null) { - instance = new AndroidAlarmManagerPlugin(); - } - instance.onAttachedToEngine(registrar.context(), registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); @@ -101,7 +85,6 @@ public void onDetachedFromEngine(FlutterPluginBinding binding) { alarmManagerPluginChannel = null; } - public AndroidAlarmManagerPlugin() {} /** Invoked when the Flutter side of this plugin sends a message to the Android side. */ @Override diff --git a/packages/android_alarm_manager_plus/pubspec.yaml b/packages/android_alarm_manager_plus/pubspec.yaml index 33922d7db2..01e5946c81 100644 --- a/packages/android_alarm_manager_plus/pubspec.yaml +++ b/packages/android_alarm_manager_plus/pubspec.yaml @@ -1,7 +1,7 @@ name: android_alarm_manager_plus description: Flutter plugin for accessing the Android AlarmManager service, and running Dart code in the background when alarms fire. -version: 1.3.1 +version: 2.0.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/android_intent_plus/CHANGELOG.md b/packages/android_intent_plus/CHANGELOG.md index 781abbcba3..c1a992f3f3 100644 --- a/packages/android_intent_plus/CHANGELOG.md +++ b/packages/android_intent_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.0.0 + +- Remove deprecated method `registerWith` (of Android v1 embedding) + ## 2.1.0 - migrate integration_test to flutter sdk diff --git a/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/AndroidIntentPlugin.java b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/AndroidIntentPlugin.java index 53dc2b9e68..1efef8ec8f 100644 --- a/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/AndroidIntentPlugin.java +++ b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/AndroidIntentPlugin.java @@ -4,7 +4,6 @@ import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.embedding.engine.plugins.activity.ActivityAware; import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding; -import io.flutter.plugin.common.PluginRegistry.Registrar; /** * Plugin implementation that uses the new {@code io.flutter.embedding} package. @@ -25,19 +24,6 @@ public AndroidIntentPlugin() { impl = new MethodCallHandlerImpl(sender); } - /** - * Registers a plugin implementation that uses the stable {@code io.flutter.plugin.common} - * package. - * - *
Calling this automatically initializes the plugin. However plugins initialized this way - * won't react to changes in activity or context, unlike {@link AndroidIntentPlugin}. - */ - public static void registerWith(Registrar registrar) { - IntentSender sender = new IntentSender(registrar.activity(), registrar.context()); - MethodCallHandlerImpl impl = new MethodCallHandlerImpl(sender); - impl.startListening(registrar.messenger()); - } - @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { sender.setApplicationContext(binding.getApplicationContext()); diff --git a/packages/android_intent_plus/pubspec.yaml b/packages/android_intent_plus/pubspec.yaml index 8b364a1a1b..73351a6330 100644 --- a/packages/android_intent_plus/pubspec.yaml +++ b/packages/android_intent_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: android_intent_plus description: Flutter plugin for launching Android Intents. Not supported on iOS. -version: 2.1.0 +version: 3.0.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/battery_plus/battery_plus/CHANGELOG.md b/packages/battery_plus/battery_plus/CHANGELOG.md index affd13216a..1be5a9f96e 100644 --- a/packages/battery_plus/battery_plus/CHANGELOG.md +++ b/packages/battery_plus/battery_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0 + +- Remove deprecated method `registerWith` (of Android v1 embedding) + ## 1.2.0 - migrate integration_test to flutter sdk diff --git a/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java b/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java index 6eec835fd7..d6eba33370 100644 --- a/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java +++ b/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java @@ -24,7 +24,6 @@ import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; -import io.flutter.plugin.common.PluginRegistry; import java.util.Locale; /** BatteryPlusPlugin */ @@ -39,12 +38,6 @@ public class BatteryPlusPlugin implements MethodCallHandler, StreamHandler, Flut private static final int POWER_SAVE_MODE_XIAOMI = 1; private static final int POWER_SAVE_MODE_HUAWEI = 4; - /** Plugin registration. */ - public static void registerWith(PluginRegistry.Registrar registrar) { - final BatteryPlusPlugin instance = new BatteryPlusPlugin(); - instance.onAttachedToEngine(registrar.context(), registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); diff --git a/packages/battery_plus/battery_plus/pubspec.yaml b/packages/battery_plus/battery_plus/pubspec.yaml index 6135adaddf..3af3d0d3c1 100644 --- a/packages/battery_plus/battery_plus/pubspec.yaml +++ b/packages/battery_plus/battery_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: battery_plus description: Flutter plugin for accessing information about the battery state(full, charging, discharging). -version: 1.2.0 +version: 2.0.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/connectivity_plus/connectivity_plus/CHANGELOG.md b/packages/connectivity_plus/connectivity_plus/CHANGELOG.md index fd7966c1a7..77e3fe6972 100644 --- a/packages/connectivity_plus/connectivity_plus/CHANGELOG.md +++ b/packages/connectivity_plus/connectivity_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0 + +- Remove deprecated method `registerWith` (of Android v1 embedding) + ## 1.4.0 - [MacOS]: Backport to macOS 10.11 diff --git a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java index 1ab5fbc285..f9daebd136 100644 --- a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java +++ b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java @@ -18,14 +18,6 @@ public class ConnectivityPlugin implements FlutterPlugin { private EventChannel eventChannel; private ConnectivityBroadcastReceiver receiver; - /** Plugin registration. */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - - ConnectivityPlugin plugin = new ConnectivityPlugin(); - plugin.setupChannels(registrar.messenger(), registrar.context()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { setupChannels(binding.getBinaryMessenger(), binding.getApplicationContext()); diff --git a/packages/connectivity_plus/connectivity_plus/pubspec.yaml b/packages/connectivity_plus/connectivity_plus/pubspec.yaml index 2d812d6618..35ec2c11b6 100644 --- a/packages/connectivity_plus/connectivity_plus/pubspec.yaml +++ b/packages/connectivity_plus/connectivity_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: connectivity_plus description: Flutter plugin for discovering the state of the network (WiFi & mobile/cellular) connectivity on Android and iOS. -version: 1.4.0 +version: 2.0.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/device_info_plus/device_info_plus/CHANGELOG.md b/packages/device_info_plus/device_info_plus/CHANGELOG.md index b5601b1397..aeca393c19 100644 --- a/packages/device_info_plus/device_info_plus/CHANGELOG.md +++ b/packages/device_info_plus/device_info_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.0.0 + +- Remove deprecated method `registerWith` (of Android v1 embedding) + ## 2.2.0 - migrate integration_test to flutter sdk diff --git a/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java b/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java index ec5cb6e958..138e1b808d 100644 --- a/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java +++ b/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java @@ -8,19 +8,12 @@ import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.MethodChannel; -import io.flutter.plugin.common.PluginRegistry.Registrar; /** DeviceInfoPlusPlugin */ public class DeviceInfoPlusPlugin implements FlutterPlugin { MethodChannel channel; - /** Plugin registration. */ - public static void registerWith(Registrar registrar) { - DeviceInfoPlusPlugin plugin = new DeviceInfoPlusPlugin(); - plugin.setupMethodChannel(registrar.messenger(), registrar.context()); - } - @Override public void onAttachedToEngine(FlutterPlugin.FlutterPluginBinding binding) { setupMethodChannel(binding.getBinaryMessenger(), binding.getApplicationContext()); diff --git a/packages/device_info_plus/device_info_plus/pubspec.yaml b/packages/device_info_plus/device_info_plus/pubspec.yaml index a9e1664b4c..c9e2845827 100644 --- a/packages/device_info_plus/device_info_plus/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus/pubspec.yaml @@ -1,7 +1,7 @@ name: device_info_plus description: Flutter plugin providing detailed information about the device (make, model, etc.), and Android or iOS version the app is running on. -version: 2.2.0 +version: 3.0.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/network_info_plus/network_info_plus/CHANGELOG.md b/packages/network_info_plus/network_info_plus/CHANGELOG.md index 9de2bdb2b4..924e66498e 100644 --- a/packages/network_info_plus/network_info_plus/CHANGELOG.md +++ b/packages/network_info_plus/network_info_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0 + +- Remove deprecated method `registerWith` (of Android v1 embedding) + ## 1.3.0 - IOS: Use `NEHotspotNetwork` on iOS 14+ to get SSID/BSSID. diff --git a/packages/network_info_plus/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfoPlusPlugin.java b/packages/network_info_plus/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfoPlusPlugin.java index 8ccd16022a..0728c75194 100644 --- a/packages/network_info_plus/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfoPlusPlugin.java +++ b/packages/network_info_plus/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfoPlusPlugin.java @@ -9,20 +9,12 @@ import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.MethodChannel; -import io.flutter.plugin.common.PluginRegistry.Registrar; /** NetworkInfoPlusPlugin */ public class NetworkInfoPlusPlugin implements FlutterPlugin { private MethodChannel methodChannel; - /** Plugin registration. */ - public static void registerWith(Registrar registrar) { - - NetworkInfoPlusPlugin plugin = new NetworkInfoPlusPlugin(); - plugin.setupChannels(registrar.messenger(), registrar.context()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { setupChannels(binding.getBinaryMessenger(), binding.getApplicationContext()); diff --git a/packages/network_info_plus/network_info_plus/pubspec.yaml b/packages/network_info_plus/network_info_plus/pubspec.yaml index 33ddf0b9f3..4bbdb1445e 100644 --- a/packages/network_info_plus/network_info_plus/pubspec.yaml +++ b/packages/network_info_plus/network_info_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: network_info_plus description: Flutter plugin for discovering information (e.g. WiFi details) of the network. -version: 1.3.0 +version: 2.0.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/share_plus/share_plus/CHANGELOG.md b/packages/share_plus/share_plus/CHANGELOG.md index 761046defe..96b41ed0c5 100644 --- a/packages/share_plus/share_plus/CHANGELOG.md +++ b/packages/share_plus/share_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.0.0 + +- Remove deprecated method `registerWith` (of Android v1 embedding) + ## 2.2.0 - migrate integration_test to flutter sdk diff --git a/packages/share_plus/share_plus/android/src/main/java/dev/fluttercommunity/plus/share/SharePlusPlugin.java b/packages/share_plus/share_plus/android/src/main/java/dev/fluttercommunity/plus/share/SharePlusPlugin.java index 0b055da02f..d14b76dd7e 100644 --- a/packages/share_plus/share_plus/android/src/main/java/dev/fluttercommunity/plus/share/SharePlusPlugin.java +++ b/packages/share_plus/share_plus/android/src/main/java/dev/fluttercommunity/plus/share/SharePlusPlugin.java @@ -11,7 +11,6 @@ import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.MethodChannel; -import io.flutter.plugin.common.PluginRegistry.Registrar; /** Plugin method host for presenting a share sheet via Intent */ public class SharePlusPlugin implements FlutterPlugin, ActivityAware { @@ -21,11 +20,6 @@ public class SharePlusPlugin implements FlutterPlugin, ActivityAware { private Share share; private MethodChannel methodChannel; - public static void registerWith(Registrar registrar) { - SharePlusPlugin plugin = new SharePlusPlugin(); - plugin.setUpChannel(registrar.context(), registrar.activity(), registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { setUpChannel(binding.getApplicationContext(), null, binding.getBinaryMessenger()); diff --git a/packages/share_plus/share_plus/pubspec.yaml b/packages/share_plus/share_plus/pubspec.yaml index ac7d4937ae..d60a632229 100644 --- a/packages/share_plus/share_plus/pubspec.yaml +++ b/packages/share_plus/share_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: share_plus description: Flutter plugin for sharing content via the platform share UI, using the ACTION_SEND intent on Android and UIActivityViewController on iOS. -version: 2.2.0 +version: 3.0.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ From 433671a07d122da8145e3d5a704f69a2967fe48c Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Mon, 4 Oct 2021 13:55:49 +0200 Subject: [PATCH 2/3] Fix formatting --- .../plus/androidalarmmanager/AndroidAlarmManagerPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AndroidAlarmManagerPlugin.java b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AndroidAlarmManagerPlugin.java index 74cf593a40..6778da5159 100644 --- a/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AndroidAlarmManagerPlugin.java +++ b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AndroidAlarmManagerPlugin.java @@ -40,7 +40,7 @@ * */ public class AndroidAlarmManagerPlugin implements FlutterPlugin, MethodCallHandler { - private final String TAG = "AndroidAlarmManagerPlugin"; + private static final String TAG = "AndroidAlarmManagerPlugin"; private Context context; private Object initializationLock = new Object(); private MethodChannel alarmManagerPluginChannel; From a118dce06463689afb0449a6795c9b50fe3abd5f Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Mon, 4 Oct 2021 14:07:44 +0200 Subject: [PATCH 3/3] Revert changes in android_alarm_manager_plus --- .../android_alarm_manager_plus/CHANGELOG.md | 4 ---- .../AndroidAlarmManagerPlugin.java | 19 ++++++++++++++++++- .../android_alarm_manager_plus/pubspec.yaml | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/packages/android_alarm_manager_plus/CHANGELOG.md b/packages/android_alarm_manager_plus/CHANGELOG.md index be30c8b09a..62b5336b73 100644 --- a/packages/android_alarm_manager_plus/CHANGELOG.md +++ b/packages/android_alarm_manager_plus/CHANGELOG.md @@ -1,7 +1,3 @@ -## 2.0.0 - -- Remove deprecated method `registerWith` (of Android v1 embedding) - ## 1.3.1 - Fix `PendingIntent`s for Android 12+ diff --git a/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AndroidAlarmManagerPlugin.java b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AndroidAlarmManagerPlugin.java index 6778da5159..006ef9f1e9 100644 --- a/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AndroidAlarmManagerPlugin.java +++ b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AndroidAlarmManagerPlugin.java @@ -13,6 +13,7 @@ import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; +import io.flutter.plugin.common.PluginRegistry.Registrar; import io.flutter.view.FlutterNativeView; import org.json.JSONArray; import org.json.JSONException; @@ -40,11 +41,26 @@ * */ public class AndroidAlarmManagerPlugin implements FlutterPlugin, MethodCallHandler { - private static final String TAG = "AndroidAlarmManagerPlugin"; + private static AndroidAlarmManagerPlugin instance; + private final String TAG = "AndroidAlarmManagerPlugin"; private Context context; private Object initializationLock = new Object(); private MethodChannel alarmManagerPluginChannel; + /** + * Registers this plugin with an associated Flutter execution context, represented by the given + * {@link Registrar}. + * + *
Once this method is executed, an instance of {@code AndroidAlarmManagerPlugin} will be + * connected to, and running against, the associated Flutter execution context. + */ + public static void registerWith(Registrar registrar) { + if (instance == null) { + instance = new AndroidAlarmManagerPlugin(); + } + instance.onAttachedToEngine(registrar.context(), registrar.messenger()); + } + @Override public void onAttachedToEngine(FlutterPluginBinding binding) { onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); @@ -85,6 +101,7 @@ public void onDetachedFromEngine(FlutterPluginBinding binding) { alarmManagerPluginChannel = null; } + public AndroidAlarmManagerPlugin() {} /** Invoked when the Flutter side of this plugin sends a message to the Android side. */ @Override diff --git a/packages/android_alarm_manager_plus/pubspec.yaml b/packages/android_alarm_manager_plus/pubspec.yaml index 01e5946c81..33922d7db2 100644 --- a/packages/android_alarm_manager_plus/pubspec.yaml +++ b/packages/android_alarm_manager_plus/pubspec.yaml @@ -1,7 +1,7 @@ name: android_alarm_manager_plus description: Flutter plugin for accessing the Android AlarmManager service, and running Dart code in the background when alarms fire. -version: 2.0.0 +version: 1.3.1 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/