firebase · Lyokone · Jun 10, 2024 · Jun 10, 2024 · Jun 10, 2024 · Jun 10, 2024
diff --git a/packages/cloud_firestore/cloud_firestore/example/macos/Runner.xcodeproj/project.pbxproj b/packages/cloud_firestore/cloud_firestore/example/macos/Runner.xcodeproj/project.pbxproj
diff --git a/...ore/cloud_firestore/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/...ore/cloud_firestore/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,6 +37,17 @@
          </BuildableReference>
       </MacroExpansion>
       <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "331C80D4294CF70F00263BE5"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/...store/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/...store/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
diff --git a/...estore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/...estore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
diff --git a/...restore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/...restore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
diff --git a/...estore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/...estore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
diff --git a/...restore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/...restore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
diff --git a/...estore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/...estore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
diff --git a/...restore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/...restore/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
diff --git a/packages/cloud_firestore/cloud_firestore/example/macos/Runner/Configs/AppInfo.xcconfig b/packages/cloud_firestore/cloud_firestore/example/macos/Runner/Configs/AppInfo.xcconfig
@@ -8,7 +8,7 @@
 PRODUCT_NAME = example
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firebase.example
+PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firebase.firestore.example
 
 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2022 io.flutter.plugins.firebase. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2024 io.flutter.plugins.firebase.firestore. All rights reserved.
diff --git a/packages/cloud_firestore/cloud_firestore/example/macos/Runner/MainFlutterWindow.swift b/packages/cloud_firestore/cloud_firestore/example/macos/Runner/MainFlutterWindow.swift
@@ -3,7 +3,7 @@ import FlutterMacOS
 
 class MainFlutterWindow: NSWindow {
   override func awakeFromNib() {
-    let flutterViewController = FlutterViewController.init()
+    let flutterViewController = FlutterViewController()
     let windowFrame = self.frame
     self.contentViewController = flutterViewController
     self.setFrame(windowFrame, display: true)

diff --git a/packages/cloud_firestore/cloud_firestore/example/macos/RunnerTests/RunnerTests.swift b/packages/cloud_firestore/cloud_firestore/example/macos/RunnerTests/RunnerTests.swift
@@ -0,0 +1,14 @@
+// Copyright 2024, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import Cocoa
+import FlutterMacOS
+import XCTest
+
+class RunnerTests: XCTestCase {
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+}
diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FirestorePigeonParser.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FirestorePigeonParser.m
@@ -60,10 +60,10 @@ + (FIRFilter *_Nonnull)filterFromJson:(NSDictionary<NSString *, id> *_Nullable)m
   @throw [NSException exceptionWithName:@"InvalidOperator" reason:@"Invalid operator" userInfo:nil];
 }
 
-+ (FIRQuery *)parseQueryWithParameters:(nonnull PigeonQueryParameters *)parameters
-                             firestore:(nonnull FIRFirestore *)firestore
-                                  path:(nonnull NSString *)path
-                     isCollectionGroup:(Boolean)isCollectionGroup {
++ (FIRQuery *_Nonnull)parseQueryWithParameters:(nonnull PigeonQueryParameters *)parameters
+                                     firestore:(nonnull FIRFirestore *)firestore
+                                          path:(nonnull NSString *)path
+                             isCollectionGroup:(Boolean)isCollectionGroup {
   @try {
     FIRQuery *query;
 
@@ -177,7 +177,8 @@ + (FIRFirestoreSource)parseSource:(Source)source {
   }
 }
 
-+ (NSArray<FIRFieldPath *> *)parseFieldPath:(NSArray<NSArray<NSString *> *> *)fieldPaths {
++ (NSArray<FIRFieldPath *> *_Nonnull)parseFieldPath:
+    (NSArray<NSArray<NSString *> *> *_Nonnull)fieldPaths {
   NSMutableArray<FIRFieldPath *> *paths = [NSMutableArray arrayWithCapacity:[fieldPaths count]];
   for (NSArray<NSString *> *fieldPath in fieldPaths) {
     FIRFieldPath *parsed = [[FIRFieldPath alloc] initWithFields:fieldPath];
@@ -217,15 +218,16 @@ + (FIRListenSource)parseListenSource:(ListenSource)source {
   }
 }
 
-+ (PigeonSnapshotMetadata *)toPigeonSnapshotMetadata:(FIRSnapshotMetadata *)snapshotMetadata {
++ (PigeonSnapshotMetadata *_Nonnull)toPigeonSnapshotMetadata:
+    (FIRSnapshotMetadata *_Nonnull)snapshotMetadata {
   return [PigeonSnapshotMetadata
       makeWithHasPendingWrites:[NSNumber numberWithBool:snapshotMetadata.hasPendingWrites]
                    isFromCache:[NSNumber numberWithBool:snapshotMetadata.isFromCache]];
 }
 
-+ (PigeonDocumentSnapshot *)toPigeonDocumentSnapshot:(FIRDocumentSnapshot *)documentSnapshot
-                             serverTimestampBehavior:
-                                 (FIRServerTimestampBehavior)serverTimestampBehavior {
++ (PigeonDocumentSnapshot *_Nonnull)
+    toPigeonDocumentSnapshot:(FIRDocumentSnapshot *_Nonnull)documentSnapshot
+     serverTimestampBehavior:(FIRServerTimestampBehavior)serverTimestampBehavior {
   return [PigeonDocumentSnapshot
       makeWithPath:documentSnapshot.reference.path
               data:[documentSnapshot dataWithServerTimestampBehavior:serverTimestampBehavior]
@@ -247,9 +249,9 @@ + (DocumentChangeType)toPigeonDocumentChangeType:(FIRDocumentChangeType)document
   }
 }
 
-+ (PigeonDocumentChange *)toPigeonDocumentChange:(FIRDocumentChange *)documentChange
-                         serverTimestampBehavior:
-                             (FIRServerTimestampBehavior)serverTimestampBehavior {
++ (PigeonDocumentChange *_Nonnull)toPigeonDocumentChange:(FIRDocumentChange *_Nonnull)documentChange
+                                 serverTimestampBehavior:
+                                     (FIRServerTimestampBehavior)serverTimestampBehavior {
   NSNumber *oldIndex;
   NSNumber *newIndex;
 
@@ -279,8 +281,8 @@ + (PigeonDocumentChange *)toPigeonDocumentChange:(FIRDocumentChange *)documentCh
           newIndex:newIndex];
 }
 
-+ (NSArray<PigeonDocumentChange *> *)
-    toPigeonDocumentChanges:(NSArray<FIRDocumentChange *> *)documentChanges
++ (NSArray<PigeonDocumentChange *> *_Nonnull)
+    toPigeonDocumentChanges:(NSArray<FIRDocumentChange *> *_Nonnull)documentChanges
     serverTimestampBehavior:(FIRServerTimestampBehavior)serverTimestampBehavior {
   NSMutableArray *pigeonDocumentChanges = [NSMutableArray array];
   for (FIRDocumentChange *documentChange in documentChanges) {
@@ -291,8 +293,9 @@ + (PigeonDocumentChange *)toPigeonDocumentChange:(FIRDocumentChange *)documentCh
   return pigeonDocumentChanges;
 }
 
-+ (PigeonQuerySnapshot *)toPigeonQuerySnapshot:(FIRQuerySnapshot *)querySnaphot
-                       serverTimestampBehavior:(FIRServerTimestampBehavior)serverTimestampBehavior {
++ (PigeonQuerySnapshot *_Nonnull)toPigeonQuerySnapshot:(FIRQuerySnapshot *_Nonnull)querySnaphot
+                               serverTimestampBehavior:
+                                   (FIRServerTimestampBehavior)serverTimestampBehavior {
   NSMutableArray *documentSnapshots = [NSMutableArray array];
   for (FIRDocumentSnapshot *documentSnapshot in querySnaphot.documents) {
     [documentSnapshots

diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FirestorePigeonParser.h b/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FirestorePigeonParser.h
@@ -10,28 +10,42 @@
 
 @interface FirestorePigeonParser : NSObject
 
-+ (FIRQuery *)parseQueryWithParameters:(nonnull PigeonQueryParameters *)parameters
-                             firestore:(nonnull FIRFirestore *)firestore
-                                  path:(nonnull NSString *)path
-                     isCollectionGroup:(Boolean)isCollectionGroup;
 + (FIRFilter *_Nonnull)filterFromJson:(NSDictionary<NSString *, id> *_Nullable)map;
+
++ (FIRQuery *_Nonnull)parseQueryWithParameters:(nonnull PigeonQueryParameters *)parameters
+                                     firestore:(nonnull FIRFirestore *)firestore
+                                          path:(nonnull NSString *)path
+                             isCollectionGroup:(Boolean)isCollectionGroup;
+
 + (FIRFirestoreSource)parseSource:(Source)source;
+
++ (NSArray<FIRFieldPath *> *_Nonnull)parseFieldPath:
+    (NSArray<NSArray<NSString *> *> *_Nonnull)fieldPaths;
+
 + (FIRServerTimestampBehavior)parseServerTimestampBehavior:
     (ServerTimestampBehavior)serverTimestampBehavior;
+
 + (FIRListenSource)parseListenSource:(ListenSource)source;
-+ (PigeonDocumentSnapshot *)toPigeonDocumentSnapshot:(FIRDocumentSnapshot *)documentSnapshot
-                             serverTimestampBehavior:
-                                 (FIRServerTimestampBehavior)serverTimestampBehavior;
-+ (PigeonQuerySnapshot *)toPigeonQuerySnapshot:(FIRQuerySnapshot *)querySnaphot
-                       serverTimestampBehavior:(FIRServerTimestampBehavior)serverTimestampBehavior;
-+ (NSArray<PigeonDocumentChange *> *)
-    toPigeonDocumentChanges:(NSArray<FIRDocumentChange *> *)documentChanges
-    serverTimestampBehavior:(FIRServerTimestampBehavior)serverTimestampBehavior;
-+ (PigeonDocumentChange *)toPigeonDocumentChange:(FIRDocumentChange *)documentChange
-                         serverTimestampBehavior:
-                             (FIRServerTimestampBehavior)serverTimestampBehavior;
-+ (PigeonSnapshotMetadata *)toPigeonSnapshotMetadata:(FIRSnapshotMetadata *)snapshotMetadata;
+
++ (PigeonSnapshotMetadata *_Nonnull)toPigeonSnapshotMetadata:
+    (FIRSnapshotMetadata *_Nonnull)snapshotMetadata;
+
++ (PigeonDocumentSnapshot *_Nonnull)
+    toPigeonDocumentSnapshot:(FIRDocumentSnapshot *_Nonnull)documentSnapshot
+     serverTimestampBehavior:(FIRServerTimestampBehavior)serverTimestampBehavior;
+
 + (DocumentChangeType)toPigeonDocumentChangeType:(FIRDocumentChangeType)documentChangeType;
-+ (NSArray<FIRFieldPath *> *)parseFieldPath:(NSArray<NSArray<NSString *> *> *)fieldPaths;
+
++ (PigeonDocumentChange *_Nonnull)toPigeonDocumentChange:(FIRDocumentChange *_Nonnull)documentChange
+                                 serverTimestampBehavior:
+                                     (FIRServerTimestampBehavior)serverTimestampBehavior;
+
++ (NSArray<PigeonDocumentChange *> *_Nonnull)
+    toPigeonDocumentChanges:(NSArray<FIRDocumentChange *> *_Nonnull)documentChanges
+    serverTimestampBehavior:(FIRServerTimestampBehavior)serverTimestampBehavior;
+
++ (PigeonQuerySnapshot *_Nonnull)toPigeonQuerySnapshot:(FIRQuerySnapshot *_Nonnull)querySnaphot
+                               serverTimestampBehavior:
+                                   (FIRServerTimestampBehavior)serverTimestampBehavior;
 
 @end