## Description

.cirrus.yml

@@ -69,6 +69,7 @@ task:
     SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
   setup_script:
     - brew update
+    - brew upgrade cocoapods
     - brew install libimobiledevice
     - brew install ideviceinstaller
     - brew install ios-deploy

packages/cloud_firestore/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.12.3
+
+* Added support for `Query.collectionGroup`.
+
 ## 0.12.2
 
 * Ensure that all channel calls to the Dart side from the Java side are done

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

@@ -89,6 +89,16 @@ private FirebaseFirestore getFirestore(Map<String, Object> arguments) {
     return FirebaseFirestore.getInstance(FirebaseApp.getInstance(appName));
   }
 
+  private Query getReference(Map<String, Object> arguments) {
+    if ((boolean) arguments.get("isCollectionGroup")) return getCollectionGroupReference(arguments);
+    else return getCollectionReference(arguments);
+  }
+
+  private Query getCollectionGroupReference(Map<String, Object> arguments) {
+    String path = (String) arguments.get("path");
+    return getFirestore(arguments).collectionGroup(path);
+  }
+
   private CollectionReference getCollectionReference(Map<String, Object> arguments) {
     String path = (String) arguments.get("path");
     return getFirestore(arguments).collection(path);
@@ -180,7 +190,7 @@ private Transaction getTransaction(Map<String, Object> arguments) {
   }
 
   private Query getQuery(Map<String, Object> arguments) {
-    Query query = getCollectionReference(arguments);
+    Query query = getReference(arguments);
     @SuppressWarnings("unchecked")
     Map<String, Object> parameters = (Map<String, Object>) arguments.get("parameters");
     if (parameters == null) return query;

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

@@ -8,7 +8,7 @@
 
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   private static final String LIBRARY_NAME = "flutter-fire-fst";
-  private static final String LIBRARY_VERSION = "0.12.2";
+  private static final String LIBRARY_VERSION = "0.12.3";
 
   @Override
   public List<Component<?>> getComponents() {

packages/cloud_firestore/example/test_driver/cloud_firestore.dart

@@ -25,7 +25,7 @@ void main() {
       firestore = Firestore(app: app);
     });
 
-    test('getDocuments', () async {
+    test('getDocumentsFromCollection', () async {
       final Query query = firestore
           .collection('messages')
           .where('message', isEqualTo: 'Hello world!')
@@ -43,6 +43,21 @@ void main() {
       expect(snapshot.data['message'], 'Hello world!');
     });
 
+    test('getDocumentsFromCollectionGroup', () async {
+      final Query query = firestore
+          .collectionGroup('reviews')
+          .where('message', isEqualTo: 'Hello world!')
+          .limit(1);
+      final QuerySnapshot querySnapshot = await query.getDocuments();
+      expect(querySnapshot.documents.first['message'], 'Hello world!');
+      final DocumentReference firstDoc =
+          querySnapshot.documents.first.reference;
+      final DocumentSnapshot documentSnapshot = await firstDoc.get();
+      expect(documentSnapshot.data['message'], 'Hello world!');
+      final DocumentSnapshot snapshot = await firstDoc.snapshots().first;
+      expect(snapshot.data['message'], 'Hello world!');
+    });
+
     test('increment', () async {
       final DocumentReference ref = firestore.collection('messages').document();
       await ref.setData(<String, dynamic>{

packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m

@@ -7,7 +7,7 @@
 #import <Firebase/Firebase.h>
 
 #define LIBRARY_NAME @"flutter-firebase_cloud_firestore"
-#define LIBRARY_VERSION @"0.12.2"
+#define LIBRARY_VERSION @"0.12.3"
 
 static FlutterError *getFlutterError(NSError *error) {
   if (error == nil) return nil;
@@ -42,7 +42,14 @@
 }
 
 static FIRQuery *getQuery(NSDictionary *arguments) {
-  FIRQuery *query = [getFirestore(arguments) collectionWithPath:arguments[@"path"]];
+  NSNumber *data = arguments[@"isCollectionGroup"];
+  BOOL isCollectionGroup = data.boolValue;
+  FIRQuery *query;
+  if (isCollectionGroup) {
+    query = [getFirestore(arguments) collectionGroupWithID:arguments[@"path"]];
+  } else {
+    query = [getFirestore(arguments) collectionWithPath:arguments[@"path"]];
+  }
   NSDictionary *parameters = arguments[@"parameters"];
   NSArray *whereConditions = parameters[@"where"];
   for (id item in whereConditions) {

packages/cloud_firestore/lib/src/firestore.dart

@@ -71,6 +71,17 @@ class Firestore {
     return CollectionReference._(this, path.split('/'));
   }
 
+  /// Gets a [Query] for the specified collection group.
+  Query collectionGroup(String path) {
+    assert(path != null);
+    assert(!path.contains("/"), "Collection IDs must not contain '/'.");
+    return Query._(
+      firestore: this,
+      isCollectionGroup: true,
+      pathComponents: path.split('/'),
+    );
+  }
+
   /// Gets a [DocumentReference] for the specified Firestore path.
   DocumentReference document(String path) {
     assert(path != null);

packages/cloud_firestore/lib/src/query.dart

@@ -9,8 +9,10 @@ class Query {
   Query._(
       {@required this.firestore,
       @required List<String> pathComponents,
+      bool isCollectionGroup = false,
       Map<String, dynamic> parameters})
       : _pathComponents = pathComponents,
+        _isCollectionGroup = isCollectionGroup,
         _parameters = parameters ??
             Map<String, dynamic>.unmodifiable(<String, dynamic>{
               'where': List<List<dynamic>>.unmodifiable(<List<dynamic>>[]),
@@ -24,12 +26,14 @@ class Query {
 
   final List<String> _pathComponents;
   final Map<String, dynamic> _parameters;
+  final bool _isCollectionGroup;
 
   String get _path => _pathComponents.join('/');
 
   Query _copyWithParameters(Map<String, dynamic> parameters) {
     return Query._(
       firestore: firestore,
+      isCollectionGroup: _isCollectionGroup,
       pathComponents: _pathComponents,
       parameters: Map<String, dynamic>.unmodifiable(
         Map<String, dynamic>.from(_parameters)..addAll(parameters),
@@ -58,6 +62,7 @@ class Query {
           <String, dynamic>{
             'app': firestore.app.name,
             'path': _path,
+            'isCollectionGroup': _isCollectionGroup,
             'parameters': _parameters,
           },
         ).then<int>((dynamic result) => result);
@@ -88,6 +93,7 @@ class Query {
       <String, dynamic>{
         'app': firestore.app.name,
         'path': _path,
+        'isCollectionGroup': _isCollectionGroup,
         'parameters': _parameters,
         'source': _getSourceString(source),
       },

packages/cloud_firestore/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <[email protected]>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.12.2
+version: 0.12.3
 
 flutter:
   plugin: