Merge remote-tracking branch 'plugins/master'

Author: neokree

.cirrus.yml

@@ -59,7 +59,7 @@ task:
         - ./chromedriver/chromedriver --port=4444 &
       test_script:
         - cd $INTEGRATION_TEST_PATH/example/
-        - flutter drive -v --driver=test_driver/integration_test_driver.dart --target=integration_test/example_test.dart -d web-server --release --browser-name=chrome
+        - flutter drive -v --driver=test_driver/integration_test.dart --target=integration_test/example_test.dart -d web-server --release --browser-name=chrome
     - name: build-apks+java-test+firebase-test-lab
       env:
         matrix:

CODEOWNERS

@@ -4,22 +4,23 @@
 # These names are just suggestions. It is fine to have your changes
 # reviewed by someone else.
 
-packages/android_alarm_manager/*              @bkonyi
-packages/android_intent/*                     @mklim @matthew-carroll
-packages/battery/*                            @amirh @matthew-carroll
-packages/camera/*                             @bparrishMines
-packages/connectivity/*                       @cyanglaz @matthew-carroll
-packages/device_info/*                        @matthew-carroll
-packages/espresso/*                           @collinjackson @adazh
-packages/google_maps_flutter/*                @cyanglaz
-packages/google_sign_in/*                     @cyanglaz @mehmetf
-packages/image_picker/*                       @cyanglaz
-packages/integration_test/*                   @dnfield
-packages/in_app_purchase/*                    @mklim @cyanglaz @LHLL
-packages/ios_platform_images/*                @gaaclarke
-packages/package_info/*                       @cyanglaz @matthew-carroll
-packages/path_provider/*                      @matthew-carroll
-packages/shared_preferences/*                 @matthew-carroll
-packages/url_launcher/*                       @mklim
-packages/video_player/*                       @iskakaushik @cyanglaz
-packages/webview_flutter/*                    @amirh
+packages/android_alarm_manager/**              @bkonyi
+packages/android_intent/**                     @mklim @matthew-carroll
+packages/battery/**                            @amirh @matthew-carroll
+packages/camera/**                             @bparrishMines
+packages/connectivity/**                       @cyanglaz @matthew-carroll
+packages/device_info/**                        @matthew-carroll
+packages/espresso/**                           @collinjackson @adazh
+packages/file_selector/**                      @ditman
+packages/google_maps_flutter/**                @cyanglaz
+packages/google_sign_in/**                     @cyanglaz @mehmetf
+packages/image_picker/**                       @cyanglaz
+packages/integration_test/**                   @dnfield
+packages/in_app_purchase/**                    @mklim @cyanglaz @LHLL
+packages/ios_platform_images/**                @gaaclarke
+packages/package_info/**                       @cyanglaz @matthew-carroll
+packages/path_provider/**                      @matthew-carroll
+packages/shared_preferences/**                 @matthew-carroll
+packages/url_launcher/**                       @mklim
+packages/video_player/**                       @iskakaushik @cyanglaz
+packages/webview_flutter/**                    @amirh

README.md

@@ -1,3 +1,7 @@
+## 0.4.5+14
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.4.5+13
 
 * Android Code Inspection and Clean up.

packages/android_alarm_manager/CHANGELOG.md

@@ -13,7 +13,6 @@
 import android.util.Log;
 import androidx.core.app.AlarmManagerCompat;
 import androidx.core.app.JobIntentService;
-import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -91,15 +90,18 @@ public static void setCallbackDispatcher(Context context, long callbackHandle) {
   }
 
   /**
-   * Sets the {@link PluginRegistrantCallback} used to register the plugins used by an application
-   * with the newly spawned background isolate.
+   * Sets the {@link io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback} used to
+   * register the plugins used by an application with the newly spawned background isolate.
    *
    * <p>This should be invoked in {@link Application.onCreate} with {@link
    * GeneratedPluginRegistrant} in applications using the V1 embedding API in order to use other
    * plugins in the background isolate. For applications using the V2 embedding API, it is not
-   * necessary to set a {@link PluginRegistrantCallback} as plugins are registered automatically.
+   * necessary to set a {@link io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback} as
+   * plugins are registered automatically.
    */
-  public static void setPluginRegistrant(PluginRegistrantCallback callback) {
+  @SuppressWarnings("deprecation")
+  public static void setPluginRegistrant(
+      io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback callback) {
     // Indirectly set in FlutterBackgroundExecutor for backwards compatibility.
     FlutterBackgroundExecutor.setPluginRegistrant(callback);
   }

packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java

@@ -6,15 +6,14 @@
 
 import android.content.Context;
 import android.util.Log;
+import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.JSONMethodCodec;
 import io.flutter.plugin.common.MethodCall;
 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;
 
@@ -28,8 +27,8 @@
  *   <li>The Dart side of this plugin sends the Android side a "AlarmService.start" message, along
  *       with a Dart callback handle for a Dart callback that should be immediately invoked by a
  *       background Dart isolate.
- *   <li>The Android side of this plugin spins up a background {@link FlutterNativeView}, which
- *       includes a background Dart isolate.
+ *   <li>The Android side of this plugin spins up a background {@link FlutterEngine}, which includes
+ *       a background Dart isolate.
  *   <li>The Android side of this plugin instructs the new background Dart isolate to execute the
  *       callback that was received in the "AlarmService.start" message.
  *   <li>The Dart side of this plugin, running within the new background isolate, executes the
@@ -49,12 +48,13 @@ public class AndroidAlarmManagerPlugin implements FlutterPlugin, MethodCallHandl
 
   /**
    * Registers this plugin with an associated Flutter execution context, represented by the given
-   * {@link Registrar}.
+   * {@link io.flutter.plugin.common.PluginRegistry.Registrar}.
    *
    * <p>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) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     if (instance == null) {
       instance = new AndroidAlarmManagerPlugin();
     }

packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java

@@ -19,9 +19,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.PluginRegistrantCallback;
 import io.flutter.view.FlutterCallbackInformation;
-import io.flutter.view.FlutterMain;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -32,7 +30,10 @@
 public class FlutterBackgroundExecutor implements MethodCallHandler {
   private static final String TAG = "FlutterBackgroundExecutor";
   private static final String CALLBACK_HANDLE_KEY = "callback_handle";
-  private static PluginRegistrantCallback pluginRegistrantCallback;
+
+  @SuppressWarnings("deprecation")
+  private static io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
+      pluginRegistrantCallback;
 
   /**
    * The {@link MethodChannel} that connects the Android side of this plugin with the background
@@ -45,14 +46,16 @@ public class FlutterBackgroundExecutor implements MethodCallHandler {
   private AtomicBoolean isCallbackDispatcherReady = new AtomicBoolean(false);
 
   /**
-   * Sets the {@code PluginRegistrantCallback} used to register plugins with the newly spawned
-   * isolate.
+   * Sets the {@code io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback} used to
+   * register plugins with the newly spawned isolate.
    *
    * <p>Note: this is only necessary for applications using the V1 engine embedding API as plugins
    * are automatically registered via reflection in the V2 engine embedding API. If not set, alarm
    * callbacks will not be able to utilize functionality from other plugins.
    */
-  public static void setPluginRegistrant(PluginRegistrantCallback callback) {
+  @SuppressWarnings("deprecation")
+  public static void setPluginRegistrant(
+      io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback callback) {
     pluginRegistrantCallback = callback;
   }
 
@@ -101,7 +104,7 @@ public void onMethodCall(MethodCall call, Result result) {
    * <p>The isolate is configured as follows:
    *
    * <ul>
-   *   <li>Bundle Path: {@code FlutterMain.findAppBundlePath(context)}.
+   *   <li>Bundle Path: {@code io.flutter.view.FlutterMain.findAppBundlePath(context)}.
    *   <li>Entrypoint: The Dart method used the last time this plugin was initialized in the
    *       foreground.
    *   <li>Run args: none.
@@ -130,7 +133,7 @@ public void startBackgroundIsolate(Context context) {
    * <p>The isolate is configured as follows:
    *
    * <ul>
-   *   <li>Bundle Path: {@code FlutterMain.findAppBundlePath(context)}.
+   *   <li>Bundle Path: {@code io.flutter.view.FlutterMain.findAppBundlePath(context)}.
    *   <li>Entrypoint: The Dart method represented by {@code callbackHandle}.
    *   <li>Run args: none.
    * </ul>
@@ -151,7 +154,8 @@ public void startBackgroundIsolate(Context context, long callbackHandle) {
     }
 
     Log.i(TAG, "Starting AlarmService...");
-    String appBundlePath = FlutterMain.findAppBundlePath();
+    @SuppressWarnings("deprecation")
+    String appBundlePath = io.flutter.view.FlutterMain.findAppBundlePath();
     AssetManager assets = context.getAssets();
     if (!isRunning()) {
       backgroundFlutterEngine = new FlutterEngine(context);

packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java

@@ -5,4 +5,4 @@ Demonstrates how to use the android_alarm_manager plugin.
 ## Getting Started
 
 For help getting started with Flutter, view our online
-[documentation](http://flutter.io/).
+[documentation](https://flutter.dev/).

packages/android_alarm_manager/example/README.md

@@ -1,20 +1,21 @@
 package io.flutter.plugins.androidalarmmanagerexample;
 
 import io.flutter.app.FlutterApplication;
-import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
 import io.flutter.plugins.androidalarmmanager.AlarmService;
 import io.flutter.plugins.androidalarmmanager.AndroidAlarmManagerPlugin;
 
-public class Application extends FlutterApplication implements PluginRegistrantCallback {
+@SuppressWarnings("deprecation")
+public class Application extends FlutterApplication
+    implements io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback {
   @Override
   public void onCreate() {
     super.onCreate();
     AlarmService.setPluginRegistrant(this);
   }
 
   @Override
-  public void registerWith(PluginRegistry registry) {
+  @SuppressWarnings("deprecation")
+  public void registerWith(io.flutter.plugin.common.PluginRegistry registry) {
     AndroidAlarmManagerPlugin.registerWith(
         registry.registrarFor("io.flutter.plugins.androidalarmmanager.AndroidAlarmManagerPlugin"));
   }

packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/Application.java

@@ -5,10 +5,10 @@
 package io.flutter.plugins.androidalarmmanagerexample;
 
 import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.androidalarmmanager.AndroidAlarmManagerPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   public static final String TAG = "AlarmExampleMainActivity";
 
   @Override