[many] Remove references to v1 embedding (#6494)
I have a WIP effort to remove the v1 embedding entirely (https://github.com/flutter/flutter/pull/146523 is the latest pr).
`registerWith` references the v1 embedding, which has been deprecated for many years, so this PR removes it from all plugins.
Also removes some additional references, see in particular these three commits:
1. Modifies private `ActivityState` class to remove `PluginRegistry.Registrar` member in `image_picker`: https://github.com/flutter/packages/pull/6494/commits/c2e4c872917a32c61d77a72b3f2e8fe25c3d6599
2. Replaces `FlutterMain.getLookupKeyForAsset()` with `FlutterLoader.getLookupKeyForAsset()` in `google_maps` plugin: https://github.com/flutter/packages/pull/6494/commits/73c3de3807dc20333536affb86c87b82ac267bf9
3. Removes deprecated `RegistrarFlutterAssetManager` class in `webview_flutter`: https://github.com/flutter/packages/pull/6494/commits/cc842c69b2ed2a5e5c203d7c9514605823225b07
Fixes https://github.com/flutter/flutter/issues/70923
diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md
index 74d8e31..dbf3789 100644
--- a/packages/camera/camera_android/CHANGELOG.md
+++ b/packages/camera/camera_android/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 0.10.9+3
-* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
## 0.10.9+2
diff --git a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 308d428..aff225e 100644
--- a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -19,9 +19,6 @@
*
* <p>Instantiate this in an add to app scenario to gracefully handle activity and context changes.
* See {@code io.flutter.plugins.camera.MainActivity} for an example.
- *
- * <p>Call {@link #registerWith(io.flutter.plugin.common.PluginRegistry.Registrar)} to register an
- * implementation of this that uses the stable {@code io.flutter.plugin.common} package.
*/
public final class CameraPlugin implements FlutterPlugin, ActivityAware {
@@ -36,24 +33,6 @@
*/
public CameraPlugin() {}
- /**
- * Registers a plugin implementation that uses the stable {@code io.flutter.plugin.common}
- * package.
- *
- * <p>Calling this automatically initializes the plugin. However plugins initialized this way
- * won't react to changes in activity or context, unlike {@link CameraPlugin}.
- */
- @SuppressWarnings("deprecation")
- public static void registerWith(
- @NonNull io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- CameraPlugin plugin = new CameraPlugin();
- plugin.maybeStartListening(
- registrar.activity(),
- registrar.messenger(),
- registrar::addRequestPermissionsResultListener,
- registrar.view());
- }
-
@Override
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
this.flutterPluginBinding = binding;
diff --git a/packages/camera/camera_android/example/pubspec.yaml b/packages/camera/camera_android/example/pubspec.yaml
index ee97a09..cd21282 100644
--- a/packages/camera/camera_android/example/pubspec.yaml
+++ b/packages/camera/camera_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
camera_android:
diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml
index 90d32f5..704f64b 100644
--- a/packages/camera/camera_android/pubspec.yaml
+++ b/packages/camera/camera_android/pubspec.yaml
@@ -3,11 +3,11 @@
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.10.9+2
+version: 0.10.9+3
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md
index 2a86fa9..429f93a 100644
--- a/packages/espresso/CHANGELOG.md
+++ b/packages/espresso/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 0.3.0+9
-* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
## 0.3.0+8
diff --git a/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java b/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java
index 6c8620b..213e83c 100644
--- a/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java
+++ b/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java
@@ -20,21 +20,6 @@
channel.setMethodCallHandler(new EspressoPlugin());
}
- // This static function is optional and equivalent to onAttachedToEngine. It supports the old
- // pre-Flutter-1.12 Android projects. You are encouraged to continue supporting
- // plugin registration via this function while apps migrate to use the new Android APIs
- // post-flutter-1.12 via https://flutter.dev/go/android-project-migration.
- //
- // It is encouraged to share logic between onAttachedToEngine and registerWith to keep
- // them functionally equivalent. Only one of onAttachedToEngine or registerWith will be called
- // depending on the user's project. onAttachedToEngine or registerWith must both be defined
- // in the same class.
- @SuppressWarnings("deprecation")
- public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- final MethodChannel channel = new MethodChannel(registrar.messenger(), "espresso");
- channel.setMethodCallHandler(new EspressoPlugin());
- }
-
@Override
public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
if (call.method.equals("getPlatformVersion")) {
diff --git a/packages/espresso/example/pubspec.yaml b/packages/espresso/example/pubspec.yaml
index 8fe0b92..1cafae5 100644
--- a/packages/espresso/example/pubspec.yaml
+++ b/packages/espresso/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/espresso/pubspec.yaml b/packages/espresso/pubspec.yaml
index b8fc32e..e4c1239 100644
--- a/packages/espresso/pubspec.yaml
+++ b/packages/espresso/pubspec.yaml
@@ -3,11 +3,11 @@
Allows driving Flutter widgets from a native Espresso test.
repository: https://github.com/flutter/packages/tree/main/packages/espresso
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+espresso%22
-version: 0.3.0+8
+version: 0.3.0+9
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
index 60b37e2..b7082c0 100644
--- a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
+++ b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 2.0.20
-* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
## 2.0.19
diff --git a/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java b/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java
index 800f3b5..cf6972d 100644
--- a/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java
+++ b/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java
@@ -14,11 +14,6 @@
* <p><strong>DO NOT USE THIS CLASS.</strong>
*/
public class FlutterAndroidLifecyclePlugin implements FlutterPlugin {
- @SuppressWarnings("deprecation")
- public static void registerWith(
- @NonNull io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- // no-op
- }
@Override
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
diff --git a/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml b/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml
index ab7d57e..98ca0ae 100644
--- a/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml
+++ b/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/flutter_plugin_android_lifecycle/pubspec.yaml b/packages/flutter_plugin_android_lifecycle/pubspec.yaml
index 7d70e4a..30e358a 100644
--- a/packages/flutter_plugin_android_lifecycle/pubspec.yaml
+++ b/packages/flutter_plugin_android_lifecycle/pubspec.yaml
@@ -2,11 +2,11 @@
description: Flutter plugin for accessing an Android Lifecycle within other plugins.
repository: https://github.com/flutter/packages/tree/main/packages/flutter_plugin_android_lifecycle
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_plugin_android_lifecycle%22
-version: 2.0.19
+version: 2.0.20
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
index b68da08..4c003ec 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 2.8.1
-* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
## 2.8.0
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
index 28449b8..ccf474a 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
+++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
@@ -26,6 +26,7 @@
import com.google.android.gms.maps.model.SquareCap;
import com.google.android.gms.maps.model.Tile;
import com.google.maps.android.clustering.Cluster;
+import io.flutter.FlutterInjector;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -36,9 +37,6 @@
/** Conversions between JSON-like values and GoogleMaps data types. */
class Convert {
- // TODO(hamdikahloun): FlutterMain has been deprecated and should be replaced with FlutterLoader
- // when it's available in Stable channel: https://github.com/flutter/flutter/issues/70923.
- @SuppressWarnings("deprecation")
private static BitmapDescriptor toBitmapDescriptor(Object o) {
final List<?> data = toList(o);
switch (toString(data.get(0))) {
@@ -51,16 +49,21 @@
case "fromAsset":
if (data.size() == 2) {
return BitmapDescriptorFactory.fromAsset(
- io.flutter.view.FlutterMain.getLookupKeyForAsset(toString(data.get(1))));
+ FlutterInjector.instance()
+ .flutterLoader()
+ .getLookupKeyForAsset(toString(data.get(1))));
} else {
return BitmapDescriptorFactory.fromAsset(
- io.flutter.view.FlutterMain.getLookupKeyForAsset(
- toString(data.get(1)), toString(data.get(2))));
+ FlutterInjector.instance()
+ .flutterLoader()
+ .getLookupKeyForAsset(toString(data.get(1)), toString(data.get(2))));
}
case "fromAssetImage":
if (data.size() == 3) {
return BitmapDescriptorFactory.fromAsset(
- io.flutter.view.FlutterMain.getLookupKeyForAsset(toString(data.get(1))));
+ FlutterInjector.instance()
+ .flutterLoader()
+ .getLookupKeyForAsset(toString(data.get(1))));
} else {
throw new IllegalArgumentException(
"'fromAssetImage' Expected exactly 3 arguments, got: " + data.size());
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
index 5d0a5eb..36b20cf 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
+++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
@@ -30,41 +30,6 @@
private static final String VIEW_TYPE = "plugins.flutter.dev/google_maps_android";
- @SuppressWarnings("deprecation")
- public static void registerWith(
- @NonNull final io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- final Activity activity = registrar.activity();
- if (activity == null) {
- // When a background flutter view tries to register the plugin, the registrar has no activity.
- // We stop the registration process as this plugin is foreground only.
- return;
- }
- if (activity instanceof LifecycleOwner) {
- registrar
- .platformViewRegistry()
- .registerViewFactory(
- VIEW_TYPE,
- new GoogleMapFactory(
- registrar.messenger(),
- registrar.context(),
- new LifecycleProvider() {
- @Override
- public Lifecycle getLifecycle() {
- return ((LifecycleOwner) activity).getLifecycle();
- }
- }));
- } else {
- registrar
- .platformViewRegistry()
- .registerViewFactory(
- VIEW_TYPE,
- new GoogleMapFactory(
- registrar.messenger(),
- registrar.context(),
- new ProxyLifecycleProvider(activity)));
- }
- }
-
public GoogleMapsPlugin() {}
// FlutterPlugin
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
index 3b71087..62c94d4 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
cupertino_icons: ^1.0.5
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
index 629e61f..73625d7 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
@@ -2,11 +2,11 @@
description: Android implementation of the google_maps_flutter plugin.
repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 2.8.0
+version: 2.8.1
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md
index a19bbeb..68ed7d6 100644
--- a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md
+++ b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 6.1.24
-* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
## 6.1.23
diff --git a/packages/google_sign_in/google_sign_in_android/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java b/packages/google_sign_in/google_sign_in_android/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
index eb4635a..9efe45f 100644
--- a/packages/google_sign_in/google_sign_in_android/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
+++ b/packages/google_sign_in/google_sign_in_android/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
@@ -49,14 +49,6 @@
private @Nullable BinaryMessenger messenger;
private ActivityPluginBinding activityPluginBinding;
- @SuppressWarnings("deprecation")
- public static void registerWith(
- @NonNull io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- GoogleSignInPlugin instance = new GoogleSignInPlugin();
- instance.initInstance(registrar.messenger(), registrar.context(), new GoogleSignInWrapper());
- instance.setUpRegistrar(registrar);
- }
-
@VisibleForTesting
public void initInstance(
@NonNull BinaryMessenger messenger,
diff --git a/packages/google_sign_in/google_sign_in_android/example/pubspec.yaml b/packages/google_sign_in/google_sign_in_android/example/pubspec.yaml
index b39b563..11b6f07 100644
--- a/packages/google_sign_in/google_sign_in_android/example/pubspec.yaml
+++ b/packages/google_sign_in/google_sign_in_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/google_sign_in/google_sign_in_android/pubspec.yaml b/packages/google_sign_in/google_sign_in_android/pubspec.yaml
index 61f9204..faf2641 100644
--- a/packages/google_sign_in/google_sign_in_android/pubspec.yaml
+++ b/packages/google_sign_in/google_sign_in_android/pubspec.yaml
@@ -2,11 +2,11 @@
description: Android implementation of the google_sign_in plugin.
repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
-version: 6.1.23
+version: 6.1.24
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md
index 99781bd..0d91ddd 100644
--- a/packages/image_picker/image_picker_android/CHANGELOG.md
+++ b/packages/image_picker/image_picker_android/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.8.12+2
+
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
+
## 0.8.12+1
* Fixes another app crash case on Android 12+, and refactors getting of paths from intents.
diff --git a/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java b/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
index 8096930..264921d 100644
--- a/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
+++ b/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
@@ -18,7 +18,6 @@
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
import io.flutter.embedding.engine.plugins.lifecycle.FlutterLifecycleAdapter;
import io.flutter.plugin.common.BinaryMessenger;
-import io.flutter.plugin.common.PluginRegistry;
import io.flutter.plugins.imagepicker.Messages.CacheRetrievalResult;
import io.flutter.plugins.imagepicker.Messages.FlutterError;
import io.flutter.plugins.imagepicker.Messages.GeneralOptions;
@@ -117,7 +116,6 @@
final Activity activity,
final BinaryMessenger messenger,
final ImagePickerApi handler,
- final PluginRegistry.Registrar registrar,
final ActivityPluginBinding activityBinding) {
this.application = application;
this.activity = activity;
@@ -127,18 +125,12 @@
delegate = constructDelegate(activity);
ImagePickerApi.setUp(messenger, handler);
observer = new LifeCycleObserver(activity);
- if (registrar != null) {
- // V1 embedding setup for activity listeners.
- application.registerActivityLifecycleCallbacks(observer);
- registrar.addActivityResultListener(delegate);
- registrar.addRequestPermissionsResultListener(delegate);
- } else {
- // V2 embedding setup for activity listeners.
- activityBinding.addActivityResultListener(delegate);
- activityBinding.addRequestPermissionsResultListener(delegate);
- lifecycle = FlutterLifecycleAdapter.getActivityLifecycle(activityBinding);
- lifecycle.addObserver(observer);
- }
+
+ // V2 embedding setup for activity listeners.
+ activityBinding.addActivityResultListener(delegate);
+ activityBinding.addRequestPermissionsResultListener(delegate);
+ lifecycle = FlutterLifecycleAdapter.getActivityLifecycle(activityBinding);
+ lifecycle.addObserver(observer);
}
// Only invoked by {@link #ImagePickerPlugin(ImagePickerDelegate, Activity)} for testing.
@@ -183,20 +175,6 @@
private FlutterPluginBinding pluginBinding;
ActivityState activityState;
- @SuppressWarnings("deprecation")
- public static void registerWith(
- @NonNull io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- if (registrar.activity() == null) {
- // If a background flutter view tries to register the plugin, there will be no activity from the registrar,
- // we stop the registering process immediately because the ImagePicker requires an activity.
- return;
- }
- Activity activity = registrar.activity();
- Application application = (Application) (registrar.context().getApplicationContext());
- ImagePickerPlugin plugin = new ImagePickerPlugin();
- plugin.setup(registrar.messenger(), application, activity, registrar, null);
- }
-
/**
* Default constructor for the plugin.
*
@@ -231,7 +209,6 @@
pluginBinding.getBinaryMessenger(),
(Application) pluginBinding.getApplicationContext(),
binding.getActivity(),
- null,
binding);
}
@@ -254,10 +231,8 @@
final BinaryMessenger messenger,
final Application application,
final Activity activity,
- final PluginRegistry.Registrar registrar,
final ActivityPluginBinding activityBinding) {
- activityState =
- new ActivityState(application, activity, messenger, this, registrar, activityBinding);
+ activityState = new ActivityState(application, activity, messenger, this, activityBinding);
}
private void tearDown() {
diff --git a/packages/image_picker/image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java b/packages/image_picker/image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
index cf088b5..e759c21 100644
--- a/packages/image_picker/image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
+++ b/packages/image_picker/image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
@@ -305,14 +305,6 @@
}
@Test
- public void onRegister_whenActivityIsNull_shouldNotCrash() {
- when(mockRegistrar.activity()).thenReturn(null);
- ImagePickerPlugin.registerWith((mockRegistrar));
- assertTrue(
- "No exception thrown when ImagePickerPlugin.registerWith ran with activity = null", true);
- }
-
- @Test
public void onConstructor_whenContextTypeIsActivity_shouldNotCrash() {
new ImagePickerPlugin(mockImagePickerDelegate, mockActivity);
assertTrue(
diff --git a/packages/image_picker/image_picker_android/example/pubspec.yaml b/packages/image_picker/image_picker_android/example/pubspec.yaml
index 500b47c..0c7181f 100644
--- a/packages/image_picker/image_picker_android/example/pubspec.yaml
+++ b/packages/image_picker/image_picker_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.3.0
- flutter: ">=3.19.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml
index 3e15b43..4e4980c 100755
--- a/packages/image_picker/image_picker_android/pubspec.yaml
+++ b/packages/image_picker/image_picker_android/pubspec.yaml
@@ -2,11 +2,11 @@
description: Android implementation of the image_picker plugin.
repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.12+1
+version: 0.8.12+2
environment:
- sdk: ^3.3.0
- flutter: ">=3.19.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md
index 440c322..ea9332c 100644
--- a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md
+++ b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.6+1
+
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
+
## 0.3.6
* Introduces new `ReplacementMode` for Android's billing client as `ProrationMode` is being deprecated.
diff --git a/packages/in_app_purchase/in_app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/in_app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
index cc153dc..965ed43 100644
--- a/packages/in_app_purchase/in_app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
+++ b/packages/in_app_purchase/in_app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
@@ -4,7 +4,6 @@
package io.flutter.plugins.inapppurchase;
-import android.app.Application;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
@@ -26,16 +25,6 @@
private MethodCallHandlerImpl methodCallHandler;
- /** Plugin registration. */
- @SuppressWarnings("deprecation")
- public static void registerWith(
- @NonNull io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- InAppPurchasePlugin plugin = new InAppPurchasePlugin();
- registrar.activity().getIntent().putExtra(PROXY_PACKAGE_KEY, PROXY_VALUE);
- ((Application) registrar.context().getApplicationContext())
- .registerActivityLifecycleCallbacks(plugin.methodCallHandler);
- }
-
@Override
public void onAttachedToEngine(@NonNull FlutterPlugin.FlutterPluginBinding binding) {
setUpMethodChannel(binding.getBinaryMessenger(), binding.getApplicationContext());
diff --git a/packages/in_app_purchase/in_app_purchase_android/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/in_app_purchase_android/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
index f7908c0..b2af5e1 100644
--- a/packages/in_app_purchase/in_app_purchase_android/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
+++ b/packages/in_app_purchase/in_app_purchase_android/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
@@ -57,27 +57,6 @@
mockCloseable.close();
}
- @Test
- public void registerWith_doNotCrashWhenRegisterContextIsActivity_V1Embedding() {
- when(mockRegistrar.context()).thenReturn(activity);
- when(activity.getApplicationContext()).thenReturn(mockApplication);
- InAppPurchasePlugin.registerWith(mockRegistrar);
- }
-
- // The PROXY_PACKAGE_KEY value of this test (io.flutter.plugins.inapppurchase) should never be changed.
- // In case there's a strong reason to change it, please inform the current code owner of the plugin.
- @Test
- public void registerWith_proxyIsSet_V1Embedding() {
- when(mockRegistrar.context()).thenReturn(activity);
- when(activity.getApplicationContext()).thenReturn(mockApplication);
- InAppPurchasePlugin.registerWith(mockRegistrar);
- // The `PROXY_PACKAGE_KEY` value is hard coded in the plugin code as "io.flutter.plugins.inapppurchase".
- // We cannot use `BuildConfig.LIBRARY_PACKAGE_NAME` directly in the plugin code because whether to read BuildConfig.APPLICATION_ID or LIBRARY_PACKAGE_NAME
- // depends on the "APP's" Android Gradle plugin version. Newer versions of AGP use LIBRARY_PACKAGE_NAME, whereas older ones use BuildConfig.APPLICATION_ID.
- Mockito.verify(mockIntent).putExtra(PROXY_PACKAGE_KEY, "io.flutter.plugins.inapppurchase");
- assertEquals("io.flutter.plugins.inapppurchase", BuildConfig.LIBRARY_PACKAGE_NAME);
- }
-
// The PROXY_PACKAGE_KEY value of this test (io.flutter.plugins.inapppurchase) should never be changed.
// In case there's a strong reason to change it, please inform the current code owner of the plugin.
@Test
diff --git a/packages/in_app_purchase/in_app_purchase_android/example/pubspec.yaml b/packages/in_app_purchase/in_app_purchase_android/example/pubspec.yaml
index 2289cba..a22c81b 100644
--- a/packages/in_app_purchase/in_app_purchase_android/example/pubspec.yaml
+++ b/packages/in_app_purchase/in_app_purchase_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml
index d12eeeb..29961fc 100644
--- a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml
+++ b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml
@@ -2,11 +2,11 @@
description: An implementation for the Android platform of the Flutter `in_app_purchase` plugin. This uses the Android BillingClient APIs.
repository: https://github.com/flutter/packages/tree/main/packages/in_app_purchase/in_app_purchase_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22
-version: 0.3.6
+version: 0.3.6+1
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/local_auth/local_auth_android/CHANGELOG.md b/packages/local_auth/local_auth_android/CHANGELOG.md
index b6441c9..ce4871b 100644
--- a/packages/local_auth/local_auth_android/CHANGELOG.md
+++ b/packages/local_auth/local_auth_android/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.0.39
+
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
+
## 1.0.38
* Updates minSdkVersion to 19.
diff --git a/packages/local_auth/local_auth_android/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java b/packages/local_auth/local_auth_android/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
index 7ed2c04..5d1fe19 100644
--- a/packages/local_auth/local_auth_android/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
+++ b/packages/local_auth/local_auth_android/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
@@ -68,22 +68,6 @@
};
/**
- * Registers a plugin with the v1 embedding api {@code io.flutter.plugin.common}.
- *
- * <p>Calling this will register the plugin with the passed registrar. However, plugins
- * initialized this way won't react to changes in activity or context.
- *
- * @param registrar provides access to necessary plugin context.
- */
- @SuppressWarnings("deprecation")
- public static void registerWith(@NonNull PluginRegistry.Registrar registrar) {
- final LocalAuthPlugin plugin = new LocalAuthPlugin();
- plugin.activity = registrar.activity();
- LocalAuthApi.setup(registrar.messenger(), plugin);
- registrar.addActivityResultListener(plugin.resultListener);
- }
-
- /**
* Default constructor for LocalAuthPlugin.
*
* <p>Use this constructor when adding this plugin to an app with v2 embedding.
diff --git a/packages/local_auth/local_auth_android/example/pubspec.yaml b/packages/local_auth/local_auth_android/example/pubspec.yaml
index 125ca89..36b392e 100644
--- a/packages/local_auth/local_auth_android/example/pubspec.yaml
+++ b/packages/local_auth/local_auth_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/local_auth/local_auth_android/pubspec.yaml b/packages/local_auth/local_auth_android/pubspec.yaml
index 5b4b57a..3e5feb7 100644
--- a/packages/local_auth/local_auth_android/pubspec.yaml
+++ b/packages/local_auth/local_auth_android/pubspec.yaml
@@ -2,11 +2,11 @@
description: Android implementation of the local_auth plugin.
repository: https://github.com/flutter/packages/tree/main/packages/local_auth/local_auth_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+local_auth%22
-version: 1.0.38
+version: 1.0.39
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/path_provider/path_provider_android/CHANGELOG.md b/packages/path_provider/path_provider_android/CHANGELOG.md
index c6a6eb1..4800df6 100644
--- a/packages/path_provider/path_provider_android/CHANGELOG.md
+++ b/packages/path_provider/path_provider_android/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 2.2.5
-* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
## 2.2.4
diff --git a/packages/path_provider/path_provider_android/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java b/packages/path_provider/path_provider_android/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java
index a29fe9b..ce23e54 100644
--- a/packages/path_provider/path_provider_android/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java
+++ b/packages/path_provider/path_provider_android/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java
@@ -32,13 +32,6 @@
this.context = context;
}
- @SuppressWarnings("deprecation")
- public static void registerWith(
- @NonNull io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- PathProviderPlugin instance = new PathProviderPlugin();
- instance.setup(registrar.messenger(), registrar.context());
- }
-
@Override
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
setup(binding.getBinaryMessenger(), binding.getApplicationContext());
diff --git a/packages/path_provider/path_provider_android/example/pubspec.yaml b/packages/path_provider/path_provider_android/example/pubspec.yaml
index 06b8e22..54601fb 100644
--- a/packages/path_provider/path_provider_android/example/pubspec.yaml
+++ b/packages/path_provider/path_provider_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/path_provider/path_provider_android/pubspec.yaml b/packages/path_provider/path_provider_android/pubspec.yaml
index eed1659..0aa1da9 100644
--- a/packages/path_provider/path_provider_android/pubspec.yaml
+++ b/packages/path_provider/path_provider_android/pubspec.yaml
@@ -2,11 +2,11 @@
description: Android implementation of the path_provider plugin.
repository: https://github.com/flutter/packages/tree/main/packages/path_provider/path_provider_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
-version: 2.2.4
+version: 2.2.5
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/quick_actions/quick_actions_android/CHANGELOG.md b/packages/quick_actions/quick_actions_android/CHANGELOG.md
index edf3b92..04a2ed9 100644
--- a/packages/quick_actions/quick_actions_android/CHANGELOG.md
+++ b/packages/quick_actions/quick_actions_android/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 1.0.13
-* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
## 1.0.12
diff --git a/packages/quick_actions/quick_actions_android/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java b/packages/quick_actions/quick_actions_android/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java
index eed6133..9dd7010 100644
--- a/packages/quick_actions/quick_actions_android/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java
+++ b/packages/quick_actions/quick_actions_android/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java
@@ -43,19 +43,6 @@
this.sdkChecker = capabilityChecker;
}
- /**
- * Plugin registration.
- *
- * <p>Must be called when the application is created.
- */
- @SuppressWarnings("deprecation")
- public static void registerWith(
- @NonNull io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- QuickActions quickActions = new QuickActions(registrar.context());
- quickActions.setActivity(registrar.activity());
- Messages.AndroidQuickActionsApi.setup(registrar.messenger(), quickActions);
- }
-
@Override
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
this.quickActions = new QuickActions(binding.getApplicationContext());
diff --git a/packages/quick_actions/quick_actions_android/example/pubspec.yaml b/packages/quick_actions/quick_actions_android/example/pubspec.yaml
index 6166b64..632624f 100644
--- a/packages/quick_actions/quick_actions_android/example/pubspec.yaml
+++ b/packages/quick_actions/quick_actions_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/quick_actions/quick_actions_android/pubspec.yaml b/packages/quick_actions/quick_actions_android/pubspec.yaml
index 8306565..5e08925 100644
--- a/packages/quick_actions/quick_actions_android/pubspec.yaml
+++ b/packages/quick_actions/quick_actions_android/pubspec.yaml
@@ -2,11 +2,11 @@
description: An implementation for the Android platform of the Flutter `quick_actions` plugin.
repository: https://github.com/flutter/packages/tree/main/packages/quick_actions/quick_actions_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22
-version: 1.0.12
+version: 1.0.13
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
index 3b6e8d2..aa4279e 100644
--- a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
+++ b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 2.2.3
-* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
## 2.2.2
diff --git a/packages/shared_preferences/shared_preferences_android/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java b/packages/shared_preferences/shared_preferences_android/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
index aecc439..6bfa4e2 100644
--- a/packages/shared_preferences/shared_preferences_android/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
+++ b/packages/shared_preferences/shared_preferences_android/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
@@ -47,13 +47,6 @@
this.listEncoder = listEncoder;
}
- @SuppressWarnings("deprecation")
- public static void registerWith(
- @NonNull io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- final SharedPreferencesPlugin plugin = new SharedPreferencesPlugin();
- plugin.setUp(registrar.messenger(), registrar.context());
- }
-
private void setUp(@NonNull BinaryMessenger messenger, @NonNull Context context) {
preferences = context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
try {
diff --git a/packages/shared_preferences/shared_preferences_android/example/pubspec.yaml b/packages/shared_preferences/shared_preferences_android/example/pubspec.yaml
index d9fb73c..0bdf690 100644
--- a/packages/shared_preferences/shared_preferences_android/example/pubspec.yaml
+++ b/packages/shared_preferences/shared_preferences_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/shared_preferences/shared_preferences_android/pubspec.yaml b/packages/shared_preferences/shared_preferences_android/pubspec.yaml
index 647d877..201f308 100644
--- a/packages/shared_preferences/shared_preferences_android/pubspec.yaml
+++ b/packages/shared_preferences/shared_preferences_android/pubspec.yaml
@@ -2,11 +2,11 @@
description: Android implementation of the shared_preferences plugin
repository: https://github.com/flutter/packages/tree/main/packages/shared_preferences/shared_preferences_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22
-version: 2.2.2
+version: 2.2.3
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/url_launcher/url_launcher_android/CHANGELOG.md b/packages/url_launcher/url_launcher_android/CHANGELOG.md
index 846ee63..73af3ff 100644
--- a/packages/url_launcher/url_launcher_android/CHANGELOG.md
+++ b/packages/url_launcher/url_launcher_android/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 6.3.3
+
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
+
## 6.3.2
* Bumps androidx.annotation:annotation from 1.7.1 to 1.8.0.
diff --git a/packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java b/packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
index f2160ec..34bf08f 100644
--- a/packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
+++ b/packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
@@ -20,21 +20,6 @@
private static final String TAG = "UrlLauncherPlugin";
@Nullable private UrlLauncher urlLauncher;
- /**
- * Registers a plugin implementation that uses the stable {@code io.flutter.plugin.common}
- * package.
- *
- * <p>Calling this automatically initializes the plugin. However plugins initialized this way
- * won't react to changes in activity or context, unlike {@link UrlLauncherPlugin}.
- */
- @SuppressWarnings("deprecation")
- public static void registerWith(
- @NonNull io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- UrlLauncher handler = new UrlLauncher(registrar.context());
- handler.setActivity(registrar.activity());
- Messages.UrlLauncherApi.setup(registrar.messenger(), handler);
- }
-
@Override
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
urlLauncher = new UrlLauncher(binding.getApplicationContext());
diff --git a/packages/url_launcher/url_launcher_android/example/pubspec.yaml b/packages/url_launcher/url_launcher_android/example/pubspec.yaml
index 8839669..256861b 100644
--- a/packages/url_launcher/url_launcher_android/example/pubspec.yaml
+++ b/packages/url_launcher/url_launcher_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/url_launcher/url_launcher_android/pubspec.yaml b/packages/url_launcher/url_launcher_android/pubspec.yaml
index 030c8a1..e3c65d4 100644
--- a/packages/url_launcher/url_launcher_android/pubspec.yaml
+++ b/packages/url_launcher/url_launcher_android/pubspec.yaml
@@ -2,10 +2,10 @@
description: Android implementation of the url_launcher plugin.
repository: https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
-version: 6.3.2
+version: 6.3.3
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/video_player/video_player_android/CHANGELOG.md b/packages/video_player/video_player_android/CHANGELOG.md
index e48bd82..cc9d5ce 100644
--- a/packages/video_player/video_player_android/CHANGELOG.md
+++ b/packages/video_player/video_player_android/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 2.4.15
-* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
## 2.4.14
diff --git a/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java b/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
index aa9b5bd..5259e1a 100644
--- a/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
+++ b/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
@@ -50,18 +50,6 @@
flutterState.startListening(this, registrar.messenger());
}
- /** Registers this with the stable v1 embedding. Will not respond to lifecycle events. */
- @SuppressWarnings("deprecation")
- public static void registerWith(
- @NonNull io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- final VideoPlayerPlugin plugin = new VideoPlayerPlugin(registrar);
- registrar.addViewDestroyListener(
- view -> {
- plugin.onDestroy();
- return false; // We are not interested in assuming ownership of the NativeView.
- });
- }
-
@Override
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
diff --git a/packages/video_player/video_player_android/example/pubspec.yaml b/packages/video_player/video_player_android/example/pubspec.yaml
index d325708..a6c57dc 100644
--- a/packages/video_player/video_player_android/example/pubspec.yaml
+++ b/packages/video_player/video_player_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/video_player/video_player_android/pubspec.yaml b/packages/video_player/video_player_android/pubspec.yaml
index 1ac1fa5..35c7d0e 100644
--- a/packages/video_player/video_player_android/pubspec.yaml
+++ b/packages/video_player/video_player_android/pubspec.yaml
@@ -2,11 +2,11 @@
description: Android implementation of the video_player plugin.
repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
-version: 2.4.14
+version: 2.4.15
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
diff --git a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md
index 039efbc..0e2f151 100644
--- a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md
+++ b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 3.16.4
+
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+* Removes support for apps using the v1 Android embedding.
+
## 3.16.3
* Bumps androidx.webkit:webkit from 1.10.0 to 1.11.0.
diff --git a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterAssetManager.java b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterAssetManager.java
index f50b5bf..d599434 100644
--- a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterAssetManager.java
+++ b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterAssetManager.java
@@ -7,7 +7,6 @@
import android.content.res.AssetManager;
import androidx.annotation.NonNull;
import io.flutter.embedding.engine.plugins.FlutterPlugin;
-import io.flutter.plugin.common.PluginRegistry;
import java.io.IOException;
/** Provides access to the assets registered as part of the App bundle. */
@@ -49,37 +48,6 @@
}
/**
- * Provides access to assets using the {@link PluginRegistry.Registrar} for looking up file paths
- * to Flutter assets.
- *
- * @deprecated The {@link RegistrarFlutterAssetManager} is for Flutter's v1 embedding. For
- * instructions on migrating a plugin from Flutter's v1 Android embedding to v2, visit
- * http://flutter.dev/go/android-plugin-migration
- */
- @Deprecated
- static class RegistrarFlutterAssetManager extends FlutterAssetManager {
- final PluginRegistry.Registrar registrar;
-
- /**
- * Constructs a new instance of the {@link RegistrarFlutterAssetManager}.
- *
- * @param assetManager Instance of Android's {@link AssetManager} used to access assets within
- * the App bundle.
- * @param registrar Instance of {@link io.flutter.plugin.common.PluginRegistry.Registrar} used
- * to look up file paths to assets registered by Flutter.
- */
- RegistrarFlutterAssetManager(AssetManager assetManager, PluginRegistry.Registrar registrar) {
- super(assetManager);
- this.registrar = registrar;
- }
-
- @Override
- public String getAssetFilePathByName(String name) {
- return registrar.lookupKeyForAsset(name);
- }
- }
-
- /**
* Provides access to assets using the {@link FlutterPlugin.FlutterAssets} for looking up file
* paths to Flutter assets.
*/
diff --git a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
index 7f02611..3c73a4e 100644
--- a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
+++ b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
@@ -34,8 +34,6 @@
* Java platform implementation of the webview_flutter plugin.
*
* <p>Register this in an add to app scenario to gracefully handle activity and context changes.
- *
- * <p>Call {@link #registerWith} to use the stable {@code io.flutter.plugin.common} package instead.
*/
public class WebViewFlutterPlugin implements FlutterPlugin, ActivityAware {
@Nullable private InstanceManager instanceManager;
@@ -48,35 +46,11 @@
* Add an instance of this to {@link io.flutter.embedding.engine.plugins.PluginRegistry} to
* register it.
*
- * <p>THIS PLUGIN CODE PATH DEPENDS ON A NEWER VERSION OF FLUTTER THAN THE ONE DEFINED IN THE
- * PUBSPEC.YAML. Text input will fail on some Android devices unless this is used with at least
- * flutter/flutter@1d4d63ace1f801a022ea9ec737bf8c15395588b9. Use the V1 embedding with {@link
- * #registerWith} to use this plugin with older Flutter versions.
- *
* <p>Registration should eventually be handled automatically by v2 of the
* GeneratedPluginRegistrant. https://github.com/flutter/flutter/issues/42694
*/
public WebViewFlutterPlugin() {}
- /**
- * Registers a plugin implementation that uses the stable {@code io.flutter.plugin.common}
- * package.
- *
- * <p>Calling this automatically initializes the plugin. However plugins initialized this way
- * won't react to changes in activity or context, unlike {@link WebViewFlutterPlugin}.
- */
- @SuppressWarnings({"unused", "deprecation"})
- public static void registerWith(
- @NonNull io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
- new WebViewFlutterPlugin()
- .setUp(
- registrar.messenger(),
- registrar.platformViewRegistry(),
- registrar.activity(),
- new FlutterAssetManager.RegistrarFlutterAssetManager(
- registrar.context().getAssets(), registrar));
- }
-
private void setUp(
BinaryMessenger binaryMessenger,
PlatformViewRegistry viewRegistry,
diff --git a/packages/webview_flutter/webview_flutter_android/android/src/test/java/io/flutter/plugins/webviewflutter/RegistrarFlutterAssetManagerTest.java b/packages/webview_flutter/webview_flutter_android/android/src/test/java/io/flutter/plugins/webviewflutter/RegistrarFlutterAssetManagerTest.java
deleted file mode 100644
index fa0d27d..0000000
--- a/packages/webview_flutter/webview_flutter_android/android/src/test/java/io/flutter/plugins/webviewflutter/RegistrarFlutterAssetManagerTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2013 The Flutter 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.webviewflutter;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.res.AssetManager;
-import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-
-@SuppressWarnings("deprecation")
-public class RegistrarFlutterAssetManagerTest {
- @Mock AssetManager mockAssetManager;
- @Mock io.flutter.plugin.common.PluginRegistry.Registrar mockRegistrar;
-
- io.flutter.plugins.webviewflutter.FlutterAssetManager.RegistrarFlutterAssetManager
- testRegistrarFlutterAssetManager;
-
- @Before
- public void setUp() {
- mockAssetManager = mock(AssetManager.class);
- mockRegistrar = mock(io.flutter.plugin.common.PluginRegistry.Registrar.class);
-
- testRegistrarFlutterAssetManager =
- new io.flutter.plugins.webviewflutter.FlutterAssetManager.RegistrarFlutterAssetManager(
- mockAssetManager, mockRegistrar);
- }
-
- @Test
- public void list() {
- try {
- when(mockAssetManager.list("test/path"))
- .thenReturn(new String[] {"index.html", "styles.css"});
- String[] actualFilePaths = testRegistrarFlutterAssetManager.list("test/path");
- verify(mockAssetManager).list("test/path");
- assertArrayEquals(new String[] {"index.html", "styles.css"}, actualFilePaths);
- } catch (IOException ex) {
- fail();
- }
- }
-
- @Test
- public void registrar_getAssetFilePathByName() {
- testRegistrarFlutterAssetManager.getAssetFilePathByName("sample_movie.mp4");
- verify(mockRegistrar).lookupKeyForAsset("sample_movie.mp4");
- }
-}
diff --git a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml
index 1bf17a4..a79d03e 100644
--- a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml
+++ b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml
@@ -3,8 +3,8 @@
publish_to: none
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
dependencies:
flutter:
diff --git a/packages/webview_flutter/webview_flutter_android/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/pubspec.yaml
index b950d8e..5a283b9 100644
--- a/packages/webview_flutter/webview_flutter_android/pubspec.yaml
+++ b/packages/webview_flutter/webview_flutter_android/pubspec.yaml
@@ -2,11 +2,11 @@
description: A Flutter plugin that provides a WebView widget on Android.
repository: https://github.com/flutter/packages/tree/main/packages/webview_flutter/webview_flutter_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22
-version: 3.16.3
+version: 3.16.4
environment:
- sdk: ^3.2.0
- flutter: ">=3.16.0"
+ sdk: ^3.4.0
+ flutter: ">=3.22.0"
flutter:
plugin:
@@ -32,4 +32,4 @@
topics:
- html
- webview
- - webview-flutter
\ No newline at end of file
+ - webview-flutter
