Merge remote-tracking branch 'upstream/master'

Author: axel-op

.cirrus.yml

@@ -5,33 +5,57 @@ task:
     cpu: 8
     memory: 16G
   upgrade_script:
+    - flutter channel stable
+    - flutter upgrade
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
   activate_script: pub global activate flutter_plugin_tools
   matrix:
     - name: publishable
       script: ./script/check_publish.sh
-    - name: test+format
+    - name: format
       install_script:
         - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
         - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main"
         - sudo apt-get update
         - sudo apt-get install -y --allow-unauthenticated clang-format-7
       format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-7
-      test_script: ./script/incremental_build.sh test
+    - name: test
+      env:
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
+      test_script:
+        # TODO(jackson): Allow web plugins once supported on stable
+        # https://github.com/flutter/flutter/issues/42864
+        - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
+        - flutter channel $CHANNEL
+        - ./script/incremental_build.sh test
     - name: analyze
       script: ./script/incremental_build.sh analyze
     - name: build_all_plugins_apk
-      script: ./script/build_all_plugins_app.sh apk
+      script:
+        # TODO(jackson): Allow web plugins once supported on stable
+        # https://github.com/flutter/flutter/issues/42864
+        - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
+        - flutter channel $CHANNEL
+        - ./script/build_all_plugins_app.sh apk
     - name: build-apks+java-test+firebase-test-lab
       env:
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
       script:
+        # TODO(jackson): Allow web plugins once supported on stable
+        # https://github.com/flutter/flutter/issues/42864
+        - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
+        - flutter channel $CHANNEL
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.
         # See: https://github.com/flutter/flutter/issues/24935
@@ -60,17 +84,23 @@ task:
   setup_script:
     - pod repo update
   upgrade_script:
+    - flutter channel stable
+    - flutter upgrade
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
-  activate_script:
-    - pub global activate flutter_plugin_tools
+  activate_script: pub global activate flutter_plugin_tools
   create_simulator_script:
     - xcrun simctl list
     - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-2 | xargs xcrun simctl boot
   matrix:
     - name: build_all_plugins_ipa
-      script: ./script/build_all_plugins_app.sh ios --no-codesign
+      script:
+        # TODO(jackson): Allow web plugins once supported on stable
+        # https://github.com/flutter/flutter/issues/42864
+        - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
+        - flutter channel $CHANNEL
+        - ./script/build_all_plugins_app.sh ios --no-codesign
     - name: lint_darwin_plugins
       script: ./script/lint_darwin_plugins.sh
     - name: build-ipas+drive-examples
@@ -81,7 +111,14 @@ task:
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       build_script:
+        # TODO(jackson): Allow web plugins once supported on stable
+        # https://github.com/flutter/flutter/issues/42864
+        - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
+        - flutter channel $CHANNEL
         - ./script/incremental_build.sh build-examples --ipa
         - ./script/incremental_build.sh drive-examples

packages/android_alarm_manager/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.4+2
+
+* Remove AndroidX warning.
+
 ## 0.4.4+1
 
 * Update and migrate iOS example project.

packages/android_alarm_manager/android/build.gradle

@@ -1,16 +1,3 @@
-def PLUGIN = "android_alarm_manager";
-def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
-gradle.buildFinished { buildResult ->
-    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
-        println '         *********************************************************'
-        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
-        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
-        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
-        println '         *********************************************************'
-        rootProject.ext.set(ANDROIDX_WARNING, true);
-    }
-}
-
 group 'io.flutter.plugins.androidalarmmanager'
 version '1.0-SNAPSHOT'
 

packages/android_alarm_manager/pubspec.yaml

@@ -1,7 +1,7 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.4.4+1
+version: 0.4.4+2
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 

packages/android_intent/CHANGELOG.md

@@ -1,3 +1,20 @@
+##  0.3.4+5
+
+* Remove AndroidX warning.
+
+## 0.3.4+4
+
+* Include lifecycle dependency as a compileOnly one on Android to resolve
+  potential version conflicts with other transitive libraries.
+
+## 0.3.4+3
+
+* Android: Use android.arch.lifecycle instead of androidx.lifecycle:lifecycle in `build.gradle` to support apps that has not been migrated to AndroidX.
+
+## 0.3.4+2
+
+* Fix resolveActivity not respecting the provided componentName.
+
 ## 0.3.4+1
 
 * Fix minor lints in the Java platform code.

packages/android_intent/android/build.gradle

@@ -1,16 +1,3 @@
-def PLUGIN = "android_intent";
-def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
-gradle.buildFinished { buildResult ->
-    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
-        println '         *********************************************************'
-        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
-        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
-        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
-        println '         *********************************************************'
-        rootProject.ext.set(ANDROIDX_WARNING, true);
-    }
-}
-
 group 'io.flutter.plugins.androidintent'
 version '1.0-SNAPSHOT'
 
@@ -74,9 +61,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"
+                compileOnly "android.arch.lifecycle:runtime:$lifecycle_version"
+                compileOnly "android.arch.lifecycle:common:$lifecycle_version"
+                compileOnly "android.arch.lifecycle:common-java8:$lifecycle_version"
             }
         }
     }

packages/android_intent/android/gradle.properties

@@ -1,3 +1 @@
-android.enableJetifier=true
-android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M

packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/IntentSender.java

@@ -80,14 +80,14 @@ void send(
     }
     if (!TextUtils.isEmpty(packageName)) {
       intent.setPackage(packageName);
+      if (componentName != null) {
+        intent.setComponent(componentName);
+      }
       if (intent.resolveActivity(applicationContext.getPackageManager()) == null) {
         Log.i(TAG, "Cannot resolve explicit intent - ignoring package");
         intent.setPackage(null);
       }
     }
-    if (componentName != null) {
-      intent.setComponent(componentName);
-    }
 
     Log.v(TAG, "Sending intent " + intent);
     if (activity != null) {

packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/MethodCallHandlerImpl.java

@@ -79,8 +79,9 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
     Bundle arguments = convertArguments((Map<String, ?>) call.argument("arguments"));
     String packageName = call.argument("package");
     ComponentName componentName =
-        (!TextUtils.isEmpty(packageName) && !TextUtils.isEmpty((String) call.argument("component")))
-            ? new ComponentName(packageName, (String) call.argument("component"))
+        (!TextUtils.isEmpty(packageName)
+                && !TextUtils.isEmpty((String) call.argument("componentName")))
+            ? new ComponentName(packageName, (String) call.argument("componentName"))
             : null;
 
     sender.send(action, flags, category, data, arguments, packageName, componentName);

packages/android_intent/android/src/test/java/io/flutter/plugins/androidintent/MethodCallHandlerImplTest.java

@@ -13,6 +13,7 @@
 import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Application;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -27,6 +28,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowPackageManager;
 
 @RunWith(RobolectricTestRunner.class)
 public class MethodCallHandlerImplTest {
@@ -194,4 +196,28 @@ public void onMethodCall_clearsInvalidPackageNames() {
     assertNotNull(intent);
     assertNull(intent.getPackage());
   }
+
+  @Test
+  public void onMethodCall_setsComponentName() {
+    sender.setApplicationContext(context);
+    Map<String, Object> args = new HashMap<>();
+    ComponentName expectedComponent =
+        new ComponentName("io.flutter.plugins.androidintent", "MainActivity");
+    args.put("action", "foo");
+    args.put("package", expectedComponent.getPackageName());
+    args.put("componentName", expectedComponent.getClassName());
+    Result result = mock(Result.class);
+    ShadowPackageManager shadowPm =
+        shadowOf(ApplicationProvider.getApplicationContext().getPackageManager());
+    shadowPm.addActivityIfNotPresent(expectedComponent);
+
+    methodCallHandler.onMethodCall(new MethodCall("launch", args), result);
+
+    verify(result, times(1)).success(null);
+    Intent intent = shadowOf((Application) context).getNextStartedActivity();
+    assertNotNull(intent);
+    assertNotNull(intent.getComponent());
+    assertEquals(expectedComponent.getPackageName(), intent.getPackage());
+    assertEquals(expectedComponent.flattenToString(), intent.getComponent().flattenToString());
+  }
 }