Merge pull request #3 from flutter/master

Update from master

Author: otopba

.ci/Dockerfile

@@ -5,7 +5,6 @@ RUN yes | sdkmanager \
     "platforms;android-27" \
     "build-tools;27.0.3" \
     "extras;google;m2repository" \
-    "extras;android;m2repository" \
-    "system-images;android-21;default;armeabi-v7a"
+    "extras;android;m2repository"
 
 RUN yes | sdkmanager --licenses

.cirrus.yml

@@ -30,11 +30,6 @@ task:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
-      create_device_script:
-        echo no | avdmanager -v create avd -n test -k "system-images;android-21;default;armeabi-v7a"
-      start_emulator_background_script:
-      - $ANDROID_HOME/emulator/emulator -avd test -no-audio -no-window
-      wait_for_emulator_script: adb wait-for-device
       script:
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.
@@ -48,9 +43,6 @@ task:
         - export CIRRUS_COMMIT_MESSAGE=""
         - ./script/incremental_build.sh build-examples --apk
         - ./script/incremental_build.sh java-test  # must come after apk build
-        # TODO(jackson): Re-enable once Android emulators support Firebase
-        # https://github.com/flutter/flutter/issues/29571
-        # - ./script/incremental_build.sh drive-examples
         - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
 

AUTHORS

@@ -41,4 +41,6 @@ Jose Sanchez <[email protected]>
 Debkanchan Samadder <[email protected]>
 Audrius Karosevicius <[email protected]>
 Lukasz Piliszczuk <[email protected]>
-SoundReply Solutions GmbH <[email protected]>
+SoundReply Solutions GmbH <[email protected]>
+Rafal Wachol <[email protected]>
+Pau Picas <[email protected]>

CODEOWNERS

@@ -8,26 +8,12 @@ packages/android_alarm_manager/* @bkonyi
 packages/android_intent/* @mklim
 packages/battery/* @amirh
 packages/camera/* @bparrishMines @mklim
-packages/cloud_firestore/* @collinjackson @kroikie
-packages/cloud_functions/* @collinjackson @kroikie
 packages/connectivity/* @cyanglaz
-packages/firebase_admob/* @amirh @bparrishMines
-packages/firebase_analytics/* @collinjackson @kroikie
-packages/firebase_auth/* @collinjackson @kroikie
-packages/firebase_core/* @collinjackson @kroikie
-packages/firebase_crashlytics/* @kroikie @collinjackson
-packages/firebase_database/* @collinjackson @kroikie
-packages/firebase_dynamic_links/* @bparrishMines
-packages/firebase_in_app_messaging/* @collinjackson
-packages/firebase_messaging/* @collinjackson @kroikie
-packages/firebase_ml_vision/* @bparrishMines
-packages/firebase_performance/* @bparrishMines @collinjackson
-packages/firebase_remote_config/* @collinjackson @kroikie
-packages/firebase_storage/* @collinjackson @kroikie
 packages/google_maps_flutter/* @iskakaushik
 packages/google_sign_in/* @cyanglaz @mehmetf
 packages/image_picker/* @cyanglaz
 packages/in_app_purchase/* @mklim @cyanglaz
+packages/instrumentation_adapter/* @collinjackson @digiter
 packages/package_info/* @cyanglaz
 packages/path_provider/* @collinjackson
 packages/quick_actions/* @collinjackson

CONTRIBUTING.md

@@ -50,13 +50,20 @@ To run the unit tests:
 flutter test test/<name_of_plugin>_test.dart
 ```
 
-To run the integration tests:
+To run the integration tests using Flutter driver:
 
 ```
 cd example
 flutter drive test/<name_of_plugin>.dart
 ```
 
+To run integration tests as instrumentation tests on a local Android device:
+
+```
+cd example
+(cd android && ./gradlew -Ptarget=$(pwd)/../test_live/<name_of_plugin>_test.dart connectedAndroidTest)
+```
+
 ## Contributing code
 
 We gladly accept contributions via GitHub pull requests.

FlutterFire.md

@@ -58,22 +58,3 @@ These are the available plugins in this repository.
 | [url_launcher](./packages/url_launcher/) | [![pub package](https://img.shields.io/pub/v/url_launcher.svg)](https://pub.dev/packages/url_launcher) |
 | [video_player](./packages/video_player/) | [![pub package](https://img.shields.io/pub/v/video_player.svg)](https://pub.dev/packages/video_player) |
 | [webview_flutter](./packages/webview_flutter/) | [![pub package](https://img.shields.io/pub/v/webview_flutter.svg)](https://pub.dev/packages/webview_flutter) |
-| | |
-| **FlutterFire Plugins** |  |
-| [cloud_firestore](./packages/cloud_firestore/) | [![pub package](https://img.shields.io/pub/v/cloud_firestore.svg)](https://pub.dev/packages/cloud_firestore)
-| [cloud_functions](./packages/cloud_functions/) | [![pub package](https://img.shields.io/pub/v/cloud_functions.svg)](https://pub.dev/packages/cloud_functions) |
-| [firebase_admob](./packages/firebase_admob/) | [![pub package](https://img.shields.io/pub/v/firebase_admob.svg)](https://pub.dev/packages/firebase_admob) |
-| [firebase_analytics](./packages/firebase_analytics/) | [![pub package](https://img.shields.io/pub/v/firebase_analytics.svg)](https://pub.dev/packages/firebase_analytics) |
-| [firebase_auth](./packages/firebase_auth/) | [![pub package](https://img.shields.io/pub/v/firebase_auth.svg)](https://pub.dev/packages/firebase_auth) |
-| [firebase_core](./packages/firebase_core/) | [![pub package](https://img.shields.io/pub/v/firebase_core.svg)](https://pub.dev/packages/firebase_core) |
-| [firebase_crashlytics](./packages/firebase_crashlytics/) | [![pub package](https://img.shields.io/pub/v/firebase_crashlytics.svg)](https://pub.dev/packages/firebase_crashlytics) |
-| [firebase_database](./packages/firebase_database/) | [![pub package](https://img.shields.io/pub/v/firebase_database.svg)](https://pub.dev/packages/firebase_database) |
-| [firebase_dynamic_links](./packages/firebase_dynamic_links/) | [![pub package](https://img.shields.io/pub/v/firebase_dynamic_links.svg)](https://pub.dev/packages/firebase_dynamic_links) |
-| [firebase_in_app_messaging](./packages/firebase_in_app_messaging/) | [![pub package](https://img.shields.io/pub/v/firebase_in_app_messaging.svg)](https://pub.dev/packages/firebase_in_app_messaging) |
-| [firebase_messaging](./packages/firebase_messaging/) | [![pub package](https://img.shields.io/pub/v/firebase_messaging.svg)](https://pub.dev/packages/firebase_messaging) |
-| [firebase_ml_vision](./packages/firebase_ml_vision/) | [![pub package](https://img.shields.io/pub/v/firebase_ml_vision.svg)](https://pub.dev/packages/firebase_ml_vision) |
-| [firebase_performance](./packages/firebase_performance/) | [![pub package](https://img.shields.io/pub/v/firebase_performance.svg)](https://pub.dev/packages/firebase_performance) |
-| [firebase_remote_config](./packages/firebase_remote_config/) | [![pub package](https://img.shields.io/pub/v/firebase_remote_config.svg)](https://pub.dev/packages/firebase_remote_config) |
-| [firebase_storage](./packages/firebase_storage/) | [![pub package](https://img.shields.io/pub/v/firebase_storage.svg)](https://pub.dev/packages/firebase_storage) |
-
-Learn more about [FlutterFire](https://github.com/flutter/plugins/blob/master/FlutterFire.md).

README.md

@@ -59,6 +59,7 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
+    implementation 'com.google.guava:guava:27.0.1-android'
     androidTestImplementation 'androidx.test:runner:1.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     api 'androidx.exifinterface:exifinterface:1.0.0'

examples/all_plugins/android/app/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
 

examples/all_plugins/android/build.gradle

@@ -1,3 +1,11 @@
+## 0.4.4
+
+* Add `id` to `callback` if it is of type `Function(int)`
+
+## 0.4.3
+
+* Added `oneShotAt` method to run `callback` at a given DateTime `time`.
+
 ## 0.4.2
 
 * Added support for setting alarms which work when the phone is in doze mode.

packages/android_alarm_manager/CHANGELOG.md

@@ -211,7 +211,8 @@ public void notImplemented() {
     // provided.
     // TODO(mattcarroll): consider giving a method name anyway for the purpose of developer discoverability
     //                    when reading the source code. Especially on the Dart side.
-    sBackgroundChannel.invokeMethod("", new Object[] {callbackHandle}, result);
+    sBackgroundChannel.invokeMethod(
+        "", new Object[] {callbackHandle, intent.getIntExtra("id", -1)}, result);
   }
 
   private static void scheduleAlarm(
@@ -242,6 +243,7 @@ private static void scheduleAlarm(
 
     // Create an Intent for the alarm and set the desired Dart callback handle.
     Intent alarm = new Intent(context, AlarmBroadcastReceiver.class);
+    alarm.putExtra("id", requestCode);
     alarm.putExtra("callbackHandle", callbackHandle);
     PendingIntent pendingIntent =
         PendingIntent.getBroadcast(context, requestCode, alarm, PendingIntent.FLAG_UPDATE_CURRENT);

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

@@ -50,7 +50,7 @@ public static void registerWith(Registrar registrar) {
     // alarmManagerPluginChannel is the channel responsible for receiving the following messages
     // from the main Flutter app:
     // - "AlarmService.start"
-    // - "Alarm.oneShot"
+    // - "Alarm.oneShotAt"
     // - "Alarm.periodic"
     // - "Alarm.cancel"
     final MethodChannel alarmManagerPluginChannel =
@@ -125,7 +125,7 @@ public void onMethodCall(MethodCall call, Result result) {
         PeriodicRequest periodicRequest = PeriodicRequest.fromJson((JSONArray) arguments);
         AlarmService.setPeriodic(mContext, periodicRequest);
         result.success(true);
-      } else if (method.equals("Alarm.oneShot")) {
+      } else if (method.equals("Alarm.oneShotAt")) {
         // This message indicates that the Flutter app would like to schedule a one-time
         // task.
         OneShotRequest oneShotRequest = OneShotRequest.fromJson((JSONArray) arguments);