Merge pull request #379 from rei315/feature/rei/update-firebase

update firebaes to 10.22.0
rei315 · Mar 17, 2024 · 58fb369 · 58fb369
2 parents e6f119c + 61ad520
commit 58fb369
Show file tree

Hide file tree

Showing 830 changed files with 114,470 additions and 1,748 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,6 @@
-RUBY_VERSION = 2.7.2
+FIREBASE_VERSION := 10.22.0
+
+.DEFAULT_GOAL := help
 
 DEVELOP_NAME := MutaroDev
 PRODUCTION_NAME := Mutaro
@@ -12,34 +14,12 @@ TEST_DEVICE ?= iPhone 14 Pro
 TEST_OS ?= 16.1
 TEST_DESTINATION := 'platform=${TEST_PLATFORM},name=${TEST_DEVICE},OS=${TEST_OS}'
 
-.PHONY: setup-system
-setup-system: # Install system tools for setup dependencies	
-	$(MAKE) install-rbenv
-	$(MAKE) install-ruby
-
-.PHONY: install-rbenv
-install-rbenv: # Install rbenv
-	brew install rbenv ruby-build
-	rbenv inits
-
-.PHONY: install-ruby
-install-ruby: # Install Ruby and set version
-	RUBY_CFLAGS="-w" rbenv install $(RUBY_VERSION) --skip-existing	
-	rbenv local $(RUBY_VERSION)
-
-.PHONY: setup-dependencies
-setup-dependencies: # Install dependencies or tools for iOS Build
-	$(MAKE) install-bundler-dependencies
-
-.PHONY: install-bundler-dependencies
-install-bundler-dependencies: # Install Bundler dependencies
-	bundle config path vendor/bundle
-	bundle install --without=documentation
-
+.PHONY: download-firebase-sdk
+download-firebase-sdk:
+	./scripts/download-firebase-sdk.sh $(FIREBASE_VERSION)
 
 .PHONY: clean
 clean: # Clear Cache
-	rm -rf ./vendor/bundle
 	rm -rf ~/Library/Developer/Xcode/DerivedData/*;
 	xcodebuild clean --alltargets
 

diff --git a/MutaroModule/Package.swift b/MutaroModule/Package.swift
@@ -17,21 +17,23 @@ extension PackageDescription.SwiftSetting {
 }
 
 let firebaseCrashlyticsDependencies: [Target.Dependency] = [
-    "GoogleDataTransport",
+    "FirebaseCoreExtension",
     "FirebaseCrashlytics",
+    "FirebaseSessions",
+    "GoogleDataTransport",
+    "Promises"
 ]
 
 let firebaseAnalyticsDependencies: [Target.Dependency] = [
     "FBLPromises",
     "FirebaseAnalytics",
-    "FirebaseAnalyticsSwift",
     "FirebaseCore",
     "FirebaseCoreInternal",
     "FirebaseInstallations",
     "GoogleAppMeasurement",
     "GoogleAppMeasurementIdentitySupport",
     "GoogleUtilities",
-    "nanopb",
+    "nanopb"
 ]
 
 let debugSwiftSettings: [PackageDescription.SwiftSetting] = [
@@ -265,50 +267,58 @@ let package = Package(
             ],
             path: "./Sources/Modules/ImageLoader"
         ),
+        .binaryTarget(
+            name: "FirebaseCoreExtension",
+            path: "XCFrameworks/Firebase/FirebaseCrashlytics/FirebaseCoreExtension.xcframework"
+        ),
         .binaryTarget(
             name: "FirebaseCrashlytics",
             path: "XCFrameworks/Firebase/FirebaseCrashlytics/FirebaseCrashlytics.xcframework"
         ),
         .binaryTarget(
-            name: "GoogleDataTransport",
-            path: "XCFrameworks/Firebase/FirebaseCrashlytics/GoogleDataTransport.xcframework"
+            name: "FirebaseSessions",
+            path: "XCFrameworks/Firebase/FirebaseCrashlytics/FirebaseSessions.xcframework"
         ),
         .binaryTarget(
-            name: "FirebaseAnalytics",
-            path: "XCFrameworks/Firebase/FirebaseAnalytics/FirebaseAnalytics.xcframework"
+            name: "GoogleDataTransport",
+            path: "XCFrameworks/Firebase/FirebaseCrashlytics/GoogleDataTransport.xcframework"
         ),
         .binaryTarget(
-            name: "FirebaseAnalyticsSwift",
-            path: "XCFrameworks/Firebase/FirebaseAnalytics/FirebaseAnalyticsSwift.xcframework"
+            name: "Promises",
+            path: "XCFrameworks/Firebase/FirebaseCrashlytics/Promises.xcframework"
         ),
         .binaryTarget(
-            name: "GoogleAppMeasurement",
-            path: "XCFrameworks/Firebase/FirebaseAnalytics/GoogleAppMeasurement.xcframework"
+            name: "FBLPromises",
+            path: "XCFrameworks/Firebase/FirebaseAnalytics/FBLPromises.xcframework"
         ),
         .binaryTarget(
-            name: "GoogleAppMeasurementIdentitySupport",
-            path:
-                "XCFrameworks/Firebase/FirebaseAnalytics/GoogleAppMeasurementIdentitySupport.xcframework"
+            name: "FirebaseAnalytics",
+            path: "XCFrameworks/Firebase/FirebaseAnalytics/FirebaseAnalytics.xcframework"
         ),
         .binaryTarget(
             name: "FirebaseCore",
             path: "XCFrameworks/Firebase/FirebaseAnalytics/FirebaseCore.xcframework"
         ),
         .binaryTarget(
             name: "FirebaseCoreInternal",
-            path: "XCFrameworks/Firebase/FirebaseAnalytics/FirebaseCoreInternal.xcframework"
+            path:
+                "XCFrameworks/Firebase/FirebaseAnalytics/FirebaseCoreInternal.xcframework"
         ),
         .binaryTarget(
             name: "FirebaseInstallations",
             path: "XCFrameworks/Firebase/FirebaseAnalytics/FirebaseInstallations.xcframework"
         ),
         .binaryTarget(
-            name: "GoogleUtilities",
-            path: "XCFrameworks/Firebase/FirebaseAnalytics/GoogleUtilities.xcframework"
+            name: "GoogleAppMeasurement",
+            path: "XCFrameworks/Firebase/FirebaseAnalytics/GoogleAppMeasurement.xcframework"
         ),
         .binaryTarget(
-            name: "FBLPromises",
-            path: "XCFrameworks/Firebase/FirebaseAnalytics/FBLPromises.xcframework"
+            name: "GoogleAppMeasurementIdentitySupport",
+            path: "XCFrameworks/Firebase/FirebaseAnalytics/GoogleAppMeasurementIdentitySupport.xcframework"
+        ),
+        .binaryTarget(
+            name: "GoogleUtilities",
+            path: "XCFrameworks/Firebase/FirebaseAnalytics/GoogleUtilities.xcframework"
         ),
         .binaryTarget(
             name: "nanopb",

diff --git a/MutaroModule/XCFrameworks/Firebase/FirebaseAnalytics/FBLPromises.xcframework/Info.plist b/MutaroModule/XCFrameworks/Firebase/FirebaseAnalytics/FBLPromises.xcframework/Info.plist
@@ -6,34 +6,34 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>FBLPromises.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>FBLPromises.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>tvos-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>FBLPromises.framework</string>
 			<key>SupportedArchitectures</key>
@@ -42,36 +42,36 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>FBLPromises.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>FBLPromises.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>

diff --git a/...ase/FirebaseAnalytics/FBLPromises.xcframework/ios-arm64/FBLPromises.framework/FBLPromises b/...ase/FirebaseAnalytics/FBLPromises.xcframework/ios-arm64/FBLPromises.framework/FBLPromises
diff --git a/...romises.xcframework/ios-arm64/FBLPromises.framework/FBLPromises_Privacy.bundle/Info.plist b/...romises.xcframework/ios-arm64/FBLPromises.framework/FBLPromises_Privacy.bundle/Info.plist
diff --git a/...ramework/ios-arm64/FBLPromises.framework/FBLPromises_Privacy.bundle/PrivacyInfo.xcprivacy b/...ramework/ios-arm64/FBLPromises.framework/FBLPromises_Privacy.bundle/PrivacyInfo.xcprivacy
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+</dict>
+</plist>
diff --git a/...lytics/FBLPromises.xcframework/ios-arm64/FBLPromises.framework/Headers/FBLPromise+Retry.h b/...lytics/FBLPromises.xcframework/ios-arm64/FBLPromises.framework/Headers/FBLPromise+Retry.h
@@ -40,7 +40,7 @@ typedef BOOL (^FBLPromiseRetryPredicateBlock)(NSInteger, NSError *) NS_SWIFT_UNA
  @return A new pending promise that fulfills with the same value as the promise returned from `work`
          block, or rejects with the same error after all retry attempts have been exhausted.
  */
-+ (FBLPromise *)retry:(FBLPromiseRetryWorkBlock)work NS_SWIFT_UNAVAILABLE("");
++ (instancetype)retry:(FBLPromiseRetryWorkBlock)work NS_SWIFT_UNAVAILABLE("");
 
 /**
  Creates a pending promise that fulfills with the same value as the promise returned from `work`
@@ -55,7 +55,7 @@ typedef BOOL (^FBLPromiseRetryPredicateBlock)(NSInteger, NSError *) NS_SWIFT_UNA
  @return A new pending promise that fulfills with the same value as the promise returned from `work`
          block, or rejects with the same error after all retry attempts have been exhausted.
  */
-+ (FBLPromise *)onQueue:(dispatch_queue_t)queue
++ (instancetype)onQueue:(dispatch_queue_t)queue
                   retry:(FBLPromiseRetryWorkBlock)work NS_SWIFT_UNAVAILABLE("");
 
 /**
@@ -70,7 +70,7 @@ typedef BOOL (^FBLPromiseRetryPredicateBlock)(NSInteger, NSError *) NS_SWIFT_UNA
  @return A new pending promise that fulfills with the same value as the promise returned from `work`
          block, or rejects with the same error after all retry attempts have been exhausted.
  */
-+ (FBLPromise *)attempts:(NSInteger)count
++ (instancetype)attempts:(NSInteger)count
                    retry:(FBLPromiseRetryWorkBlock)work NS_SWIFT_UNAVAILABLE("");
 
 /**
@@ -86,7 +86,7 @@ typedef BOOL (^FBLPromiseRetryPredicateBlock)(NSInteger, NSError *) NS_SWIFT_UNA
  @return A new pending promise that fulfills with the same value as the promise returned from `work`
          block, or rejects with the same error after all retry attempts have been exhausted.
  */
-+ (FBLPromise *)onQueue:(dispatch_queue_t)queue
++ (instancetype)onQueue:(dispatch_queue_t)queue
                attempts:(NSInteger)count
                   retry:(FBLPromiseRetryWorkBlock)work NS_SWIFT_UNAVAILABLE("");
 
@@ -109,7 +109,7 @@ typedef BOOL (^FBLPromiseRetryPredicateBlock)(NSInteger, NSError *) NS_SWIFT_UNA
          block, or rejects with the same error after all retry attempts have been exhausted or if
          the given condition is not met.
  */
-+ (FBLPromise *)attempts:(NSInteger)count
++ (instancetype)attempts:(NSInteger)count
                    delay:(NSTimeInterval)interval
                condition:(nullable FBLPromiseRetryPredicateBlock)predicate
                    retry:(FBLPromiseRetryWorkBlock)work NS_SWIFT_UNAVAILABLE("");
@@ -134,7 +134,7 @@ typedef BOOL (^FBLPromiseRetryPredicateBlock)(NSInteger, NSError *) NS_SWIFT_UNA
          block, or rejects with the same error after all retry attempts have been exhausted or if
          the given condition is not met.
  */
-+ (FBLPromise *)onQueue:(dispatch_queue_t)queue
++ (instancetype)onQueue:(dispatch_queue_t)queue
                attempts:(NSInteger)count
                   delay:(NSTimeInterval)interval
               condition:(nullable FBLPromiseRetryPredicateBlock)predicate

diff --git a/...aseAnalytics/FBLPromises.xcframework/ios-arm64/FBLPromises.framework/Headers/FBLPromise.h b/...aseAnalytics/FBLPromises.xcframework/ios-arm64/FBLPromises.framework/Headers/FBLPromise.h
@@ -85,8 +85,8 @@ NS_ASSUME_NONNULL_BEGIN
         FBLPromise.resolved(value)
 
  */
-+ (instancetype (^)(void))pending FBL_PROMISES_DOT_SYNTAX NS_SWIFT_UNAVAILABLE("");
-+ (instancetype (^)(id __nullable))resolved FBL_PROMISES_DOT_SYNTAX NS_SWIFT_UNAVAILABLE("");
++ (FBLPromise * (^)(void))pending FBL_PROMISES_DOT_SYNTAX NS_SWIFT_UNAVAILABLE("");
++ (FBLPromise * (^)(id __nullable))resolved FBL_PROMISES_DOT_SYNTAX NS_SWIFT_UNAVAILABLE("");
 
 @end
 

diff --git a/...base/FirebaseAnalytics/FBLPromises.xcframework/ios-arm64/FBLPromises.framework/Info.plist b/...base/FirebaseAnalytics/FBLPromises.xcframework/ios-arm64/FBLPromises.framework/Info.plist
@@ -2,19 +2,56 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>BuildMachineOSBuild</key>
+	<string>21H1015</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>FBLPromises</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.firebase.Firebase-FBLPromises</string>
+	<string>org.cocoapods.FBLPromises</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>FBLPromises</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.4.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>iPhoneOS</string>
+	</array>
 	<key>CFBundleVersion</key>
-	<string>2.1.1</string>
+	<string>1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>20B71</string>
+	<key>DTPlatformName</key>
+	<string>iphoneos</string>
+	<key>DTPlatformVersion</key>
+	<string>16.1</string>
+	<key>DTSDKBuild</key>
+	<string>20B71</string>
 	<key>DTSDKName</key>
-	<string>iphonesimulator11.2</string>
+	<string>iphoneos16.1</string>
+	<key>DTXcode</key>
+	<string>1410</string>
+	<key>DTXcodeBuild</key>
+	<string>14B47b</string>
+	<key>MinimumOSVersion</key>
+	<string>100.0</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>arm64</string>
+	</array>
 </dict>
 </plist>
diff --git a/...cs/FBLPromises.xcframework/ios-arm64_x86_64-maccatalyst/FBLPromises.framework/FBLPromises b/...cs/FBLPromises.xcframework/ios-arm64_x86_64-maccatalyst/FBLPromises.framework/FBLPromises