in and array contains fixes

* bump core version to 0.4.1+4 (firebase#1395)

* Remove deprecated firebase-core dependency (firebase#1417)

* Remove deprecated firebase-core dependency

* [firebase_auth] getIdToken use actual refresh value instead of checking if object exists (firebase#1334)

* getIdToken use actual refresh value instead of checking if object exists

* getIdToken refresh integration test

* update xcode to v11 (firebase#1420)

* Update FirebaseApp creation in tests (firebase#1406)

* [firebase_database] Support v2 android embedder. (firebase#287)

* [firebase_remote_config] Support v2 android embedder. (firebase#282)

* [CI] Add version to example apps (firebase#1426)

* Add hardcode version to example apps

* [firebase_core] Add platform interface (firebase#1324)

* Move firebase_core to firebase_core/firebase_core
* Add firebase_core_platform_interface package
* Update cirrus scripts and documentation

* [firebase_dynamic_links] Add support of expanding from short links (firebase#1381)

* Fixes strict compilation errors. (firebase#1331)

* Upgrade crashlytics to v2 plugin API (firebase#1370)

* Upgraded Crashlytics to v2 of Flutter Plugins.

* Format documentation lists (See also & Errors) correctly (firebase#298)

Fix documentation list format.

* [firebase_auth] Fix NoSuchMethodError exception in `reauthenticateWithCredential` (firebase#237)

* [firebase_auth] Fix NoSuchMethodError exception

Fix NoSuchMethodError exception when calling FirebaseUser.reauthenticateWithCredential

* add integration test

* Fix analyzer warnings

Co-Authored-By: Collin Jackson <[email protected]>

* [cloud_firestore] [firebase_performance] fix analyzer warnings (firebase#1453)

* fix analyzer warnings

* [CI] Skip flaky firebase_performance driver tests (firebase#1452)

* Skip flaky firebase_performance driver tests

* [firebase_auth] Added missing Exception to the reauthenticateWithCredential docs (firebase#1448) (firebase#1449)

* Added missing Exception to the reauthenticateWithCredential docs (firebase#1448)

* [firebase_remote_config] Bumps Android Firebase dependency to 19.0.3 (firebase#1443)

* Bump AGP, Gradle & Google Services Plugin

* Bumps dependency to Firebase Config 19.0.3

* Replaces a deprecated method usage with the updated version

* [firebase_messaging] Use UNUserNotificationCenter for ios 10+ (firebase#121)

* Use UNUserNotificationCenter for ios 10+

* Add swift documentation

* Move http test to README

* Update CONTRIBUTING.md (firebase#1473)

Removes obsolete recommendations about removing mockito (which is now used in testing federated plugins).

* [firebase_core] Migrate to platform_interface (firebase#1472)

* [firebase_messaging] Add an ArgumentError when passing invalid background message (firebase#252)

* [firebase_dynamic_links] support v2 embedding (firebase#1372)

* [cloud_firestore] Fix test that used FirebaseApp.channel (firebase#1476)

* [cloud_firestore] Fix test that used FirebaseApp.channel

* dartfmt

* bump version

* Fixed dynamic issue

* Fixed dynamic issue

* FIxed Object to list of object mapping

* Fixed text result expectation

* Reverted some changes

* Satisfying formatter

* Added android x to pass the test

* Fixed changed log auto formatting

Author: awazgyawali

.cirrus.yml

@@ -68,7 +68,7 @@ task:
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   osx_instance:
-    image: mojave-xcode-10.2-flutter
+    image: mojave-xcode-11.2.1-flutter
   setup_script:
     - pod repo update
   upgrade_script:

AUTHORS

@@ -41,4 +41,5 @@ 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]>
+Michel Feinstein <[email protected]>

CONTRIBUTING.md

@@ -95,13 +95,6 @@ Plugins tests are run automatically on contributions using Cirrus CI. However, d
 cost constraints, pull requests from non-committers may not run all the tests
 automatically.
 
-The plugins team prefers that unit tests are written using `setMockMethodCallHandler`
-rather than using mockito to mock out `MethodChannel`. For a list of the plugins that
-are still using the mockito testing style and need to be converted, see
-[issue 34284](https://github.com/flutter/flutter/issues/34284). If you are contributing
-tests to an existing plugin that uses mockito `MethodChannel`, consider converting
-them to use `setMockMethodCallHandler` instead.
-
 Once you've gotten an LGTM from a project maintainer and once your PR has received
 the green light from all our automated testing, wait for one the package maintainers
 to merge the pull request and `pub submit` any affected packages.

packages/cloud_firestore/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 * Added support for `in` and `array-contains-any` query operators.
 
+## 0.12.10+3
+
+* Fixed test that used `FirebaseApp.channel`.
+
+## 0.12.10+2
+
+* Fixed analyzer warnings about unused fields.
+
+## 0.12.10+1
+
+* Formatted method documentations.
+
 ## 0.12.10
 
 * Added `FieldPath` class and `FieldPath.documentId` to refer to the document id in queries.
@@ -44,7 +56,7 @@
 ## 0.12.9
 
 * New optional `includeMetadataChanges` parameter added to `DocumentReference.snapshots()`
- and `Query.snapshots()`
+  and `Query.snapshots()`
 * Fix example app crash when the `message` field was not a string
 * Internal renaming of method names.
 
@@ -77,6 +89,7 @@
 * Automatically use version from pubspec.yaml when reporting usage to Firebase.
 
 ## 0.12.5+1
+
 * Added support for combining any of `Query.startAtDocument` and `Query.startAfterDocument`
   with any of `Query.endAtDocument` and `Query.endBeforeDocument`.
 
@@ -363,15 +376,19 @@ To update iOS SDK in existing projects run `pod update Firebase/Firestore`.
 * Add `DocumentSnapshot.exists`.
 
 ## 0.2.11
+
 * Fix Dart 2 type errors.
 
 ## 0.2.10
+
 * Fix Dart 2 type errors.
 
 ## 0.2.9
-* Relax sdk upper bound constraint to  '<2.0.0' to allow 'edge' dart sdk use.
+
+* Relax sdk upper bound constraint to '<2.0.0' to allow 'edge' dart sdk use.
 
 ## 0.2.8
+
 * Support for Query.getDocuments
 
 ## 0.2.7

packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java

@@ -291,18 +291,20 @@ private Query getQuery(Map<String, Object> arguments) {
           // Invalid type.
         }
       } else if ("array-contains-any".equals(operator)) {
+        List<Object> values = (List<Object>) value;
         if (fieldName != null) {
-          query = query.whereArrayContainsAny(fieldName, value);
+          query = query.whereArrayContainsAny(fieldName, values);
         } else if (fieldPath != null) {
-          query = query.whereArrayContainsAny(fieldPath, value);
+          query = query.whereArrayContainsAny(fieldPath, values);
         } else {
           // Invalid type.
         }
       } else if ("in".equals(operator)) {
+        List<Object> values = (List<Object>) value;
         if (fieldName != null) {
-          query = query.whereIn(fieldName, value);
+          query = query.whereIn(fieldName, values);
         } else if (fieldPath != null) {
-          query = query.whereIn(fieldPath, value);
+          query = query.whereIn(fieldPath, values);
         } else {
           // Invalid type.
         }

packages/cloud_firestore/example/android/gradle.properties

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

packages/cloud_firestore/example/test_driver/cloud_firestore.dart

@@ -340,8 +340,8 @@ void main() {
       await ref.document('maputo').setData(<String, dynamic>{
         'country': 'Mozambique',
       });
-      QuerySnapshot snapshot = await ref
-          .where('country', whereIn: ['USA', 'Mozambique'])
+      final QuerySnapshot snapshot = await ref
+          .where('country', whereIn: <String>['USA', 'Mozambique'])
           .orderBy('country')
           .getDocuments();
       final List<DocumentSnapshot> results = snapshot.documents;
@@ -356,23 +356,22 @@ void main() {
       final CollectionReference ref = firestore.collection('cities');
       await ref.document('la').setData(<String, dynamic>{
         'country': 'USA',
-        'regions': ['west-coast', 'east-coast'],
+        'regions': <String>['west-coast', 'east-coast'],
       });
       await ref.document('tokyo').setData(<String, dynamic>{
         'country': 'Japan',
-        'regions': ['kanto', 'honshu'],
+        'regions': <String>['kanto', 'honshu'],
       });
-      QuerySnapshot snapshot = await ref
-          .where('regions', arrayContainsAny: ['kanto', 'west-coast'])
+      final QuerySnapshot snapshot = await ref
+          .where('regions', arrayContainsAny: <String>['kanto', 'west-coast'])
           .orderBy('country')
           .getDocuments();
       final List<DocumentSnapshot> results = snapshot.documents;
       expect(results.length, 2);
       final DocumentSnapshot snapshot1 = results[0];
       final DocumentSnapshot snapshot2 = results[1];
-      expect(snapshot1.documentID, 'moz');
-      expect(snapshot2.documentID, 'usa');
+      expect(snapshot1.documentID, 'la');
+      expect(snapshot2.documentID, 'tokyo');
     });
-
   });
 }

packages/cloud_firestore/lib/src/document_change.dart

@@ -23,22 +23,20 @@ enum DocumentChangeType {
 /// It contains the document affected and the type of change that occurred
 /// (added, modified, or removed).
 class DocumentChange {
-  DocumentChange._(Map<dynamic, dynamic> data, this._firestore)
+  DocumentChange._(Map<dynamic, dynamic> data, Firestore firestore)
       : oldIndex = data['oldIndex'],
         newIndex = data['newIndex'],
         document = DocumentSnapshot._(
           data['path'],
           _asStringKeyedMap(data['document']),
           SnapshotMetadata._(data["metadata"]["hasPendingWrites"],
               data["metadata"]["isFromCache"]),
-          _firestore,
+          firestore,
         ),
         type = DocumentChangeType.values.firstWhere((DocumentChangeType type) {
           return type.toString() == data['type'];
         });
 
-  final Firestore _firestore;
-
   /// The type of change that occurred (added, modified, or removed).
   final DocumentChangeType type;
 

packages/cloud_firestore/lib/src/query.dart

@@ -158,8 +158,7 @@ class Query {
       addCondition(field, 'array-contains', arrayContains);
     if (arrayContainsAny != null)
       addCondition(field, 'array-contains-any', arrayContainsAny);
-    if (whereIn != null)
-      addCondition(field, 'in', whereIn);
+    if (whereIn != null) addCondition(field, 'in', whereIn);
     if (isNull != null) {
       assert(
           isNull,
@@ -219,6 +218,7 @@ class Query {
   /// [endBefore], [endAtDocument] and [endBeforeDocument].
   ///
   /// See also:
+  ///
   ///  * [endAfterDocument] for a query that ends after a document.
   ///  * [startAtDocument] for a query that starts at a document.
   ///  * [endAtDocument] for a query that ends at a document.
@@ -253,6 +253,7 @@ class Query {
   /// [endBefore], [endAtDocument] and [endBeforeDocument].
   ///
   /// See also:
+  ///
   ///  * [startAfterDocument] for a query that starts after a document.
   ///  * [endAtDocument] for a query that ends at a document.
   ///  * [endBeforeDocument] for a query that ends before a document.
@@ -321,6 +322,7 @@ class Query {
   /// [startAfter], [startAtDocument] and [startAfterDocument].
   ///
   /// See also:
+  ///
   ///  * [startAfterDocument] for a query that starts after a document.
   ///  * [startAtDocument] for a query that starts at a document.
   ///  * [endBeforeDocument] for a query that ends before a document.
@@ -372,6 +374,7 @@ class Query {
   /// [startAfter], [startAtDocument] and [startAfterDocument].
   ///
   /// See also:
+  ///
   ///  * [startAfterDocument] for a query that starts after document.
   ///  * [startAtDocument] for a query that starts at a document.
   ///  * [endAtDocument] for a query that ends at a document.

packages/cloud_firestore/lib/src/query_snapshot.dart

@@ -6,7 +6,7 @@ part of cloud_firestore;
 
 /// A QuerySnapshot contains zero or more DocumentSnapshot objects.
 class QuerySnapshot {
-  QuerySnapshot._(Map<dynamic, dynamic> data, this._firestore)
+  QuerySnapshot._(Map<dynamic, dynamic> data, Firestore firestore)
       : documents = List<DocumentSnapshot>.generate(data['documents'].length,
             (int index) {
           return DocumentSnapshot._(
@@ -16,14 +16,14 @@ class QuerySnapshot {
               data['metadatas'][index]['hasPendingWrites'],
               data['metadatas'][index]['isFromCache'],
             ),
-            _firestore,
+            firestore,
           );
         }),
         documentChanges = List<DocumentChange>.generate(
             data['documentChanges'].length, (int index) {
           return DocumentChange._(
             data['documentChanges'][index],
-            _firestore,
+            firestore,
           );
         }),
         metadata = SnapshotMetadata._(
@@ -39,6 +39,4 @@ class QuerySnapshot {
   final List<DocumentChange> documentChanges;
 
   final SnapshotMetadata metadata;
-
-  final Firestore _firestore;
 }

packages/cloud_firestore/pubspec.yaml

@@ -1,5 +1,6 @@
 name: cloud_firestore
-description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database with
+description:
+  Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database with
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <[email protected]>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/cloud_firestore

packages/cloud_firestore/test/cloud_firestore_test.dart

@@ -28,10 +28,13 @@ void main() {
       "hasPendingWrites": false,
       "isFromCache": false,
     };
+    const MethodChannel firebaseCoreChannel =
+        MethodChannel('plugins.flutter.io/firebase_core');
+
     setUp(() async {
       mockHandleId = 0;
       // Required for FirebaseApp.configure
-      FirebaseApp.channel.setMockMethodCallHandler(
+      firebaseCoreChannel.setMockMethodCallHandler(
         (MethodCall methodCall) async {},
       );
       app = await FirebaseApp.configure(
@@ -175,7 +178,7 @@ void main() {
     });
 
     test('settings', () async {
-      final FirebaseApp app = const FirebaseApp(name: "testApp2");
+      final FirebaseApp app = FirebaseApp(name: "testApp2");
       final Firestore firestoreWithSettings = Firestore(app: app);
       await firestoreWithSettings.settings(
         persistenceEnabled: true,
@@ -396,10 +399,10 @@ void main() {
       });
       test('where in', () async {
         final StreamSubscription<QuerySnapshot> subscription =
-        collectionReference
-            .where('country', whereIn: ['USA', 'Japan'])
-            .snapshots()
-            .listen((QuerySnapshot querySnapshot) {});
+            collectionReference
+                .where('country', whereIn: <String>['USA', 'Japan'])
+                .snapshots()
+                .listen((QuerySnapshot querySnapshot) {});
         subscription.cancel();
         await Future<void>.delayed(Duration.zero);
         expect(
@@ -413,7 +416,11 @@ void main() {
                 'isCollectionGroup': false,
                 'parameters': <String, dynamic>{
                   'where': <List<dynamic>>[
-                    <dynamic>['country', 'in', ['USA', 'Japan']],
+                    <dynamic>[
+                      'country',
+                      'in',
+                      <String>['USA', 'Japan']
+                    ],
                   ],
                   'orderBy': <List<dynamic>>[],
                 },
@@ -429,10 +436,11 @@ void main() {
       });
       test('where array-contains-any', () async {
         final StreamSubscription<QuerySnapshot> subscription =
-        collectionReference
-            .where('regions', arrayContainsAny: ['west-coast', 'east-coast'])
-            .snapshots()
-            .listen((QuerySnapshot querySnapshot) {});
+            collectionReference
+                .where('regions',
+                    arrayContainsAny: <String>['west-coast', 'east-coast'])
+                .snapshots()
+                .listen((QuerySnapshot querySnapshot) {});
         subscription.cancel();
         await Future<void>.delayed(Duration.zero);
         expect(
@@ -446,7 +454,11 @@ void main() {
                 'isCollectionGroup': false,
                 'parameters': <String, dynamic>{
                   'where': <List<dynamic>>[
-                    <dynamic>['regions', 'array-contains-any', ['west-coast', 'east-coast']],
+                    <dynamic>[
+                      'regions',
+                      'array-contains-any',
+                      <String>['west-coast', 'east-coast']
+                    ],
                   ],
                   'orderBy': <List<dynamic>>[],
                 },

packages/cloud_functions/test/cloud_functions_test.dart

@@ -34,7 +34,7 @@ void main() {
           .getHttpsCallable(functionName: 'baz')
           .call();
       final HttpsCallable callable =
-          CloudFunctions(app: const FirebaseApp(name: '1337'), region: 'space')
+          CloudFunctions(app: FirebaseApp(name: '1337'), region: 'space')
               .getHttpsCallable(functionName: 'qux')
                 ..timeout = const Duration(days: 300);
       await callable.call(<String, dynamic>{

packages/firebase_analytics/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.0.7
+
+* Formatted `setCurrentScreen` documentation.
+
 ## 5.0.6
 
 * Updated README instructions for contributing for consistency with other Flutterfire plugins.

packages/firebase_analytics/lib/firebase_analytics.dart

@@ -86,8 +86,8 @@ class FirebaseAnalytics {
   ///
   /// See also:
   ///
-  /// https://firebase.google.com/docs/reference/android/com/google/firebase/analytics/FirebaseAnalytics.html#setCurrentScreen(android.app.Activity, java.lang.String, java.lang.String)
-  /// https://firebase.google.com/docs/reference/ios/firebaseanalytics/api/reference/Classes/FIRAnalytics#setscreennamescreenclass
+  ///  * https://firebase.google.com/docs/reference/android/com/google/firebase/analytics/FirebaseAnalytics.html#setCurrentScreen(android.app.Activity, java.lang.String, java.lang.String)
+  ///  * https://firebase.google.com/docs/reference/ios/firebaseanalytics/api/reference/Classes/FIRAnalytics#setscreennamescreenclass
   Future<void> setCurrentScreen(
       {@required String screenName,
       String screenClassOverride = 'Flutter'}) async {

packages/firebase_analytics/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <[email protected]>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_analytics
-version: 5.0.6
+version: 5.0.7
 
 flutter:
   plugin: