From 4827ceffa8bbeb348140ea48dbc7e108d8437673 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Thu, 16 Jan 2025 14:24:47 -0800 Subject: [PATCH 01/56] move Analytics off of CocoaPods --- .../project.pbxproj | 46 +++++++- analytics/Podfile | 40 ------- analytics/Podfile.lock | 111 ------------------ 3 files changed, 42 insertions(+), 155 deletions(-) delete mode 100644 analytics/Podfile delete mode 100644 analytics/Podfile.lock diff --git a/analytics/AnalyticsExample.xcodeproj/project.pbxproj b/analytics/AnalyticsExample.xcodeproj/project.pbxproj index 49bb7e8da..af7bf4310 100644 --- a/analytics/AnalyticsExample.xcodeproj/project.pbxproj +++ b/analytics/AnalyticsExample.xcodeproj/project.pbxproj @@ -3,10 +3,13 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ + 8D7951DB2D39BE24000FD694 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951DA2D39BE24000FD694 /* FirebaseAnalytics */; }; + 8D7951DD2D39BE29000FD694 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951DC2D39BE29000FD694 /* FirebaseAnalytics */; }; + 8D7951DF2D39BE2E000FD694 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951DE2D39BE2E000FD694 /* FirebaseAnalytics */; }; EA11716F24C6AB3D0085BD17 /* BlogViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA11716E24C6AB3D0085BD17 /* BlogViewController.swift */; }; EA5C0BC624C5D2060010FDF6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5C0BC524C5D2060010FDF6 /* AppDelegate.swift */; }; EA5C0BC824C5D2060010FDF6 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5C0BC724C5D2060010FDF6 /* SceneDelegate.swift */; }; @@ -88,6 +91,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8D7951DB2D39BE24000FD694 /* FirebaseAnalytics in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -102,6 +106,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8D7951DD2D39BE29000FD694 /* FirebaseAnalytics in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -116,6 +121,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8D7951DF2D39BE2E000FD694 /* FirebaseAnalytics in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -129,11 +135,11 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 2B283AC81B12C877411DB212 /* Pods */ = { + 8D7951D92D39BE24000FD694 /* Frameworks */ = { isa = PBXGroup; children = ( ); - path = Pods; + name = Frameworks; sourceTree = ""; }; EA5C0BB924C5D2060010FDF6 = { @@ -147,8 +153,8 @@ EDF987902715E41D008840FA /* AnalyticsExampleMac */, EDF987A22715E421008840FA /* AnalyticsExampleMacTests */, EA5C0BC324C5D2060010FDF6 /* Products */, - 2B283AC81B12C877411DB212 /* Pods */, EDF987FB2719C791008840FA /* GoogleService-Info.plist */, + 8D7951D92D39BE24000FD694 /* Frameworks */, ); sourceTree = ""; }; @@ -389,6 +395,9 @@ Base, ); mainGroup = EA5C0BB924C5D2060010FDF6; + packageReferences = ( + 8D7951D82D39BE12000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + ); productRefGroup = EA5C0BC324C5D2060010FDF6 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -1052,6 +1061,35 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 8D7951D82D39BE12000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 11.7.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 8D7951DA2D39BE24000FD694 /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = 8D7951D82D39BE12000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; + 8D7951DC2D39BE29000FD694 /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = 8D7951D82D39BE12000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; + 8D7951DE2D39BE2E000FD694 /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = 8D7951D82D39BE12000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = EA5C0BBA24C5D2060010FDF6 /* Project object */; } diff --git a/analytics/Podfile b/analytics/Podfile deleted file mode 100644 index e4b1e6a81..000000000 --- a/analytics/Podfile +++ /dev/null @@ -1,40 +0,0 @@ -# Common pods -pod 'FirebaseAnalytics' - -target 'AnalyticsExample' do - platform :ios, '13.0' - - # Comment the next line if you don't want to use dynamic frameworks - use_frameworks! - - target 'AnalyticsExampleTests' do - inherit! :search_paths - # Pods for testing - end - -end - -target 'AnalyticsExampleMac' do - platform :macos, '11.0' - - # Comment the next line if you don't want to use dynamic frameworks - use_frameworks! - - target 'AnalyticsExampleMacTests' do - inherit! :search_paths - # Pods for testing - end -end - - -target 'AnalyticsExampleTV' do - platform :tvos, '13.0' - - # Comment the next line if you don't want to use dynamic frameworks - use_frameworks! - - target 'AnalyticsExampleTVTests' do - inherit! :search_paths - # Pods for testing - end -end diff --git a/analytics/Podfile.lock b/analytics/Podfile.lock deleted file mode 100644 index 86df58894..000000000 --- a/analytics/Podfile.lock +++ /dev/null @@ -1,111 +0,0 @@ -PODS: - - FirebaseAnalytics (11.7.0): - - FirebaseAnalytics/AdIdSupport (= 11.7.0) - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseCore (11.7.0): - - FirebaseCoreInternal (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreInternal (11.7.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.7.0): - - FirebaseCore (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - PromisesObjC (~> 2.4) - - GoogleAppMeasurement (11.7.0): - - GoogleAppMeasurement/AdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.7.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.7.0): - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleUtilities/AppDelegateSwizzler (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.0.2): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/MethodSwizzler (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.0.2): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Privacy - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.0.2)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/Reachability (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - nanopb (3.30910.0): - - nanopb/decode (= 3.30910.0) - - nanopb/encode (= 3.30910.0) - - nanopb/decode (3.30910.0) - - nanopb/encode (3.30910.0) - - PromisesObjC (2.4.0) - -DEPENDENCIES: - - FirebaseAnalytics - -SPEC REPOS: - trunk: - - FirebaseAnalytics - - FirebaseCore - - FirebaseCoreInternal - - FirebaseInstallations - - GoogleAppMeasurement - - GoogleUtilities - - nanopb - - PromisesObjC - -SPEC CHECKSUMS: - FirebaseAnalytics: bc9e565af9044ba8d6c6e4157e4edca8e5fdf7ec - FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4 - FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 - FirebaseInstallations: 9347e719c3d52d8d7b9074b2c32407dd027305e9 - GoogleAppMeasurement: 0471a5b5bff51f3a91b1e76df22c952d04c63967 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - -PODFILE CHECKSUM: 05d2ebc8d2857bd09f061ac45e38899987da99af - -COCOAPODS: 1.16.2 From e7319f43b9daf1eb86f9c63858833b45e53330a2 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Fri, 17 Jan 2025 13:28:09 -0800 Subject: [PATCH 02/56] move app distribution to spm --- .../project.pbxproj | 39 +++++- appdistribution/Podfile | 21 ---- appdistribution/Podfile.lock | 119 ------------------ 3 files changed, 35 insertions(+), 144 deletions(-) delete mode 100644 appdistribution/Podfile delete mode 100644 appdistribution/Podfile.lock diff --git a/appdistribution/AppDistributionExample.xcodeproj/project.pbxproj b/appdistribution/AppDistributionExample.xcodeproj/project.pbxproj index f44efcc12..1041d880f 100644 --- a/appdistribution/AppDistributionExample.xcodeproj/project.pbxproj +++ b/appdistribution/AppDistributionExample.xcodeproj/project.pbxproj @@ -3,13 +3,15 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ 1E5FA399E68EEC6A1CC9D4F9 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 7B7A16FC609E3AE1BA2F8E93 /* GoogleService-Info.plist */; }; 4C5B56DE60EC55CE980B3E35 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 7B7A16FC609E3AE1BA2F8E93 /* GoogleService-Info.plist */; }; 64A8AA8B04202E42604E1B50 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 7B7A16FC609E3AE1BA2F8E93 /* GoogleService-Info.plist */; }; + 8D7951E32D3B02BA000FD694 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951E22D3B02BA000FD694 /* FirebaseAnalytics */; }; + 8D7951E52D3B02BA000FD694 /* FirebaseAppDistribution-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951E42D3B02BA000FD694 /* FirebaseAppDistribution-Beta */; }; EA5C0BC624C5D2060010FDF6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5C0BC524C5D2060010FDF6 /* AppDelegate.swift */; }; EA5C0BC824C5D2060010FDF6 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5C0BC724C5D2060010FDF6 /* SceneDelegate.swift */; }; EA5C0BCA24C5D2060010FDF6 /* AppDistributionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5C0BC924C5D2060010FDF6 /* AppDistributionViewController.swift */; }; @@ -58,6 +60,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8D7951E32D3B02BA000FD694 /* FirebaseAnalytics in Frameworks */, + 8D7951E52D3B02BA000FD694 /* FirebaseAppDistribution-Beta in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -78,11 +82,11 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 2B283AC81B12C877411DB212 /* Pods */ = { + 8D7951E12D3B02BA000FD694 /* Frameworks */ = { isa = PBXGroup; children = ( ); - path = Pods; + name = Frameworks; sourceTree = ""; }; EA5C0BB924C5D2060010FDF6 = { @@ -92,8 +96,8 @@ EA5C0BDB24C5D2070010FDF6 /* AppDistributionTests */, EA5C0BE624C5D2070010FDF6 /* AppDistributionUITests */, EA5C0BC324C5D2060010FDF6 /* Products */, - 2B283AC81B12C877411DB212 /* Pods */, 7B7A16FC609E3AE1BA2F8E93 /* GoogleService-Info.plist */, + 8D7951E12D3B02BA000FD694 /* Frameworks */, ); sourceTree = ""; }; @@ -225,6 +229,9 @@ Base, ); mainGroup = EA5C0BB924C5D2060010FDF6; + packageReferences = ( + 8D7951E02D3B0248000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + ); productRefGroup = EA5C0BC324C5D2060010FDF6 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -599,6 +606,30 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 8D7951E02D3B0248000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 11.7.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 8D7951E22D3B02BA000FD694 /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = 8D7951E02D3B0248000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; + 8D7951E42D3B02BA000FD694 /* FirebaseAppDistribution-Beta */ = { + isa = XCSwiftPackageProductDependency; + package = 8D7951E02D3B0248000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseAppDistribution-Beta"; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = EA5C0BBA24C5D2060010FDF6 /* Project object */; } diff --git a/appdistribution/Podfile b/appdistribution/Podfile deleted file mode 100644 index 6ed846371..000000000 --- a/appdistribution/Podfile +++ /dev/null @@ -1,21 +0,0 @@ -# Uncomment the next line to define a global platform for your project - platform :ios, '13.0' - -target 'AppDistributionExample' do - # Comment the next line if you don't want to use dynamic frameworks - use_frameworks! - - # Pods for AppDistributionExample - pod 'FirebaseAnalytics' - pod 'FirebaseAppDistribution', "> 8.11-beta" - - target 'AppDistributionExampleTests' do - inherit! :search_paths - # Pods for testing - end - - target 'AppDistributionExampleUITests' do - # Pods for testing - end - -end diff --git a/appdistribution/Podfile.lock b/appdistribution/Podfile.lock deleted file mode 100644 index edfdf0dad..000000000 --- a/appdistribution/Podfile.lock +++ /dev/null @@ -1,119 +0,0 @@ -PODS: - - FirebaseAnalytics (11.7.0): - - FirebaseAnalytics/AdIdSupport (= 11.7.0) - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseAppDistribution (11.7.0-beta): - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - FirebaseCore (11.7.0): - - FirebaseCoreInternal (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreInternal (11.7.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.7.0): - - FirebaseCore (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - PromisesObjC (~> 2.4) - - GoogleAppMeasurement (11.7.0): - - GoogleAppMeasurement/AdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.7.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.7.0): - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleUtilities/AppDelegateSwizzler (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.0.2): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/MethodSwizzler (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.0.2): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Privacy - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.0.2)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/Reachability (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - nanopb (3.30910.0): - - nanopb/decode (= 3.30910.0) - - nanopb/encode (= 3.30910.0) - - nanopb/decode (3.30910.0) - - nanopb/encode (3.30910.0) - - PromisesObjC (2.4.0) - -DEPENDENCIES: - - FirebaseAnalytics - - FirebaseAppDistribution (> 8.11-beta) - -SPEC REPOS: - trunk: - - FirebaseAnalytics - - FirebaseAppDistribution - - FirebaseCore - - FirebaseCoreInternal - - FirebaseInstallations - - GoogleAppMeasurement - - GoogleUtilities - - nanopb - - PromisesObjC - -SPEC CHECKSUMS: - FirebaseAnalytics: bc9e565af9044ba8d6c6e4157e4edca8e5fdf7ec - FirebaseAppDistribution: 5788e4d44db80a6a8df54247eea33208e3cb696f - FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4 - FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 - FirebaseInstallations: 9347e719c3d52d8d7b9074b2c32407dd027305e9 - GoogleAppMeasurement: 0471a5b5bff51f3a91b1e76df22c952d04c63967 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - -PODFILE CHECKSUM: a31069f38e6e1236d4b61ebb89c5301684d14b61 - -COCOAPODS: 1.16.2 From 80e47a681ec7bfc7ea01fc52a9572dcf45280bad Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Fri, 17 Jan 2025 13:44:22 -0800 Subject: [PATCH 03/56] move Auth to swift 6 and spm --- .../project.pbxproj | 89 +++++++-- .../xcschemes/AuthenticationExample.xcscheme | 2 +- .../AuthenticationExample/AppDelegate.swift | 2 +- .../Models/AuthProvider.swift | 2 +- .../DataSourceProtocols.swift | 10 +- .../Utility/Extensions.swift | 6 +- .../Utility/LoginDelegate.swift | 2 +- authentication/Podfile | 28 --- authentication/Podfile.lock | 183 ------------------ 9 files changed, 86 insertions(+), 238 deletions(-) delete mode 100644 authentication/Podfile delete mode 100644 authentication/Podfile.lock diff --git a/authentication/AuthenticationExample.xcodeproj/project.pbxproj b/authentication/AuthenticationExample.xcodeproj/project.pbxproj index b0ab74806..5a4411194 100644 --- a/authentication/AuthenticationExample.xcodeproj/project.pbxproj +++ b/authentication/AuthenticationExample.xcodeproj/project.pbxproj @@ -3,11 +3,14 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8848764F29D3149200780FA6 /* GoogleService-Info.plist */; }; + 8D00BB692D3B068100F6F6DD /* FacebookLogin in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB682D3B068100F6F6DD /* FacebookLogin */; }; + 8D7951EB2D3B039D000FD694 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951EA2D3B039D000FD694 /* FirebaseAuth */; }; + 8D7951EF2D3B03BA000FD694 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951EE2D3B03BA000FD694 /* GoogleSignIn */; }; EA02F68524A000E00079D000 /* UserActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68424A000E00079D000 /* UserActions.swift */; }; EA02F68D24A063E90079D000 /* LoginDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68C24A063E90079D000 /* LoginDelegate.swift */; }; EA062D5D24A0FEB6006714D3 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = EA062D5C24A0FEB6006714D3 /* README.md */; }; @@ -97,6 +100,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8D7951EB2D3B039D000FD694 /* FirebaseAuth in Frameworks */, + 8D7951EF2D3B03BA000FD694 /* GoogleSignIn in Frameworks */, + 8D00BB692D3B068100F6F6DD /* FacebookLogin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -117,11 +123,11 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - CE54897B57069002714B8FA5 /* Pods */ = { + 8D7951E92D3B039D000FD694 /* Frameworks */ = { isa = PBXGroup; children = ( ); - path = Pods; + name = Frameworks; sourceTree = ""; }; EA02F68E24A0714B0079D000 /* OtherAuthMethodControllers */ = { @@ -202,8 +208,8 @@ EAE4CBC324855E3A00245E92 /* AuthenticationExample */, EAE4CBDA24855E3E00245E92 /* AuthenticationExampleTests */, EAE4CBE524855E3E00245E92 /* AuthenticationExampleUITests */, + 8D7951E92D3B039D000FD694 /* Frameworks */, EAE4CBC224855E3A00245E92 /* Products */, - CE54897B57069002714B8FA5 /* Pods */, ); sourceTree = ""; }; @@ -316,8 +322,9 @@ EAE4CBB924855E3A00245E92 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1130; - LastUpgradeCheck = 1130; + LastUpgradeCheck = 1610; ORGANIZATIONNAME = Firebase; TargetAttributes = { EAE4CBC024855E3A00245E92 = { @@ -342,6 +349,11 @@ Base, ); mainGroup = EAE4CBB824855E3A00245E92; + packageReferences = ( + 8D7951E62D3B034C000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + 8D7951E72D3B037B000FD694 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, + 8D00BB672D3B067500F6F6DD /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */, + ); productRefGroup = EAE4CBC224855E3A00245E92 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -469,6 +481,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -479,6 +492,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -500,6 +514,7 @@ SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 6.0; }; name = Debug; }; @@ -529,6 +544,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -539,6 +555,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -553,6 +570,7 @@ SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 6.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -575,7 +593,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.AuthenticationExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 1; }; name = Debug; @@ -598,7 +616,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.AuthenticationExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 1; }; name = Release; @@ -606,7 +624,6 @@ EAE4CBEF24855E3E00245E92 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; BUNDLE_LOADER = "$(TEST_HOST)"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -620,7 +637,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.google.AuthenticationExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AuthenticationExample.app/AuthenticationExample"; }; @@ -629,7 +646,6 @@ EAE4CBF024855E3E00245E92 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; BUNDLE_LOADER = "$(TEST_HOST)"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -643,7 +659,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.google.AuthenticationExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AuthenticationExample.app/AuthenticationExample"; }; @@ -652,7 +668,6 @@ EAE4CBF224855E3E00245E92 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = AuthenticationExampleUITests/Info.plist; @@ -664,7 +679,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.AuthenticationExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = AuthenticationExample; }; @@ -673,7 +688,6 @@ EAE4CBF324855E3E00245E92 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = AuthenticationExampleUITests/Info.plist; @@ -685,7 +699,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.AuthenticationExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = AuthenticationExample; }; @@ -731,6 +745,51 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 8D00BB672D3B067500F6F6DD /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/facebook/facebook-ios-sdk.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 18.0.0; + }; + }; + 8D7951E62D3B034C000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 11.7.0; + }; + }; + 8D7951E72D3B037B000FD694 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/google/GoogleSignIn-iOS.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 8.0.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 8D00BB682D3B068100F6F6DD /* FacebookLogin */ = { + isa = XCSwiftPackageProductDependency; + package = 8D00BB672D3B067500F6F6DD /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */; + productName = FacebookLogin; + }; + 8D7951EA2D3B039D000FD694 /* FirebaseAuth */ = { + isa = XCSwiftPackageProductDependency; + package = 8D7951E62D3B034C000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAuth; + }; + 8D7951EE2D3B03BA000FD694 /* GoogleSignIn */ = { + isa = XCSwiftPackageProductDependency; + package = 8D7951E72D3B037B000FD694 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */; + productName = GoogleSignIn; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = EAE4CBB924855E3A00245E92 /* Project object */; } diff --git a/authentication/AuthenticationExample.xcodeproj/xcshareddata/xcschemes/AuthenticationExample.xcscheme b/authentication/AuthenticationExample.xcodeproj/xcshareddata/xcschemes/AuthenticationExample.xcscheme index 139506a15..85b30cbf4 100644 --- a/authentication/AuthenticationExample.xcodeproj/xcshareddata/xcschemes/AuthenticationExample.xcscheme +++ b/authentication/AuthenticationExample.xcodeproj/xcshareddata/xcschemes/AuthenticationExample.xcscheme @@ -1,6 +1,6 @@ 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - PromisesObjC (~> 2.4) - - FBAEMKit (18.0.0): - - FBSDKCoreKit_Basics (= 18.0.0) - - FBSDKCoreKit (18.0.0): - - FBAEMKit (= 18.0.0) - - FBSDKCoreKit_Basics (= 18.0.0) - - FBSDKCoreKit_Basics (18.0.0) - - FBSDKLoginKit (18.0.0): - - FBSDKCoreKit (= 18.0.0) - - FirebaseAnalytics (11.7.0): - - FirebaseAnalytics/AdIdSupport (= 11.7.0) - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseAppCheckInterop (11.7.0) - - FirebaseAuth (11.7.0): - - FirebaseAppCheckInterop (~> 11.0) - - FirebaseAuthInterop (~> 11.0) - - FirebaseCore (~> 11.7.0) - - FirebaseCoreExtension (~> 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/Environment (~> 8.0) - - GTMSessionFetcher/Core (< 5.0, >= 3.4) - - RecaptchaInterop (~> 100.0) - - FirebaseAuthInterop (11.7.0) - - FirebaseCore (11.7.0): - - FirebaseCoreInternal (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseCoreInternal (11.7.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.7.0): - - FirebaseCore (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - PromisesObjC (~> 2.4) - - GoogleAppMeasurement (11.7.0): - - GoogleAppMeasurement/AdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.7.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.7.0): - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleSignIn (8.0.0): - - AppAuth (< 2.0, >= 1.7.3) - - AppCheckCore (~> 11.0) - - GTMAppAuth (< 5.0, >= 4.1.1) - - GTMSessionFetcher/Core (~> 3.3) - - GoogleUtilities/AppDelegateSwizzler (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.0.2): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/MethodSwizzler (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.0.2): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Privacy - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.0.2)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/Reachability (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GTMAppAuth (4.1.1): - - AppAuth/Core (~> 1.7) - - GTMSessionFetcher/Core (< 4.0, >= 3.3) - - GTMSessionFetcher/Core (3.5.0) - - nanopb (3.30910.0): - - nanopb/decode (= 3.30910.0) - - nanopb/encode (= 3.30910.0) - - nanopb/decode (3.30910.0) - - nanopb/encode (3.30910.0) - - PromisesObjC (2.4.0) - - RecaptchaInterop (100.0.0) - -DEPENDENCIES: - - FBSDKLoginKit - - FirebaseAnalytics - - FirebaseAuth - - GoogleSignIn - -SPEC REPOS: - trunk: - - AppAuth - - AppCheckCore - - FBAEMKit - - FBSDKCoreKit - - FBSDKCoreKit_Basics - - FBSDKLoginKit - - FirebaseAnalytics - - FirebaseAppCheckInterop - - FirebaseAuth - - FirebaseAuthInterop - - FirebaseCore - - FirebaseCoreExtension - - FirebaseCoreInternal - - FirebaseInstallations - - GoogleAppMeasurement - - GoogleSignIn - - GoogleUtilities - - GTMAppAuth - - GTMSessionFetcher - - nanopb - - PromisesObjC - - RecaptchaInterop - -SPEC CHECKSUMS: - AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73 - AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f - FBAEMKit: e34530df538b8eb8aeb53c35867715ba6c63ef0c - FBSDKCoreKit: d3f479a69127acebb1c6aad91c1a33907bcf6c2f - FBSDKCoreKit_Basics: 017b6dc2a1862024815a8229e75661e627ac1e29 - FBSDKLoginKit: 5875762d1fe09ddcb05d03365d4f5dc34413843d - FirebaseAnalytics: bc9e565af9044ba8d6c6e4157e4edca8e5fdf7ec - FirebaseAppCheckInterop: 2376d3ec5cb4267facad4fe754ab4f301a5a519b - FirebaseAuth: 77e25aa24f3e1c626c5babd3338551fc1669ee0e - FirebaseAuthInterop: a6973d72aa242ea88ffb6be9c9b06c65455071da - FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4 - FirebaseCoreExtension: 206c1b399f0d103055207c16f299b28e3dbd1949 - FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 - FirebaseInstallations: 9347e719c3d52d8d7b9074b2c32407dd027305e9 - GoogleAppMeasurement: 0471a5b5bff51f3a91b1e76df22c952d04c63967 - GoogleSignIn: ce8c89bb9b37fb624b92e7514cc67335d1e277e4 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de - GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 - nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 - -PODFILE CHECKSUM: 3fec667dd6bd8b6be4c37a6eac284e979d933bcd - -COCOAPODS: 1.16.2 From dfffbeefcb4c660e153155a48ad401bec3272548 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Fri, 17 Jan 2025 13:48:55 -0800 Subject: [PATCH 04/56] move remoteconfig to spm --- .../ConfigExample.xcodeproj/project.pbxproj | 34 +++++++++- config/Podfile | 20 ------ config/Podfile.lock | 66 ------------------- 3 files changed, 33 insertions(+), 87 deletions(-) delete mode 100644 config/Podfile delete mode 100644 config/Podfile.lock diff --git a/config/ConfigExample.xcodeproj/project.pbxproj b/config/ConfigExample.xcodeproj/project.pbxproj index e1072e004..62bc70f5f 100644 --- a/config/ConfigExample.xcodeproj/project.pbxproj +++ b/config/ConfigExample.xcodeproj/project.pbxproj @@ -3,13 +3,14 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ 16F8E38C3F42EB1FE8184C90 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 45ED9095BE4BD5109A65B35F /* GoogleService-Info.plist */; }; 3623B61971137623FD028C44 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 45ED9095BE4BD5109A65B35F /* GoogleService-Info.plist */; }; 72904828160EC19516620EF7 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 45ED9095BE4BD5109A65B35F /* GoogleService-Info.plist */; }; + 8D00BB6D2D3B07A500F6F6DD /* FirebaseRemoteConfig in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB6C2D3B07A500F6F6DD /* FirebaseRemoteConfig */; }; EA062D6024A13966006714D3 /* RemoteConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA062D5F24A13966006714D3 /* RemoteConfigView.swift */; }; EA20B48A2497CC9D00B5E581 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA20B4892497CC9D00B5E581 /* AppDelegate.swift */; }; EA20B48C2497CC9D00B5E581 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA20B48B2497CC9D00B5E581 /* SceneDelegate.swift */; }; @@ -69,6 +70,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8D00BB6D2D3B07A500F6F6DD /* FirebaseRemoteConfig in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -89,6 +91,13 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 8D00BB6B2D3B07A500F6F6DD /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; EA062D5E24A135EC006714D3 /* JSON Recipes */ = { isa = PBXGroup; children = ( @@ -107,6 +116,7 @@ EA20B4AA2497CC9F00B5E581 /* ConfigExampleUITests */, EA20B4872497CC9D00B5E581 /* Products */, 45ED9095BE4BD5109A65B35F /* GoogleService-Info.plist */, + 8D00BB6B2D3B07A500F6F6DD /* Frameworks */, ); sourceTree = ""; }; @@ -243,6 +253,9 @@ Base, ); mainGroup = EA20B47D2497CC9D00B5E581; + packageReferences = ( + 8D00BB6A2D3B079000F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + ); productRefGroup = EA20B4872497CC9D00B5E581 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -634,6 +647,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 8D00BB6A2D3B079000F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 11.7.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 8D00BB6C2D3B07A500F6F6DD /* FirebaseRemoteConfig */ = { + isa = XCSwiftPackageProductDependency; + package = 8D00BB6A2D3B079000F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseRemoteConfig; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = EA20B47E2497CC9D00B5E581 /* Project object */; } diff --git a/config/Podfile b/config/Podfile deleted file mode 100644 index 3512d7d15..000000000 --- a/config/Podfile +++ /dev/null @@ -1,20 +0,0 @@ -# Uncomment the next line to define a global platform for your project -platform :ios, '13.0' - -target 'ConfigExample' do - # Comment the next line if you don't want to use dynamic frameworks - use_frameworks! - - # Pods for ConfigExample - pod 'FirebaseRemoteConfig' - - target 'ConfigExampleTests' do - inherit! :search_paths - # Pods for testing - end - - target 'ConfigExampleUITests' do - # Pods for testing - end - -end diff --git a/config/Podfile.lock b/config/Podfile.lock deleted file mode 100644 index b5c64fb96..000000000 --- a/config/Podfile.lock +++ /dev/null @@ -1,66 +0,0 @@ -PODS: - - FirebaseABTesting (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseCore (11.7.0): - - FirebaseCoreInternal (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreInternal (11.7.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.7.0): - - FirebaseCore (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - PromisesObjC (~> 2.4) - - FirebaseRemoteConfig (11.7.0): - - FirebaseABTesting (~> 11.0) - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - FirebaseRemoteConfigInterop (~> 11.0) - - FirebaseSharedSwift (~> 11.0) - - GoogleUtilities/Environment (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseRemoteConfigInterop (11.7.0) - - FirebaseSharedSwift (11.7.0) - - GoogleUtilities/Environment (8.0.2): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - "GoogleUtilities/NSData+zlib (8.0.2)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/UserDefaults (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - PromisesObjC (2.4.0) - -DEPENDENCIES: - - FirebaseRemoteConfig - -SPEC REPOS: - trunk: - - FirebaseABTesting - - FirebaseCore - - FirebaseCoreInternal - - FirebaseInstallations - - FirebaseRemoteConfig - - FirebaseRemoteConfigInterop - - FirebaseSharedSwift - - GoogleUtilities - - PromisesObjC - -SPEC CHECKSUMS: - FirebaseABTesting: 08b3e19b28504632a9cd03e7a796b355c5d39b27 - FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4 - FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 - FirebaseInstallations: 9347e719c3d52d8d7b9074b2c32407dd027305e9 - FirebaseRemoteConfig: aa1d4cb05ef4caad203448dfc87842de12f1ea8d - FirebaseRemoteConfigInterop: ca12abf9da0003efd3a476b2dff4f7a04fd31b4f - FirebaseSharedSwift: a45efd84d60ebbfdcdbaebc66948af3630459e62 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - -PODFILE CHECKSUM: 508a02096afdac3e2d945a0ec8c5748484e5097f - -COCOAPODS: 1.16.2 From 53a59614e818cd0a81ce94df36538b9f5272f1df Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Fri, 17 Jan 2025 14:04:08 -0800 Subject: [PATCH 05/56] update Firebase package --- .../project.pbxproj | 72 ++++++++++--------- ...sExample (watchOS) (Complication).xcscheme | 25 ++----- ...sExample (watchOS) (Notification).xcscheme | 25 ++----- .../CrashlyticsExample (watchOS).xcscheme | 25 ++----- 4 files changed, 58 insertions(+), 89 deletions(-) diff --git a/crashlytics/CrashlyticsExample.xcodeproj/project.pbxproj b/crashlytics/CrashlyticsExample.xcodeproj/project.pbxproj index 387ff3b62..2299d22c6 100644 --- a/crashlytics/CrashlyticsExample.xcodeproj/project.pbxproj +++ b/crashlytics/CrashlyticsExample.xcodeproj/project.pbxproj @@ -7,11 +7,14 @@ objects = { /* Begin PBXBuildFile section */ + 8D00BB712D3B0ADE00F6F6DD /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB702D3B0ADE00F6F6DD /* FirebaseCrashlytics */; }; + 8D00BB732D3B0AED00F6F6DD /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB722D3B0AED00F6F6DD /* FirebaseCrashlytics */; }; + 8D00BB752D3B0AF400F6F6DD /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB742D3B0AF400F6F6DD /* FirebaseCrashlytics */; }; + 8D00BB772D3B0AFF00F6F6DD /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB762D3B0AFF00F6F6DD /* FirebaseCrashlytics */; }; 8D96F5DE2685440700F1A2B7 /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = 8D96F5DD2685440700F1A2B7 /* Reachability */; }; 8D96F5E62685442800F1A2B7 /* ReachabililtyHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C723B78C26853A1700AD34CD /* ReachabililtyHelper.swift */; }; 8D96F5EE2685442C00F1A2B7 /* ReachabililtyHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C723B78C26853A1700AD34CD /* ReachabililtyHelper.swift */; }; C726B81C26D84D51000991C1 /* UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C726B81B26D84D51000991C1 /* UITests.swift */; }; - C732A29826846B6D00AA7DEF /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = C732A29726846B6D00AA7DEF /* FirebaseCrashlytics */; }; C73C89A926845908003E5C2C /* CrashlyticsSwiftUIExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73C899726845907003E5C2C /* CrashlyticsSwiftUIExampleApp.swift */; }; C73C89AA26845908003E5C2C /* CrashlyticsSwiftUIExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73C899726845907003E5C2C /* CrashlyticsSwiftUIExampleApp.swift */; }; C73C89AB26845908003E5C2C /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73C899826845907003E5C2C /* ContentView.swift */; }; @@ -26,17 +29,14 @@ C745941426BDDD6300153AE3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C745941326BDDD6300153AE3 /* Assets.xcassets */; }; C745941726BDDD6300153AE3 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C745941626BDDD6300153AE3 /* Preview Assets.xcassets */; }; C745941C26BDDD6300153AE3 /* CrashlyticsSwiftUIExample_(watchOS).app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = C74593FB26BDDD5F00153AE3 /* CrashlyticsSwiftUIExample_(watchOS).app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - C745942626BDDDA500153AE3 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = C745942526BDDDA500153AE3 /* FirebaseCrashlytics */; }; C745942726BDDDEF00153AE3 /* CrashlyticsSwiftUIExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73C899726845907003E5C2C /* CrashlyticsSwiftUIExampleApp.swift */; }; C745942826BDDDF500153AE3 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73C899826845907003E5C2C /* ContentView.swift */; }; C74C554726B377F20043B835 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C74C554626B377F20043B835 /* Assets.xcassets */; }; C74C554A26B377F20043B835 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C74C554926B377F20043B835 /* Preview Assets.xcassets */; }; - C77AC00326BB151000BDE919 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = C77AC00226BB151000BDE919 /* FirebaseCrashlytics */; }; C77AC00526BB151000BDE919 /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = C77AC00426BB151000BDE919 /* Reachability */; }; C77AC00626BB16C200BDE919 /* CrashlyticsSwiftUIExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73C899726845907003E5C2C /* CrashlyticsSwiftUIExampleApp.swift */; }; C77AC00726BB16C500BDE919 /* ReachabililtyHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C723B78C26853A1700AD34CD /* ReachabililtyHelper.swift */; }; C77AC00826BB16CA00BDE919 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73C899826845907003E5C2C /* ContentView.swift */; }; - C77AC00A26BB16E300BDE919 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = C77AC00926BB16E300BDE919 /* FirebaseCrashlytics */; }; C77AC00C26BB16E300BDE919 /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = C77AC00B26BB16E300BDE919 /* Reachability */; }; C79FD3BA26C728D800FE0261 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C79FD3B926C728D800FE0261 /* GoogleService-Info.plist */; }; C79FD3BB26C728D800FE0261 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C79FD3B926C728D800FE0261 /* GoogleService-Info.plist */; }; @@ -165,8 +165,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C732A29826846B6D00AA7DEF /* FirebaseCrashlytics in Frameworks */, 8D96F5DE2685440700F1A2B7 /* Reachability in Frameworks */, + 8D00BB772D3B0AFF00F6F6DD /* FirebaseCrashlytics in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -174,8 +174,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C77AC00326BB151000BDE919 /* FirebaseCrashlytics in Frameworks */, C77AC00526BB151000BDE919 /* Reachability in Frameworks */, + 8D00BB752D3B0AF400F6F6DD /* FirebaseCrashlytics in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -183,7 +183,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C745942626BDDDA500153AE3 /* FirebaseCrashlytics in Frameworks */, + 8D00BB712D3B0ADE00F6F6DD /* FirebaseCrashlytics in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -191,8 +191,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C77AC00A26BB16E300BDE919 /* FirebaseCrashlytics in Frameworks */, C77AC00C26BB16E300BDE919 /* Reachability in Frameworks */, + 8D00BB732D3B0AED00F6F6DD /* FirebaseCrashlytics in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -231,6 +231,7 @@ C74C554126B377EF0043B835 /* CrashlyticsSwiftUIExample */, C74593FC26BDDD5F00153AE3 /* CrashlyticsSwiftUIExample_(watchOS) */, C745940826BDDD6200153AE3 /* CrashlyticsSwiftUIExample_(watchOS)_Extension */, + 8D00BB6F2D3B0ADE00F6F6DD /* Frameworks */, 5F5A534D1ADE670C00F81DF0 /* Products */, ); sourceTree = ""; @@ -252,6 +253,13 @@ name = Products; sourceTree = ""; }; + 8D00BB6F2D3B0ADE00F6F6DD /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; C73C899626845907003E5C2C /* Shared */ = { isa = PBXGroup; children = ( @@ -369,8 +377,8 @@ ); name = "CrashlyticsSwiftUIExample (iOS)"; packageProductDependencies = ( - C732A29726846B6D00AA7DEF /* FirebaseCrashlytics */, 8D96F5DD2685440700F1A2B7 /* Reachability */, + 8D00BB762D3B0AFF00F6F6DD /* FirebaseCrashlytics */, ); productName = "CrashlyticsSwiftUIExample (iOS)"; productReference = C73C899E26845908003E5C2C /* CrashlyticsSwiftUIExample.app */; @@ -390,8 +398,8 @@ ); name = "CrashlyticsSwiftUIExample (macOS)"; packageProductDependencies = ( - C77AC00226BB151000BDE919 /* FirebaseCrashlytics */, C77AC00426BB151000BDE919 /* Reachability */, + 8D00BB742D3B0AF400F6F6DD /* FirebaseCrashlytics */, ); productName = "CrashlyticsSwiftUIExample (macOS)"; productReference = C73C89A526845908003E5C2C /* CrashlyticsSwiftUIExample.app */; @@ -428,7 +436,7 @@ ); name = "CrashlyticsSwiftUIExample_(watchOS)_Extension"; packageProductDependencies = ( - C745942526BDDDA500153AE3 /* FirebaseCrashlytics */, + 8D00BB702D3B0ADE00F6F6DD /* FirebaseCrashlytics */, ); productName = "CrashlyticsSwiftUIExample (watchOS) Extension"; productReference = C745940426BDDD6200153AE3 /* CrashlyticsSwiftUIExample_(watchOS)_Extension.appex */; @@ -448,8 +456,8 @@ ); name = CrashlyticsSwiftUIExample; packageProductDependencies = ( - C77AC00926BB16E300BDE919 /* FirebaseCrashlytics */, C77AC00B26BB16E300BDE919 /* Reachability */, + 8D00BB722D3B0AED00F6F6DD /* FirebaseCrashlytics */, ); productName = CrashlyticsSwiftUIExample; productReference = C74C554026B377EF0043B835 /* CrashlyticsSwiftUIExample.app */; @@ -566,8 +574,8 @@ ); mainGroup = 5F5A53431ADE670C00F81DF0; packageReferences = ( - C732A28E2684656200AA7DEF /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, 8D96F5DC2685440700F1A2B7 /* XCRemoteSwiftPackageReference "Reachability.swift" */, + 8D00BB6E2D3B0ACF00F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, ); productRefGroup = 5F5A534D1ADE670C00F81DF0 /* Products */; projectDirPath = ""; @@ -1620,54 +1628,54 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 8D96F5DC2685440700F1A2B7 /* XCRemoteSwiftPackageReference "Reachability.swift" */ = { + 8D00BB6E2D3B0ACF00F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/ashleymills/Reachability.swift.git"; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 5.1.0; + minimumVersion = 11.7.0; }; }; - C732A28E2684656200AA7DEF /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + 8D96F5DC2685440700F1A2B7 /* XCRemoteSwiftPackageReference "Reachability.swift" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git"; + repositoryURL = "https://github.com/ashleymills/Reachability.swift.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 10.0.0; + minimumVersion = 5.1.0; }; }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 8D96F5DD2685440700F1A2B7 /* Reachability */ = { + 8D00BB702D3B0ADE00F6F6DD /* FirebaseCrashlytics */ = { isa = XCSwiftPackageProductDependency; - package = 8D96F5DC2685440700F1A2B7 /* XCRemoteSwiftPackageReference "Reachability.swift" */; - productName = Reachability; + package = 8D00BB6E2D3B0ACF00F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseCrashlytics; }; - C732A29726846B6D00AA7DEF /* FirebaseCrashlytics */ = { + 8D00BB722D3B0AED00F6F6DD /* FirebaseCrashlytics */ = { isa = XCSwiftPackageProductDependency; - package = C732A28E2684656200AA7DEF /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + package = 8D00BB6E2D3B0ACF00F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; productName = FirebaseCrashlytics; }; - C745942526BDDDA500153AE3 /* FirebaseCrashlytics */ = { + 8D00BB742D3B0AF400F6F6DD /* FirebaseCrashlytics */ = { isa = XCSwiftPackageProductDependency; - package = C732A28E2684656200AA7DEF /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + package = 8D00BB6E2D3B0ACF00F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; productName = FirebaseCrashlytics; }; - C77AC00226BB151000BDE919 /* FirebaseCrashlytics */ = { + 8D00BB762D3B0AFF00F6F6DD /* FirebaseCrashlytics */ = { isa = XCSwiftPackageProductDependency; - package = C732A28E2684656200AA7DEF /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + package = 8D00BB6E2D3B0ACF00F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; productName = FirebaseCrashlytics; }; - C77AC00426BB151000BDE919 /* Reachability */ = { + 8D96F5DD2685440700F1A2B7 /* Reachability */ = { isa = XCSwiftPackageProductDependency; package = 8D96F5DC2685440700F1A2B7 /* XCRemoteSwiftPackageReference "Reachability.swift" */; productName = Reachability; }; - C77AC00926BB16E300BDE919 /* FirebaseCrashlytics */ = { + C77AC00426BB151000BDE919 /* Reachability */ = { isa = XCSwiftPackageProductDependency; - package = C732A28E2684656200AA7DEF /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseCrashlytics; + package = 8D96F5DC2685440700F1A2B7 /* XCRemoteSwiftPackageReference "Reachability.swift" */; + productName = Reachability; }; C77AC00B26BB16E300BDE919 /* Reachability */ = { isa = XCSwiftPackageProductDependency; diff --git a/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS) (Complication).xcscheme b/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS) (Complication).xcscheme index 5460d7d05..b7652178c 100644 --- a/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS) (Complication).xcscheme +++ b/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS) (Complication).xcscheme @@ -65,10 +65,8 @@ debugServiceExtension = "internal" allowLocationSimulation = "YES" launchAutomaticallySubstyle = "32"> - + - + - + - - - - - + diff --git a/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS) (Notification).xcscheme b/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS) (Notification).xcscheme index 8135cd872..f2227923a 100644 --- a/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS) (Notification).xcscheme +++ b/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS) (Notification).xcscheme @@ -66,10 +66,8 @@ allowLocationSimulation = "YES" launchAutomaticallySubstyle = "8" notificationPayloadFile = "CrashlyticsSwiftUIExample_(watchOS)_Extension/PushNotificationPayload.apns"> - + - + - + - - - - - + diff --git a/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS).xcscheme b/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS).xcscheme index 71f3d8bed..942c43b33 100644 --- a/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS).xcscheme +++ b/crashlytics/CrashlyticsExample.xcodeproj/xcshareddata/xcschemes/CrashlyticsExample (watchOS).xcscheme @@ -76,10 +76,8 @@ debugServiceExtension = "internal" allowLocationSimulation = "YES" notificationPayloadFile = "CrashlyticsSwiftUIExample_(watchOS)_Extension/PushNotificationPayload.apns"> - + - + - + - - - - - + From ec466315612e5bdb7ba4209bd8c5083587d6894e Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Fri, 17 Jan 2025 14:08:46 -0800 Subject: [PATCH 06/56] move database to spm --- .../DatabaseExample.xcodeproj/project.pbxproj | 189 ++++++++++++++++-- .../xcschemes/DatabaseExample.xcscheme | 2 +- .../xcschemes/DatabaseExampleSwift.xcscheme | 2 +- database/Podfile | 33 --- database/Podfile.lock | 100 --------- 5 files changed, 176 insertions(+), 150 deletions(-) delete mode 100644 database/Podfile delete mode 100644 database/Podfile.lock diff --git a/database/DatabaseExample.xcodeproj/project.pbxproj b/database/DatabaseExample.xcodeproj/project.pbxproj index dd26aaea2..df5a2f4fe 100644 --- a/database/DatabaseExample.xcodeproj/project.pbxproj +++ b/database/DatabaseExample.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 77; objects = { /* Begin PBXBuildFile section */ @@ -52,6 +52,12 @@ 5F99610D1AE0CF4F0034F503 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5F9961071AE0CF4F0034F503 /* LaunchScreen.xib */; }; 5FDE055D1B0DAA090037B82F /* AppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FDE055C1B0DAA090037B82F /* AppTests.m */; }; 67FFF4C737099E866B972B36 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = F644C72A588FB44DD666857B /* GoogleService-Info.plist */; }; + 8D00BB7B2D3B0BE000F6F6DD /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB7A2D3B0BE000F6F6DD /* FirebaseAuth */; }; + 8D00BB7D2D3B0BE000F6F6DD /* FirebaseDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB7C2D3B0BE000F6F6DD /* FirebaseDatabase */; }; + 8D00BB802D3B0C1200F6F6DD /* FirebaseDatabaseUI in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB7F2D3B0C1200F6F6DD /* FirebaseDatabaseUI */; }; + 8D00BB822D3B0C1F00F6F6DD /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB812D3B0C1F00F6F6DD /* FirebaseAuth */; }; + 8D00BB842D3B0C1F00F6F6DD /* FirebaseDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB832D3B0C1F00F6F6DD /* FirebaseDatabase */; }; + 8D00BB862D3B0C1F00F6F6DD /* FirebaseDatabaseUI in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB852D3B0C1F00F6F6DD /* FirebaseDatabaseUI */; }; A18EF550576A3F1E297EFB56 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = F644C72A588FB44DD666857B /* GoogleService-Info.plist */; }; DEC82E5523AD38E4000EA7B1 /* FIREGSignInHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = DEC82E5223AD38E4000EA7B1 /* FIREGSignInHelper.m */; }; DEC82E5623AD38E4000EA7B1 /* FIREGHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = DEC82E5323AD38E4000EA7B1 /* FIREGHelper.m */; }; @@ -174,6 +180,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8D00BB7D2D3B0BE000F6F6DD /* FirebaseDatabase in Frameworks */, + 8D00BB7B2D3B0BE000F6F6DD /* FirebaseAuth in Frameworks */, + 8D00BB802D3B0C1200F6F6DD /* FirebaseDatabaseUI in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -181,6 +190,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8D00BB842D3B0C1F00F6F6DD /* FirebaseDatabase in Frameworks */, + 8D00BB822D3B0C1F00F6F6DD /* FirebaseAuth in Frameworks */, + 8D00BB862D3B0C1F00F6F6DD /* FirebaseDatabaseUI in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -285,6 +297,7 @@ 5F5A534D1ADE670C00F81DF0 /* Products */, 5F9961041AE0CF4F0034F503 /* Shared */, F644C72A588FB44DD666857B /* GoogleService-Info.plist */, + 8D00BB792D3B0BE000F6F6DD /* Frameworks */, ); sourceTree = ""; wrapsLines = 0; @@ -362,6 +375,13 @@ path = DatabaseExampleTests; sourceTree = ""; }; + 8D00BB792D3B0BE000F6F6DD /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; DEC82E5023AD38E4000EA7B1 /* TestUtils */ = { isa = PBXGroup; children = ( @@ -472,8 +492,9 @@ 5F5A53441ADE670C00F81DF0 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1610; ORGANIZATIONNAME = "Google Inc."; TargetAttributes = { 107347452031598A004A66D1 = { @@ -504,7 +525,6 @@ }; }; buildConfigurationList = 5F5A53471ADE670C00F81DF0 /* Build configuration list for PBXProject "DatabaseExample" */; - compatibilityVersion = "Xcode 3.2"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -512,6 +532,11 @@ Base, ); mainGroup = 5F5A53431ADE670C00F81DF0; + packageReferences = ( + 8D00BB782D3B0BD500F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + 8D00BB7E2D3B0C0200F6F6DD /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */, + ); + preferredProjectObjectVersion = 77; productRefGroup = 5F5A534D1ADE670C00F81DF0 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -696,7 +721,21 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = DatabaseExampleSwiftUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks \"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\" \"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\" \"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\" \"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\" \"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\" \"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\""; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.DatabaseExampleSwiftUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -721,7 +760,21 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = DatabaseExampleSwiftUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks \"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\" \"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\" \"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\" \"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\" \"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\" \"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\""; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.DatabaseExampleSwiftUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -744,7 +797,21 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = DatabaseExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks \"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\" \"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\" \"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\" \"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\" \"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\" \"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\""; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.DatabaseExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -767,7 +834,21 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = DatabaseExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks \"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\" \"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\" \"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\" \"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\" \"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\" \"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\" \"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\""; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.DatabaseExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -798,6 +879,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -808,6 +890,7 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -855,6 +938,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -865,6 +949,7 @@ ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -876,7 +961,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -891,7 +977,10 @@ DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = DatabaseExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.quickstart.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -907,7 +996,10 @@ DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = DatabaseExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.quickstart.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -923,7 +1015,10 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/DatabaseExample/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.DatabaseExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -943,12 +1038,16 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/DatabaseExample/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.DatabaseExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OBJC_BRIDGING_HEADER = "DatabaseExample/DatabaseExampleSwift-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; }; @@ -975,7 +1074,11 @@ DatabaseExample, ); INFOPLIST_FILE = DatabaseExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1005,7 +1108,11 @@ DatabaseExample, ); INFOPLIST_FILE = DatabaseExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1075,6 +1182,58 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 8D00BB782D3B0BD500F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 11.7.0; + }; + }; + 8D00BB7E2D3B0C0200F6F6DD /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/FirebaseUI-iOS"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 15.0.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 8D00BB7A2D3B0BE000F6F6DD /* FirebaseAuth */ = { + isa = XCSwiftPackageProductDependency; + package = 8D00BB782D3B0BD500F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAuth; + }; + 8D00BB7C2D3B0BE000F6F6DD /* FirebaseDatabase */ = { + isa = XCSwiftPackageProductDependency; + package = 8D00BB782D3B0BD500F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseDatabase; + }; + 8D00BB7F2D3B0C1200F6F6DD /* FirebaseDatabaseUI */ = { + isa = XCSwiftPackageProductDependency; + package = 8D00BB7E2D3B0C0200F6F6DD /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */; + productName = FirebaseDatabaseUI; + }; + 8D00BB812D3B0C1F00F6F6DD /* FirebaseAuth */ = { + isa = XCSwiftPackageProductDependency; + package = 8D00BB782D3B0BD500F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAuth; + }; + 8D00BB832D3B0C1F00F6F6DD /* FirebaseDatabase */ = { + isa = XCSwiftPackageProductDependency; + package = 8D00BB782D3B0BD500F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseDatabase; + }; + 8D00BB852D3B0C1F00F6F6DD /* FirebaseDatabaseUI */ = { + isa = XCSwiftPackageProductDependency; + package = 8D00BB7E2D3B0C0200F6F6DD /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */; + productName = FirebaseDatabaseUI; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 5F5A53441ADE670C00F81DF0 /* Project object */; } diff --git a/database/DatabaseExample.xcodeproj/xcshareddata/xcschemes/DatabaseExample.xcscheme b/database/DatabaseExample.xcodeproj/xcshareddata/xcschemes/DatabaseExample.xcscheme index 44f250358..a7bf64004 100644 --- a/database/DatabaseExample.xcodeproj/xcshareddata/xcschemes/DatabaseExample.xcscheme +++ b/database/DatabaseExample.xcodeproj/xcshareddata/xcschemes/DatabaseExample.xcscheme @@ -1,6 +1,6 @@ 14.0' -end - -target 'DatabaseExample' do - firebase_pods - - target 'DatabaseExampleTests' do - inherit! :search_paths - end - - target 'DatabaseExampleUITests' do - inherit! :complete - end - -end - -target 'DatabaseExampleSwift' do - firebase_pods - - target 'DatabaseExampleSwiftUITests' do - inherit! :complete - end - -end - diff --git a/database/Podfile.lock b/database/Podfile.lock deleted file mode 100644 index 7af5dcc2f..000000000 --- a/database/Podfile.lock +++ /dev/null @@ -1,100 +0,0 @@ -PODS: - - FirebaseAppCheckInterop (11.7.0) - - FirebaseAuth (11.7.0): - - FirebaseAppCheckInterop (~> 11.0) - - FirebaseAuthInterop (~> 11.0) - - FirebaseCore (~> 11.7.0) - - FirebaseCoreExtension (~> 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/Environment (~> 8.0) - - GTMSessionFetcher/Core (< 5.0, >= 3.4) - - RecaptchaInterop (~> 100.0) - - FirebaseAuthInterop (11.7.0) - - FirebaseCore (11.7.0): - - FirebaseCoreInternal (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseCoreInternal (11.7.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseDatabase (11.7.0): - - FirebaseAppCheckInterop (~> 11.0) - - FirebaseCore (~> 11.7.0) - - FirebaseSharedSwift (~> 11.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - leveldb-library (~> 1.22) - - FirebaseDatabaseUI (14.2.0): - - FirebaseDatabase (< 12.0, >= 8.0) - - FirebaseSharedSwift (11.7.0) - - FirebaseUI/Database (14.2.0): - - FirebaseDatabaseUI (~> 14.2) - - GoogleUtilities/AppDelegateSwizzler (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.0.2): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.0.2): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Privacy - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.0.2)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/Reachability (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GTMSessionFetcher/Core (4.2.0) - - leveldb-library (1.22.6) - - RecaptchaInterop (100.0.0) - -DEPENDENCIES: - - FirebaseAuth - - FirebaseDatabase - - FirebaseUI/Database (~> 14.0) - -SPEC REPOS: - trunk: - - FirebaseAppCheckInterop - - FirebaseAuth - - FirebaseAuthInterop - - FirebaseCore - - FirebaseCoreExtension - - FirebaseCoreInternal - - FirebaseDatabase - - FirebaseDatabaseUI - - FirebaseSharedSwift - - FirebaseUI - - GoogleUtilities - - GTMSessionFetcher - - leveldb-library - - RecaptchaInterop - -SPEC CHECKSUMS: - FirebaseAppCheckInterop: 2376d3ec5cb4267facad4fe754ab4f301a5a519b - FirebaseAuth: 77e25aa24f3e1c626c5babd3338551fc1669ee0e - FirebaseAuthInterop: a6973d72aa242ea88ffb6be9c9b06c65455071da - FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4 - FirebaseCoreExtension: 206c1b399f0d103055207c16f299b28e3dbd1949 - FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 - FirebaseDatabase: b014c0068fa691dec5f4a868357e685df882cca5 - FirebaseDatabaseUI: fa413a4300fa3cba5320958f41ad69d0439b8950 - FirebaseSharedSwift: a45efd84d60ebbfdcdbaebc66948af3630459e62 - FirebaseUI: 3909853fc34f316c822e195376f144b1b0c6ca15 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - GTMSessionFetcher: 4cb0aa086996858328a1fca61f9bfe81cfdfdfa9 - leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19 - RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 - -PODFILE CHECKSUM: 63ad88d477c0b7246035547030c55c542a0ea557 - -COCOAPODS: 1.16.2 From 73678e38d29e59a82b848405a19333d65d92ccc7 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Wed, 22 Jan 2025 14:19:55 -0800 Subject: [PATCH 07/56] migrate Firestore sample to spm --- .../project.pbxproj | 160 +- .../xcschemes/FirestoreExample.xcscheme | 24 +- .../RestaurantsTableViewController.swift | 4 +- .../Views/RestaurantDetailView.swift | 1 - .../Views/RestaurantImageView.swift | 7 +- firestore/Podfile | 23 - firestore/Podfile.lock | 1395 ----------------- 7 files changed, 156 insertions(+), 1458 deletions(-) delete mode 100644 firestore/Podfile delete mode 100644 firestore/Podfile.lock diff --git a/firestore/FirestoreExample.xcodeproj/project.pbxproj b/firestore/FirestoreExample.xcodeproj/project.pbxproj index cc12d1b42..07e1ce161 100644 --- a/firestore/FirestoreExample.xcodeproj/project.pbxproj +++ b/firestore/FirestoreExample.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 77; objects = { /* Begin PBXBuildFile section */ @@ -19,6 +19,13 @@ 8D9BBC381EE2200900194E9A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8D9BBC371EE2200900194E9A /* Assets.xcassets */; }; 8D9BBC3B1EE2200900194E9A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D9BBC391EE2200900194E9A /* LaunchScreen.storyboard */; }; 8D9BBC461EE2200900194E9A /* FirestoreExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D9BBC451EE2200900194E9A /* FirestoreExampleTests.swift */; }; + 8DC73D692D41A3AD0092B6EE /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D682D41A3AD0092B6EE /* FirebaseAuth */; }; + 8DC73D6B2D41A3AD0092B6EE /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D6A2D41A3AD0092B6EE /* FirebaseFirestore */; }; + 8DC73D6D2D41A3B60092B6EE /* FirebaseAuthUI in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D6C2D41A3B60092B6EE /* FirebaseAuthUI */; }; + 8DC73D6F2D41A3B60092B6EE /* FirebaseEmailAuthUI in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D6E2D41A3B60092B6EE /* FirebaseEmailAuthUI */; }; + 8DC73D722D41A4330092B6EE /* SDWebImage in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D712D41A4330092B6EE /* SDWebImage */; }; + 8DC73D742D41A5BF0092B6EE /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D732D41A5BF0092B6EE /* FirebaseAuth */; }; + 8DC73D762D41A5BF0092B6EE /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D752D41A5BF0092B6EE /* FirebaseFirestore */; }; 8DD9ACDA1F7B166900C2DD24 /* pizza-monster.png in Resources */ = {isa = PBXBuildFile; fileRef = 8DD9ACD91F7B166900C2DD24 /* pizza-monster.png */; }; 8DF1E3131EE5CFF900192CDE /* Restaurant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF1E3121EE5CFF900192CDE /* Restaurant.swift */; }; 8DF1E3151EE72C4600192CDE /* LocalCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF1E3141EE72C4600192CDE /* LocalCollection.swift */; }; @@ -134,6 +141,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8DC73D6F2D41A3B60092B6EE /* FirebaseEmailAuthUI in Frameworks */, + 8DC73D692D41A3AD0092B6EE /* FirebaseAuth in Frameworks */, + 8DC73D6D2D41A3B60092B6EE /* FirebaseAuthUI in Frameworks */, + 8DC73D6B2D41A3AD0092B6EE /* FirebaseFirestore in Frameworks */, + 8DC73D722D41A4330092B6EE /* SDWebImage in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -148,6 +160,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8DC73D742D41A5BF0092B6EE /* FirebaseAuth in Frameworks */, + 8DC73D762D41A5BF0092B6EE /* FirebaseFirestore in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -175,6 +189,7 @@ 8E4C62CF25E9CFE0001678A1 /* FirestoreSwiftUIExample */, 8D9BBC2E1EE2200900194E9A /* Products */, 6AA80A371E484FE3095D24C4 /* GoogleService-Info.plist */, + 8DC73D672D41A3AD0092B6EE /* Frameworks */, ); sourceTree = ""; }; @@ -219,6 +234,13 @@ path = FirestoreExampleTests; sourceTree = ""; }; + 8DC73D672D41A3AD0092B6EE /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; 8E1E43AB25F9604B00BC64D3 /* Extensions */ = { isa = PBXGroup; children = ( @@ -379,8 +401,9 @@ 8D9BBC251EE2200800194E9A /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1230; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1610; ORGANIZATIONNAME = Firebase; TargetAttributes = { 1073476F203159E3004A66D1 = { @@ -407,7 +430,6 @@ }; }; buildConfigurationList = 8D9BBC281EE2200800194E9A /* Build configuration list for PBXProject "FirestoreExample" */; - compatibilityVersion = "Xcode 3.2"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -415,6 +437,12 @@ Base, ); mainGroup = 8D9BBC241EE2200800194E9A; + packageReferences = ( + 8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + 8DC73D662D41A3410092B6EE /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */, + 8DC73D702D41A42A0092B6EE /* XCRemoteSwiftPackageReference "SDWebImage" */, + ); + preferredProjectObjectVersion = 77; productRefGroup = 8D9BBC2E1EE2200900194E9A /* Products */; projectDirPath = ""; projectRoot = ""; @@ -581,7 +609,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FirestoreExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.FirestoreExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "FirestoreExampleUITests/FirestoreExampleUITests-Bridging-Header.h"; @@ -609,7 +641,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FirestoreExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.FirestoreExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "FirestoreExampleUITests/FirestoreExampleUITests-Bridging-Header.h"; @@ -645,6 +681,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -655,6 +692,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -669,7 +707,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -705,6 +743,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -715,6 +754,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -723,10 +763,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -740,7 +781,10 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/FirestoreExample/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreExample; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -758,7 +802,10 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/FirestoreExample/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreExample; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -770,10 +817,13 @@ 8D9BBC4E1EE2200900194E9A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; INFOPLIST_FILE = FirestoreExampleTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -784,10 +834,13 @@ 8D9BBC4F1EE2200900194E9A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; INFOPLIST_FILE = FirestoreExampleTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -808,8 +861,11 @@ ENABLE_PREVIEWS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FirestoreSwiftUIExample/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreSwiftUIExample; @@ -832,8 +888,11 @@ ENABLE_PREVIEWS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FirestoreSwiftUIExample/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreSwiftUIExample; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -891,6 +950,71 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 11.7.0; + }; + }; + 8DC73D662D41A3410092B6EE /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/FirebaseUI-iOS"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 15.0.0; + }; + }; + 8DC73D702D41A42A0092B6EE /* XCRemoteSwiftPackageReference "SDWebImage" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/SDWebImage/SDWebImage.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.20.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 8DC73D682D41A3AD0092B6EE /* FirebaseAuth */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAuth; + }; + 8DC73D6A2D41A3AD0092B6EE /* FirebaseFirestore */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseFirestore; + }; + 8DC73D6C2D41A3B60092B6EE /* FirebaseAuthUI */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D662D41A3410092B6EE /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */; + productName = FirebaseAuthUI; + }; + 8DC73D6E2D41A3B60092B6EE /* FirebaseEmailAuthUI */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D662D41A3410092B6EE /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */; + productName = FirebaseEmailAuthUI; + }; + 8DC73D712D41A4330092B6EE /* SDWebImage */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D702D41A42A0092B6EE /* XCRemoteSwiftPackageReference "SDWebImage" */; + productName = SDWebImage; + }; + 8DC73D732D41A5BF0092B6EE /* FirebaseAuth */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAuth; + }; + 8DC73D752D41A5BF0092B6EE /* FirebaseFirestore */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseFirestore; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 8D9BBC251EE2200800194E9A /* Project object */; } diff --git a/firestore/FirestoreExample.xcodeproj/xcshareddata/xcschemes/FirestoreExample.xcscheme b/firestore/FirestoreExample.xcodeproj/xcshareddata/xcschemes/FirestoreExample.xcscheme index b6d2252f9..c759aa563 100644 --- a/firestore/FirestoreExample.xcodeproj/xcshareddata/xcschemes/FirestoreExample.xcscheme +++ b/firestore/FirestoreExample.xcodeproj/xcshareddata/xcschemes/FirestoreExample.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -49,17 +58,6 @@ - - - - - - - - String { let priceText: String @@ -142,7 +141,8 @@ class RestaurantsTableViewController: UIViewController, UITableViewDataSource, U override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) let auth = FUIAuth.defaultAuthUI()! - if auth.auth?.currentUser == nil { + let underlyingAuth = Auth.auth() + if underlyingAuth.currentUser == nil { let emailAuthProvider = FUIEmailAuth() auth.providers = [emailAuthProvider] present(auth.authViewController(), animated: true, completion: nil) diff --git a/firestore/FirestoreSwiftUIExample/Views/RestaurantDetailView.swift b/firestore/FirestoreSwiftUIExample/Views/RestaurantDetailView.swift index bf7fa49c7..323a691fb 100644 --- a/firestore/FirestoreSwiftUIExample/Views/RestaurantDetailView.swift +++ b/firestore/FirestoreSwiftUIExample/Views/RestaurantDetailView.swift @@ -18,7 +18,6 @@ // import SwiftUI -import SDWebImageSwiftUI struct RestaurantDetailView: View { var restaurant: Restaurant diff --git a/firestore/FirestoreSwiftUIExample/Views/RestaurantImageView.swift b/firestore/FirestoreSwiftUIExample/Views/RestaurantImageView.swift index f954e54c7..26d68a885 100644 --- a/firestore/FirestoreSwiftUIExample/Views/RestaurantImageView.swift +++ b/firestore/FirestoreSwiftUIExample/Views/RestaurantImageView.swift @@ -18,7 +18,6 @@ // import SwiftUI -import SDWebImageSwiftUI struct RestaurantImageView: View { var imageURL: URL @@ -26,13 +25,11 @@ struct RestaurantImageView: View { var body: some View { if isThumbnail { - WebImage(url: imageURL) - .resizable() + AsyncImage(url: imageURL) .aspectRatio(1, contentMode: .fill) .frame(width: 100, height: 100, alignment: .leading) } else { - WebImage(url: imageURL) - .resizable() + AsyncImage(url: imageURL) .aspectRatio(contentMode: .fill) } } diff --git a/firestore/Podfile b/firestore/Podfile deleted file mode 100644 index a0984078a..000000000 --- a/firestore/Podfile +++ /dev/null @@ -1,23 +0,0 @@ -platform :ios, '13.0' - -target 'FirestoreExample' do - use_frameworks! - - pod 'FirebaseAuth' - pod 'FirebaseUI/Auth', '~> 14.0' - pod 'FirebaseUI/Email', '~> 14.0' - pod 'FirebaseFirestore' - pod 'SDWebImage' - - target 'FirestoreExampleTests' do - inherit! :search_paths - end -end - -target 'FirestoreSwiftUIExample' do - use_frameworks! - - pod 'FirebaseAuth' - pod 'FirebaseFirestore' - pod 'SDWebImageSwiftUI' -end diff --git a/firestore/Podfile.lock b/firestore/Podfile.lock deleted file mode 100644 index 231b2e8f2..000000000 --- a/firestore/Podfile.lock +++ /dev/null @@ -1,1395 +0,0 @@ -PODS: - - abseil/algorithm (1.20240116.2): - - abseil/algorithm/algorithm (= 1.20240116.2) - - abseil/algorithm/container (= 1.20240116.2) - - abseil/algorithm/algorithm (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/algorithm/container (1.20240116.2): - - abseil/algorithm/algorithm - - abseil/base/core_headers - - abseil/base/nullability - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/base (1.20240116.2): - - abseil/base/atomic_hook (= 1.20240116.2) - - abseil/base/base (= 1.20240116.2) - - abseil/base/base_internal (= 1.20240116.2) - - abseil/base/config (= 1.20240116.2) - - abseil/base/core_headers (= 1.20240116.2) - - abseil/base/cycleclock_internal (= 1.20240116.2) - - abseil/base/dynamic_annotations (= 1.20240116.2) - - abseil/base/endian (= 1.20240116.2) - - abseil/base/errno_saver (= 1.20240116.2) - - abseil/base/fast_type_id (= 1.20240116.2) - - abseil/base/log_severity (= 1.20240116.2) - - abseil/base/malloc_internal (= 1.20240116.2) - - abseil/base/no_destructor (= 1.20240116.2) - - abseil/base/nullability (= 1.20240116.2) - - abseil/base/prefetch (= 1.20240116.2) - - abseil/base/pretty_function (= 1.20240116.2) - - abseil/base/raw_logging_internal (= 1.20240116.2) - - abseil/base/spinlock_wait (= 1.20240116.2) - - abseil/base/strerror (= 1.20240116.2) - - abseil/base/throw_delegate (= 1.20240116.2) - - abseil/base/atomic_hook (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/xcprivacy - - abseil/base/base (1.20240116.2): - - abseil/base/atomic_hook - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/base/cycleclock_internal - - abseil/base/dynamic_annotations - - abseil/base/log_severity - - abseil/base/nullability - - abseil/base/raw_logging_internal - - abseil/base/spinlock_wait - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/base/base_internal (1.20240116.2): - - abseil/base/config - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/base/config (1.20240116.2): - - abseil/xcprivacy - - abseil/base/core_headers (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/base/cycleclock_internal (1.20240116.2): - - abseil/base/base_internal - - abseil/base/config - - abseil/xcprivacy - - abseil/base/dynamic_annotations (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/xcprivacy - - abseil/base/endian (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/nullability - - abseil/xcprivacy - - abseil/base/errno_saver (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/base/fast_type_id (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/base/log_severity (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/xcprivacy - - abseil/base/malloc_internal (1.20240116.2): - - abseil/base/base - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/base/dynamic_annotations - - abseil/base/raw_logging_internal - - abseil/xcprivacy - - abseil/base/no_destructor (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/base/nullability (1.20240116.2): - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/base/prefetch (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/xcprivacy - - abseil/base/pretty_function (1.20240116.2): - - abseil/xcprivacy - - abseil/base/raw_logging_internal (1.20240116.2): - - abseil/base/atomic_hook - - abseil/base/config - - abseil/base/core_headers - - abseil/base/errno_saver - - abseil/base/log_severity - - abseil/xcprivacy - - abseil/base/spinlock_wait (1.20240116.2): - - abseil/base/base_internal - - abseil/base/core_headers - - abseil/base/errno_saver - - abseil/xcprivacy - - abseil/base/strerror (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/errno_saver - - abseil/xcprivacy - - abseil/base/throw_delegate (1.20240116.2): - - abseil/base/config - - abseil/base/raw_logging_internal - - abseil/xcprivacy - - abseil/cleanup/cleanup (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/cleanup/cleanup_internal - - abseil/xcprivacy - - abseil/cleanup/cleanup_internal (1.20240116.2): - - abseil/base/base_internal - - abseil/base/core_headers - - abseil/utility/utility - - abseil/xcprivacy - - abseil/container/common (1.20240116.2): - - abseil/meta/type_traits - - abseil/types/optional - - abseil/xcprivacy - - abseil/container/common_policy_traits (1.20240116.2): - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/container/compressed_tuple (1.20240116.2): - - abseil/utility/utility - - abseil/xcprivacy - - abseil/container/container_memory (1.20240116.2): - - abseil/base/config - - abseil/memory/memory - - abseil/meta/type_traits - - abseil/utility/utility - - abseil/xcprivacy - - abseil/container/fixed_array (1.20240116.2): - - abseil/algorithm/algorithm - - abseil/base/config - - abseil/base/core_headers - - abseil/base/dynamic_annotations - - abseil/base/throw_delegate - - abseil/container/compressed_tuple - - abseil/memory/memory - - abseil/xcprivacy - - abseil/container/flat_hash_map (1.20240116.2): - - abseil/algorithm/container - - abseil/base/core_headers - - abseil/container/container_memory - - abseil/container/hash_function_defaults - - abseil/container/raw_hash_map - - abseil/memory/memory - - abseil/xcprivacy - - abseil/container/flat_hash_set (1.20240116.2): - - abseil/algorithm/container - - abseil/base/core_headers - - abseil/container/container_memory - - abseil/container/hash_function_defaults - - abseil/container/raw_hash_set - - abseil/memory/memory - - abseil/xcprivacy - - abseil/container/hash_function_defaults (1.20240116.2): - - abseil/base/config - - abseil/hash/hash - - abseil/strings/cord - - abseil/strings/strings - - abseil/xcprivacy - - abseil/container/hash_policy_traits (1.20240116.2): - - abseil/container/common_policy_traits - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/container/hashtable_debug_hooks (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/container/hashtablez_sampler (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/raw_logging_internal - - abseil/debugging/stacktrace - - abseil/memory/memory - - abseil/profiling/exponential_biased - - abseil/profiling/sample_recorder - - abseil/synchronization/synchronization - - abseil/time/time - - abseil/utility/utility - - abseil/xcprivacy - - abseil/container/inlined_vector (1.20240116.2): - - abseil/algorithm/algorithm - - abseil/base/core_headers - - abseil/base/throw_delegate - - abseil/container/inlined_vector_internal - - abseil/memory/memory - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/container/inlined_vector_internal (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/container/compressed_tuple - - abseil/memory/memory - - abseil/meta/type_traits - - abseil/types/span - - abseil/xcprivacy - - abseil/container/layout (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/debugging/demangle_internal - - abseil/meta/type_traits - - abseil/strings/strings - - abseil/types/span - - abseil/utility/utility - - abseil/xcprivacy - - abseil/container/raw_hash_map (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/throw_delegate - - abseil/container/container_memory - - abseil/container/raw_hash_set - - abseil/xcprivacy - - abseil/container/raw_hash_set (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/dynamic_annotations - - abseil/base/endian - - abseil/base/prefetch - - abseil/base/raw_logging_internal - - abseil/container/common - - abseil/container/compressed_tuple - - abseil/container/container_memory - - abseil/container/hash_policy_traits - - abseil/container/hashtable_debug_hooks - - abseil/container/hashtablez_sampler - - abseil/hash/hash - - abseil/memory/memory - - abseil/meta/type_traits - - abseil/numeric/bits - - abseil/utility/utility - - abseil/xcprivacy - - abseil/crc/cpu_detect (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/xcprivacy - - abseil/crc/crc32c (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/base/prefetch - - abseil/crc/cpu_detect - - abseil/crc/crc_internal - - abseil/crc/non_temporal_memcpy - - abseil/strings/str_format - - abseil/strings/strings - - abseil/xcprivacy - - abseil/crc/crc_cord_state (1.20240116.2): - - abseil/base/config - - abseil/crc/crc32c - - abseil/numeric/bits - - abseil/strings/strings - - abseil/xcprivacy - - abseil/crc/crc_internal (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/base/prefetch - - abseil/base/raw_logging_internal - - abseil/crc/cpu_detect - - abseil/memory/memory - - abseil/numeric/bits - - abseil/xcprivacy - - abseil/crc/non_temporal_arm_intrinsics (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/crc/non_temporal_memcpy (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/crc/non_temporal_arm_intrinsics - - abseil/xcprivacy - - abseil/debugging/debugging_internal (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/dynamic_annotations - - abseil/base/errno_saver - - abseil/base/raw_logging_internal - - abseil/xcprivacy - - abseil/debugging/demangle_internal (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/xcprivacy - - abseil/debugging/examine_stack (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/raw_logging_internal - - abseil/debugging/stacktrace - - abseil/debugging/symbolize - - abseil/xcprivacy - - abseil/debugging/stacktrace (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/dynamic_annotations - - abseil/base/raw_logging_internal - - abseil/debugging/debugging_internal - - abseil/xcprivacy - - abseil/debugging/symbolize (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/dynamic_annotations - - abseil/base/malloc_internal - - abseil/base/raw_logging_internal - - abseil/debugging/debugging_internal - - abseil/debugging/demangle_internal - - abseil/strings/strings - - abseil/xcprivacy - - abseil/flags/commandlineflag (1.20240116.2): - - abseil/base/config - - abseil/base/fast_type_id - - abseil/flags/commandlineflag_internal - - abseil/strings/strings - - abseil/types/optional - - abseil/xcprivacy - - abseil/flags/commandlineflag_internal (1.20240116.2): - - abseil/base/config - - abseil/base/fast_type_id - - abseil/xcprivacy - - abseil/flags/config (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/flags/path_util - - abseil/flags/program_name - - abseil/strings/strings - - abseil/synchronization/synchronization - - abseil/xcprivacy - - abseil/flags/flag (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/flags/config - - abseil/flags/flag_internal - - abseil/flags/reflection - - abseil/strings/strings - - abseil/xcprivacy - - abseil/flags/flag_internal (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/dynamic_annotations - - abseil/flags/commandlineflag - - abseil/flags/commandlineflag_internal - - abseil/flags/config - - abseil/flags/marshalling - - abseil/flags/reflection - - abseil/memory/memory - - abseil/meta/type_traits - - abseil/strings/strings - - abseil/synchronization/synchronization - - abseil/utility/utility - - abseil/xcprivacy - - abseil/flags/marshalling (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/log_severity - - abseil/numeric/int128 - - abseil/strings/str_format - - abseil/strings/strings - - abseil/types/optional - - abseil/xcprivacy - - abseil/flags/path_util (1.20240116.2): - - abseil/base/config - - abseil/strings/strings - - abseil/xcprivacy - - abseil/flags/private_handle_accessor (1.20240116.2): - - abseil/base/config - - abseil/flags/commandlineflag - - abseil/flags/commandlineflag_internal - - abseil/strings/strings - - abseil/xcprivacy - - abseil/flags/program_name (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/flags/path_util - - abseil/strings/strings - - abseil/synchronization/synchronization - - abseil/xcprivacy - - abseil/flags/reflection (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/no_destructor - - abseil/container/flat_hash_map - - abseil/flags/commandlineflag - - abseil/flags/commandlineflag_internal - - abseil/flags/config - - abseil/flags/private_handle_accessor - - abseil/strings/strings - - abseil/synchronization/synchronization - - abseil/xcprivacy - - abseil/functional/any_invocable (1.20240116.2): - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/utility/utility - - abseil/xcprivacy - - abseil/functional/bind_front (1.20240116.2): - - abseil/base/base_internal - - abseil/container/compressed_tuple - - abseil/meta/type_traits - - abseil/utility/utility - - abseil/xcprivacy - - abseil/functional/function_ref (1.20240116.2): - - abseil/base/base_internal - - abseil/base/core_headers - - abseil/functional/any_invocable - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/hash/city (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/xcprivacy - - abseil/hash/hash (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/container/fixed_array - - abseil/functional/function_ref - - abseil/hash/city - - abseil/hash/low_level_hash - - abseil/meta/type_traits - - abseil/numeric/bits - - abseil/numeric/int128 - - abseil/strings/strings - - abseil/types/optional - - abseil/types/variant - - abseil/utility/utility - - abseil/xcprivacy - - abseil/hash/low_level_hash (1.20240116.2): - - abseil/base/config - - abseil/base/endian - - abseil/base/prefetch - - abseil/numeric/int128 - - abseil/xcprivacy - - abseil/log/absl_check (1.20240116.2): - - abseil/log/internal/check_impl - - abseil/xcprivacy - - abseil/log/absl_log (1.20240116.2): - - abseil/log/internal/log_impl - - abseil/xcprivacy - - abseil/log/absl_vlog_is_on (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/log/internal/vlog_config - - abseil/strings/strings - - abseil/xcprivacy - - abseil/log/check (1.20240116.2): - - abseil/log/internal/check_impl - - abseil/log/internal/check_op - - abseil/log/internal/conditions - - abseil/log/internal/log_message - - abseil/log/internal/strip - - abseil/xcprivacy - - abseil/log/globals (1.20240116.2): - - abseil/base/atomic_hook - - abseil/base/config - - abseil/base/core_headers - - abseil/base/log_severity - - abseil/base/raw_logging_internal - - abseil/hash/hash - - abseil/log/internal/vlog_config - - abseil/strings/strings - - abseil/xcprivacy - - abseil/log/internal/append_truncated (1.20240116.2): - - abseil/base/config - - abseil/strings/strings - - abseil/types/span - - abseil/xcprivacy - - abseil/log/internal/check_impl (1.20240116.2): - - abseil/base/core_headers - - abseil/log/internal/check_op - - abseil/log/internal/conditions - - abseil/log/internal/log_message - - abseil/log/internal/strip - - abseil/xcprivacy - - abseil/log/internal/check_op (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/log/internal/nullguard - - abseil/log/internal/nullstream - - abseil/log/internal/strip - - abseil/strings/strings - - abseil/xcprivacy - - abseil/log/internal/conditions (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/log/internal/voidify - - abseil/xcprivacy - - abseil/log/internal/config (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/xcprivacy - - abseil/log/internal/fnmatch (1.20240116.2): - - abseil/base/config - - abseil/strings/strings - - abseil/xcprivacy - - abseil/log/internal/format (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/log_severity - - abseil/log/internal/append_truncated - - abseil/log/internal/config - - abseil/log/internal/globals - - abseil/strings/str_format - - abseil/strings/strings - - abseil/time/time - - abseil/types/span - - abseil/xcprivacy - - abseil/log/internal/globals (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/log_severity - - abseil/base/raw_logging_internal - - abseil/strings/strings - - abseil/time/time - - abseil/xcprivacy - - abseil/log/internal/log_impl (1.20240116.2): - - abseil/log/absl_vlog_is_on - - abseil/log/internal/conditions - - abseil/log/internal/log_message - - abseil/log/internal/strip - - abseil/xcprivacy - - abseil/log/internal/log_message (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/errno_saver - - abseil/base/log_severity - - abseil/base/raw_logging_internal - - abseil/base/strerror - - abseil/container/inlined_vector - - abseil/debugging/examine_stack - - abseil/log/globals - - abseil/log/internal/append_truncated - - abseil/log/internal/format - - abseil/log/internal/globals - - abseil/log/internal/log_sink_set - - abseil/log/internal/nullguard - - abseil/log/internal/proto - - abseil/log/log_entry - - abseil/log/log_sink - - abseil/log/log_sink_registry - - abseil/memory/memory - - abseil/strings/strings - - abseil/time/time - - abseil/types/span - - abseil/xcprivacy - - abseil/log/internal/log_sink_set (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/log_severity - - abseil/base/no_destructor - - abseil/base/raw_logging_internal - - abseil/cleanup/cleanup - - abseil/log/globals - - abseil/log/internal/config - - abseil/log/internal/globals - - abseil/log/log_entry - - abseil/log/log_sink - - abseil/strings/strings - - abseil/synchronization/synchronization - - abseil/types/span - - abseil/xcprivacy - - abseil/log/internal/nullguard (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/xcprivacy - - abseil/log/internal/nullstream (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/log_severity - - abseil/strings/strings - - abseil/xcprivacy - - abseil/log/internal/proto (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/strings/strings - - abseil/types/span - - abseil/xcprivacy - - abseil/log/internal/strip (1.20240116.2): - - abseil/base/log_severity - - abseil/log/internal/log_message - - abseil/log/internal/nullstream - - abseil/xcprivacy - - abseil/log/internal/vlog_config (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/no_destructor - - abseil/log/internal/fnmatch - - abseil/memory/memory - - abseil/strings/strings - - abseil/synchronization/synchronization - - abseil/types/optional - - abseil/xcprivacy - - abseil/log/internal/voidify (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/log/log (1.20240116.2): - - abseil/log/internal/log_impl - - abseil/log/vlog_is_on - - abseil/xcprivacy - - abseil/log/log_entry (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/log_severity - - abseil/log/internal/config - - abseil/strings/strings - - abseil/time/time - - abseil/types/span - - abseil/xcprivacy - - abseil/log/log_sink (1.20240116.2): - - abseil/base/config - - abseil/log/log_entry - - abseil/xcprivacy - - abseil/log/log_sink_registry (1.20240116.2): - - abseil/base/config - - abseil/log/internal/log_sink_set - - abseil/log/log_sink - - abseil/xcprivacy - - abseil/log/vlog_is_on (1.20240116.2): - - abseil/log/absl_vlog_is_on - - abseil/xcprivacy - - abseil/memory (1.20240116.2): - - abseil/memory/memory (= 1.20240116.2) - - abseil/memory/memory (1.20240116.2): - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/meta (1.20240116.2): - - abseil/meta/type_traits (= 1.20240116.2) - - abseil/meta/type_traits (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/xcprivacy - - abseil/numeric/bits (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/xcprivacy - - abseil/numeric/int128 (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/numeric/bits - - abseil/xcprivacy - - abseil/numeric/representation (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/profiling/exponential_biased (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/xcprivacy - - abseil/profiling/sample_recorder (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/synchronization/synchronization - - abseil/time/time - - abseil/xcprivacy - - abseil/random/bit_gen_ref (1.20240116.2): - - abseil/base/core_headers - - abseil/base/fast_type_id - - abseil/meta/type_traits - - abseil/random/internal/distribution_caller - - abseil/random/internal/fast_uniform_bits - - abseil/random/random - - abseil/xcprivacy - - abseil/random/distributions (1.20240116.2): - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/numeric/bits - - abseil/random/internal/distribution_caller - - abseil/random/internal/fast_uniform_bits - - abseil/random/internal/fastmath - - abseil/random/internal/generate_real - - abseil/random/internal/iostream_state_saver - - abseil/random/internal/traits - - abseil/random/internal/uniform_helper - - abseil/random/internal/wide_multiply - - abseil/strings/strings - - abseil/xcprivacy - - abseil/random/internal/distribution_caller (1.20240116.2): - - abseil/base/config - - abseil/base/fast_type_id - - abseil/utility/utility - - abseil/xcprivacy - - abseil/random/internal/fast_uniform_bits (1.20240116.2): - - abseil/base/config - - abseil/meta/type_traits - - abseil/random/internal/traits - - abseil/xcprivacy - - abseil/random/internal/fastmath (1.20240116.2): - - abseil/numeric/bits - - abseil/xcprivacy - - abseil/random/internal/generate_real (1.20240116.2): - - abseil/meta/type_traits - - abseil/numeric/bits - - abseil/random/internal/fastmath - - abseil/random/internal/traits - - abseil/xcprivacy - - abseil/random/internal/iostream_state_saver (1.20240116.2): - - abseil/meta/type_traits - - abseil/numeric/int128 - - abseil/xcprivacy - - abseil/random/internal/nonsecure_base (1.20240116.2): - - abseil/base/core_headers - - abseil/container/inlined_vector - - abseil/meta/type_traits - - abseil/random/internal/pool_urbg - - abseil/random/internal/salted_seed_seq - - abseil/random/internal/seed_material - - abseil/types/span - - abseil/xcprivacy - - abseil/random/internal/pcg_engine (1.20240116.2): - - abseil/base/config - - abseil/meta/type_traits - - abseil/numeric/bits - - abseil/numeric/int128 - - abseil/random/internal/fastmath - - abseil/random/internal/iostream_state_saver - - abseil/xcprivacy - - abseil/random/internal/platform (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/random/internal/pool_urbg (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/base/raw_logging_internal - - abseil/random/internal/randen - - abseil/random/internal/seed_material - - abseil/random/internal/traits - - abseil/random/seed_gen_exception - - abseil/types/span - - abseil/xcprivacy - - abseil/random/internal/randen (1.20240116.2): - - abseil/base/raw_logging_internal - - abseil/random/internal/platform - - abseil/random/internal/randen_hwaes - - abseil/random/internal/randen_slow - - abseil/xcprivacy - - abseil/random/internal/randen_engine (1.20240116.2): - - abseil/base/endian - - abseil/meta/type_traits - - abseil/random/internal/iostream_state_saver - - abseil/random/internal/randen - - abseil/xcprivacy - - abseil/random/internal/randen_hwaes (1.20240116.2): - - abseil/base/config - - abseil/random/internal/platform - - abseil/random/internal/randen_hwaes_impl - - abseil/xcprivacy - - abseil/random/internal/randen_hwaes_impl (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/numeric/int128 - - abseil/random/internal/platform - - abseil/xcprivacy - - abseil/random/internal/randen_slow (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/numeric/int128 - - abseil/random/internal/platform - - abseil/xcprivacy - - abseil/random/internal/salted_seed_seq (1.20240116.2): - - abseil/container/inlined_vector - - abseil/meta/type_traits - - abseil/random/internal/seed_material - - abseil/types/optional - - abseil/types/span - - abseil/xcprivacy - - abseil/random/internal/seed_material (1.20240116.2): - - abseil/base/core_headers - - abseil/base/dynamic_annotations - - abseil/base/raw_logging_internal - - abseil/random/internal/fast_uniform_bits - - abseil/strings/strings - - abseil/types/optional - - abseil/types/span - - abseil/xcprivacy - - abseil/random/internal/traits (1.20240116.2): - - abseil/base/config - - abseil/numeric/bits - - abseil/numeric/int128 - - abseil/xcprivacy - - abseil/random/internal/uniform_helper (1.20240116.2): - - abseil/base/config - - abseil/meta/type_traits - - abseil/numeric/int128 - - abseil/random/internal/traits - - abseil/xcprivacy - - abseil/random/internal/wide_multiply (1.20240116.2): - - abseil/base/config - - abseil/numeric/bits - - abseil/numeric/int128 - - abseil/random/internal/traits - - abseil/xcprivacy - - abseil/random/random (1.20240116.2): - - abseil/random/distributions - - abseil/random/internal/nonsecure_base - - abseil/random/internal/pcg_engine - - abseil/random/internal/pool_urbg - - abseil/random/internal/randen_engine - - abseil/random/seed_sequences - - abseil/xcprivacy - - abseil/random/seed_gen_exception (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/random/seed_sequences (1.20240116.2): - - abseil/base/config - - abseil/random/internal/pool_urbg - - abseil/random/internal/salted_seed_seq - - abseil/random/internal/seed_material - - abseil/random/seed_gen_exception - - abseil/types/span - - abseil/xcprivacy - - abseil/status/status (1.20240116.2): - - abseil/base/atomic_hook - - abseil/base/config - - abseil/base/core_headers - - abseil/base/no_destructor - - abseil/base/nullability - - abseil/base/raw_logging_internal - - abseil/base/strerror - - abseil/container/inlined_vector - - abseil/debugging/stacktrace - - abseil/debugging/symbolize - - abseil/functional/function_ref - - abseil/memory/memory - - abseil/strings/cord - - abseil/strings/str_format - - abseil/strings/strings - - abseil/types/optional - - abseil/types/span - - abseil/xcprivacy - - abseil/status/statusor (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/nullability - - abseil/base/raw_logging_internal - - abseil/meta/type_traits - - abseil/status/status - - abseil/strings/has_ostream_operator - - abseil/strings/str_format - - abseil/strings/strings - - abseil/types/variant - - abseil/utility/utility - - abseil/xcprivacy - - abseil/strings/charset (1.20240116.2): - - abseil/base/core_headers - - abseil/strings/string_view - - abseil/xcprivacy - - abseil/strings/cord (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/base/nullability - - abseil/base/raw_logging_internal - - abseil/container/inlined_vector - - abseil/crc/crc32c - - abseil/crc/crc_cord_state - - abseil/functional/function_ref - - abseil/meta/type_traits - - abseil/numeric/bits - - abseil/strings/cord_internal - - abseil/strings/cordz_functions - - abseil/strings/cordz_info - - abseil/strings/cordz_statistics - - abseil/strings/cordz_update_scope - - abseil/strings/cordz_update_tracker - - abseil/strings/internal - - abseil/strings/strings - - abseil/types/optional - - abseil/types/span - - abseil/xcprivacy - - abseil/strings/cord_internal (1.20240116.2): - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/base/raw_logging_internal - - abseil/base/throw_delegate - - abseil/container/compressed_tuple - - abseil/container/container_memory - - abseil/container/inlined_vector - - abseil/container/layout - - abseil/crc/crc_cord_state - - abseil/functional/function_ref - - abseil/meta/type_traits - - abseil/strings/strings - - abseil/types/span - - abseil/xcprivacy - - abseil/strings/cordz_functions (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/raw_logging_internal - - abseil/profiling/exponential_biased - - abseil/xcprivacy - - abseil/strings/cordz_handle (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/raw_logging_internal - - abseil/synchronization/synchronization - - abseil/xcprivacy - - abseil/strings/cordz_info (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/raw_logging_internal - - abseil/container/inlined_vector - - abseil/debugging/stacktrace - - abseil/strings/cord_internal - - abseil/strings/cordz_functions - - abseil/strings/cordz_handle - - abseil/strings/cordz_statistics - - abseil/strings/cordz_update_tracker - - abseil/synchronization/synchronization - - abseil/time/time - - abseil/types/span - - abseil/xcprivacy - - abseil/strings/cordz_statistics (1.20240116.2): - - abseil/base/config - - abseil/strings/cordz_update_tracker - - abseil/xcprivacy - - abseil/strings/cordz_update_scope (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/strings/cord_internal - - abseil/strings/cordz_info - - abseil/strings/cordz_update_tracker - - abseil/xcprivacy - - abseil/strings/cordz_update_tracker (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/strings/has_ostream_operator (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/strings/internal (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/base/raw_logging_internal - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/strings/str_format (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/nullability - - abseil/strings/str_format_internal - - abseil/strings/string_view - - abseil/types/span - - abseil/xcprivacy - - abseil/strings/str_format_internal (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/container/fixed_array - - abseil/container/inlined_vector - - abseil/functional/function_ref - - abseil/meta/type_traits - - abseil/numeric/bits - - abseil/numeric/int128 - - abseil/numeric/representation - - abseil/strings/strings - - abseil/types/optional - - abseil/types/span - - abseil/utility/utility - - abseil/xcprivacy - - abseil/strings/string_view (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/nullability - - abseil/base/throw_delegate - - abseil/xcprivacy - - abseil/strings/strings (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/base/nullability - - abseil/base/raw_logging_internal - - abseil/base/throw_delegate - - abseil/memory/memory - - abseil/meta/type_traits - - abseil/numeric/bits - - abseil/numeric/int128 - - abseil/strings/charset - - abseil/strings/internal - - abseil/strings/string_view - - abseil/xcprivacy - - abseil/synchronization/graphcycles_internal (1.20240116.2): - - abseil/base/base - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/base/malloc_internal - - abseil/base/raw_logging_internal - - abseil/xcprivacy - - abseil/synchronization/kernel_timeout_internal (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/raw_logging_internal - - abseil/time/time - - abseil/xcprivacy - - abseil/synchronization/synchronization (1.20240116.2): - - abseil/base/atomic_hook - - abseil/base/base - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/base/dynamic_annotations - - abseil/base/malloc_internal - - abseil/base/raw_logging_internal - - abseil/debugging/stacktrace - - abseil/debugging/symbolize - - abseil/synchronization/graphcycles_internal - - abseil/synchronization/kernel_timeout_internal - - abseil/time/time - - abseil/xcprivacy - - abseil/time (1.20240116.2): - - abseil/time/internal (= 1.20240116.2) - - abseil/time/time (= 1.20240116.2) - - abseil/time/internal (1.20240116.2): - - abseil/time/internal/cctz (= 1.20240116.2) - - abseil/time/internal/cctz (1.20240116.2): - - abseil/time/internal/cctz/civil_time (= 1.20240116.2) - - abseil/time/internal/cctz/time_zone (= 1.20240116.2) - - abseil/time/internal/cctz/civil_time (1.20240116.2): - - abseil/base/config - - abseil/xcprivacy - - abseil/time/internal/cctz/time_zone (1.20240116.2): - - abseil/base/config - - abseil/time/internal/cctz/civil_time - - abseil/xcprivacy - - abseil/time/time (1.20240116.2): - - abseil/base/base - - abseil/base/config - - abseil/base/core_headers - - abseil/base/raw_logging_internal - - abseil/numeric/int128 - - abseil/strings/strings - - abseil/time/internal/cctz/civil_time - - abseil/time/internal/cctz/time_zone - - abseil/types/optional - - abseil/xcprivacy - - abseil/types (1.20240116.2): - - abseil/types/any (= 1.20240116.2) - - abseil/types/bad_any_cast (= 1.20240116.2) - - abseil/types/bad_any_cast_impl (= 1.20240116.2) - - abseil/types/bad_optional_access (= 1.20240116.2) - - abseil/types/bad_variant_access (= 1.20240116.2) - - abseil/types/compare (= 1.20240116.2) - - abseil/types/optional (= 1.20240116.2) - - abseil/types/span (= 1.20240116.2) - - abseil/types/variant (= 1.20240116.2) - - abseil/types/any (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/fast_type_id - - abseil/meta/type_traits - - abseil/types/bad_any_cast - - abseil/utility/utility - - abseil/xcprivacy - - abseil/types/bad_any_cast (1.20240116.2): - - abseil/base/config - - abseil/types/bad_any_cast_impl - - abseil/xcprivacy - - abseil/types/bad_any_cast_impl (1.20240116.2): - - abseil/base/config - - abseil/base/raw_logging_internal - - abseil/xcprivacy - - abseil/types/bad_optional_access (1.20240116.2): - - abseil/base/config - - abseil/base/raw_logging_internal - - abseil/xcprivacy - - abseil/types/bad_variant_access (1.20240116.2): - - abseil/base/config - - abseil/base/raw_logging_internal - - abseil/xcprivacy - - abseil/types/compare (1.20240116.2): - - abseil/base/config - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/types/optional (1.20240116.2): - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/base/nullability - - abseil/memory/memory - - abseil/meta/type_traits - - abseil/types/bad_optional_access - - abseil/utility/utility - - abseil/xcprivacy - - abseil/types/span (1.20240116.2): - - abseil/algorithm/algorithm - - abseil/base/core_headers - - abseil/base/nullability - - abseil/base/throw_delegate - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/types/variant (1.20240116.2): - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/types/bad_variant_access - - abseil/utility/utility - - abseil/xcprivacy - - abseil/utility/utility (1.20240116.2): - - abseil/base/base_internal - - abseil/base/config - - abseil/meta/type_traits - - abseil/xcprivacy - - abseil/xcprivacy (1.20240116.2) - - BoringSSL-GRPC (0.0.36): - - BoringSSL-GRPC/Implementation (= 0.0.36) - - BoringSSL-GRPC/Interface (= 0.0.36) - - BoringSSL-GRPC/Implementation (0.0.36): - - BoringSSL-GRPC/Interface (= 0.0.36) - - BoringSSL-GRPC/Interface (0.0.36) - - FirebaseAppCheckInterop (11.7.0) - - FirebaseAuth (11.7.0): - - FirebaseAppCheckInterop (~> 11.0) - - FirebaseAuthInterop (~> 11.0) - - FirebaseCore (~> 11.7.0) - - FirebaseCoreExtension (~> 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/Environment (~> 8.0) - - GTMSessionFetcher/Core (< 5.0, >= 3.4) - - RecaptchaInterop (~> 100.0) - - FirebaseAuthInterop (11.7.0) - - FirebaseAuthUI (14.2.6): - - FirebaseAuth (< 12.0, >= 11.0) - - FirebaseCore - - FirebaseCore (11.7.0): - - FirebaseCoreInternal (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseCoreInternal (11.7.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseEmailAuthUI (14.2.3): - - FirebaseAuth - - FirebaseAuthUI (>= 14.2) - - FirebaseCore - - GoogleUtilities/UserDefaults - - FirebaseFirestore (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseCoreExtension (~> 11.7.0) - - FirebaseFirestoreInternal (= 11.7.0) - - FirebaseSharedSwift (~> 11.0) - - FirebaseFirestoreInternal (11.7.0): - - abseil/algorithm (~> 1.20240116.1) - - abseil/base (~> 1.20240116.1) - - abseil/container/flat_hash_map (~> 1.20240116.1) - - abseil/memory (~> 1.20240116.1) - - abseil/meta (~> 1.20240116.1) - - abseil/strings/strings (~> 1.20240116.1) - - abseil/time (~> 1.20240116.1) - - abseil/types (~> 1.20240116.1) - - FirebaseAppCheckInterop (~> 11.0) - - FirebaseCore (~> 11.7.0) - - "gRPC-C++ (~> 1.65.0)" - - gRPC-Core (~> 1.65.0) - - leveldb-library (~> 1.22) - - nanopb (~> 3.30910.0) - - FirebaseSharedSwift (11.7.0) - - FirebaseUI/Auth (14.2.0): - - FirebaseAuthUI (~> 14.2) - - FirebaseUI/Email (14.2.0): - - FirebaseEmailAuthUI (~> 14.2) - - GoogleUtilities/AppDelegateSwizzler (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.0.2): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.0.2): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Privacy - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.0.2)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/Reachability (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - "gRPC-C++ (1.65.5)": - - "gRPC-C++/Implementation (= 1.65.5)" - - "gRPC-C++/Interface (= 1.65.5)" - - "gRPC-C++/Implementation (1.65.5)": - - abseil/algorithm/container (~> 1.20240116.2) - - abseil/base/base (~> 1.20240116.2) - - abseil/base/config (~> 1.20240116.2) - - abseil/base/core_headers (~> 1.20240116.2) - - abseil/base/log_severity (~> 1.20240116.2) - - abseil/base/no_destructor (~> 1.20240116.2) - - abseil/cleanup/cleanup (~> 1.20240116.2) - - abseil/container/flat_hash_map (~> 1.20240116.2) - - abseil/container/flat_hash_set (~> 1.20240116.2) - - abseil/container/inlined_vector (~> 1.20240116.2) - - abseil/flags/flag (~> 1.20240116.2) - - abseil/flags/marshalling (~> 1.20240116.2) - - abseil/functional/any_invocable (~> 1.20240116.2) - - abseil/functional/bind_front (~> 1.20240116.2) - - abseil/functional/function_ref (~> 1.20240116.2) - - abseil/hash/hash (~> 1.20240116.2) - - abseil/log/absl_check (~> 1.20240116.2) - - abseil/log/absl_log (~> 1.20240116.2) - - abseil/log/check (~> 1.20240116.2) - - abseil/log/globals (~> 1.20240116.2) - - abseil/log/log (~> 1.20240116.2) - - abseil/memory/memory (~> 1.20240116.2) - - abseil/meta/type_traits (~> 1.20240116.2) - - abseil/random/bit_gen_ref (~> 1.20240116.2) - - abseil/random/distributions (~> 1.20240116.2) - - abseil/random/random (~> 1.20240116.2) - - abseil/status/status (~> 1.20240116.2) - - abseil/status/statusor (~> 1.20240116.2) - - abseil/strings/cord (~> 1.20240116.2) - - abseil/strings/str_format (~> 1.20240116.2) - - abseil/strings/strings (~> 1.20240116.2) - - abseil/synchronization/synchronization (~> 1.20240116.2) - - abseil/time/time (~> 1.20240116.2) - - abseil/types/optional (~> 1.20240116.2) - - abseil/types/span (~> 1.20240116.2) - - abseil/types/variant (~> 1.20240116.2) - - abseil/utility/utility (~> 1.20240116.2) - - "gRPC-C++/Interface (= 1.65.5)" - - "gRPC-C++/Privacy (= 1.65.5)" - - gRPC-Core (= 1.65.5) - - "gRPC-C++/Interface (1.65.5)" - - "gRPC-C++/Privacy (1.65.5)" - - gRPC-Core (1.65.5): - - gRPC-Core/Implementation (= 1.65.5) - - gRPC-Core/Interface (= 1.65.5) - - gRPC-Core/Implementation (1.65.5): - - abseil/algorithm/container (~> 1.20240116.2) - - abseil/base/base (~> 1.20240116.2) - - abseil/base/config (~> 1.20240116.2) - - abseil/base/core_headers (~> 1.20240116.2) - - abseil/base/log_severity (~> 1.20240116.2) - - abseil/base/no_destructor (~> 1.20240116.2) - - abseil/cleanup/cleanup (~> 1.20240116.2) - - abseil/container/flat_hash_map (~> 1.20240116.2) - - abseil/container/flat_hash_set (~> 1.20240116.2) - - abseil/container/inlined_vector (~> 1.20240116.2) - - abseil/flags/flag (~> 1.20240116.2) - - abseil/flags/marshalling (~> 1.20240116.2) - - abseil/functional/any_invocable (~> 1.20240116.2) - - abseil/functional/bind_front (~> 1.20240116.2) - - abseil/functional/function_ref (~> 1.20240116.2) - - abseil/hash/hash (~> 1.20240116.2) - - abseil/log/check (~> 1.20240116.2) - - abseil/log/globals (~> 1.20240116.2) - - abseil/log/log (~> 1.20240116.2) - - abseil/memory/memory (~> 1.20240116.2) - - abseil/meta/type_traits (~> 1.20240116.2) - - abseil/random/bit_gen_ref (~> 1.20240116.2) - - abseil/random/distributions (~> 1.20240116.2) - - abseil/random/random (~> 1.20240116.2) - - abseil/status/status (~> 1.20240116.2) - - abseil/status/statusor (~> 1.20240116.2) - - abseil/strings/cord (~> 1.20240116.2) - - abseil/strings/str_format (~> 1.20240116.2) - - abseil/strings/strings (~> 1.20240116.2) - - abseil/synchronization/synchronization (~> 1.20240116.2) - - abseil/time/time (~> 1.20240116.2) - - abseil/types/optional (~> 1.20240116.2) - - abseil/types/span (~> 1.20240116.2) - - abseil/types/variant (~> 1.20240116.2) - - abseil/utility/utility (~> 1.20240116.2) - - BoringSSL-GRPC (= 0.0.36) - - gRPC-Core/Interface (= 1.65.5) - - gRPC-Core/Privacy (= 1.65.5) - - gRPC-Core/Interface (1.65.5) - - gRPC-Core/Privacy (1.65.5) - - GTMSessionFetcher/Core (4.2.0) - - leveldb-library (1.22.6) - - nanopb (3.30910.0): - - nanopb/decode (= 3.30910.0) - - nanopb/encode (= 3.30910.0) - - nanopb/decode (3.30910.0) - - nanopb/encode (3.30910.0) - - RecaptchaInterop (100.0.0) - - SDWebImage (5.20.0): - - SDWebImage/Core (= 5.20.0) - - SDWebImage/Core (5.20.0) - - SDWebImageSwiftUI (2.2.7): - - SDWebImage (~> 5.10) - -DEPENDENCIES: - - FirebaseAuth - - FirebaseFirestore - - FirebaseUI/Auth (~> 14.0) - - FirebaseUI/Email (~> 14.0) - - SDWebImage - - SDWebImageSwiftUI - -SPEC REPOS: - trunk: - - abseil - - BoringSSL-GRPC - - FirebaseAppCheckInterop - - FirebaseAuth - - FirebaseAuthInterop - - FirebaseAuthUI - - FirebaseCore - - FirebaseCoreExtension - - FirebaseCoreInternal - - FirebaseEmailAuthUI - - FirebaseFirestore - - FirebaseFirestoreInternal - - FirebaseSharedSwift - - FirebaseUI - - GoogleUtilities - - "gRPC-C++" - - gRPC-Core - - GTMSessionFetcher - - leveldb-library - - nanopb - - RecaptchaInterop - - SDWebImage - - SDWebImageSwiftUI - -SPEC CHECKSUMS: - abseil: d121da9ef7e2ff4cab7666e76c5a3e0915ae08c3 - BoringSSL-GRPC: ca6a8e5d04812fce8ffd6437810c2d46f925eaeb - FirebaseAppCheckInterop: 2376d3ec5cb4267facad4fe754ab4f301a5a519b - FirebaseAuth: 77e25aa24f3e1c626c5babd3338551fc1669ee0e - FirebaseAuthInterop: a6973d72aa242ea88ffb6be9c9b06c65455071da - FirebaseAuthUI: 8e5c09b20bf11478b9fa42c7ed6575fa95807c86 - FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4 - FirebaseCoreExtension: 206c1b399f0d103055207c16f299b28e3dbd1949 - FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 - FirebaseEmailAuthUI: c448736db9fcd5895d29229a9e0aec016ece0389 - FirebaseFirestore: e8528981558d50872e24119b9448b18e86cab9f6 - FirebaseFirestoreInternal: 953e31e70db09d928b927b65761171c680d2ea9b - FirebaseSharedSwift: a45efd84d60ebbfdcdbaebc66948af3630459e62 - FirebaseUI: 3909853fc34f316c822e195376f144b1b0c6ca15 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - "gRPC-C++": 2fa52b3141e7789a28a737f251e0c45b4cb20a87 - gRPC-Core: a27c294d6149e1c39a7d173527119cfbc3375ce4 - GTMSessionFetcher: 4cb0aa086996858328a1fca61f9bfe81cfdfdfa9 - leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19 - nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 - SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8 - SDWebImageSwiftUI: 65a2c8b4b0d9577f2e11556cb163cc4613b9ee54 - -PODFILE CHECKSUM: dcf06b78bbfb24e317b41df914b88a696d5c1794 - -COCOAPODS: 1.16.2 From a0dd61d4197ab04e3019d5b1594823a96d5035c7 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Wed, 22 Jan 2025 14:26:40 -0800 Subject: [PATCH 08/56] update package version --- .../FunctionsExample/FunctionsExample.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/FunctionsExample/FunctionsExample.xcodeproj/project.pbxproj b/functions/FunctionsExample/FunctionsExample.xcodeproj/project.pbxproj index 3409e3fb7..7647eb9a6 100644 --- a/functions/FunctionsExample/FunctionsExample.xcodeproj/project.pbxproj +++ b/functions/FunctionsExample/FunctionsExample.xcodeproj/project.pbxproj @@ -720,7 +720,7 @@ repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 10.0.0; + minimumVersion = 11.0.0; }; }; /* End XCRemoteSwiftPackageReference section */ From af5b0c87e0e896ca14f3c29d79ec5c6b69f41c51 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Wed, 22 Jan 2025 14:38:17 -0800 Subject: [PATCH 09/56] migrate to spm and remove fdl --- .../project.pbxproj | 66 ++++++++- .../InAppMessagingExample/AppDelegate.m | 35 ----- .../AppDelegate.swift | 31 ----- inappmessaging/Podfile | 28 ---- inappmessaging/Podfile.lock | 130 ------------------ 5 files changed, 60 insertions(+), 230 deletions(-) delete mode 100644 inappmessaging/Podfile delete mode 100644 inappmessaging/Podfile.lock diff --git a/inappmessaging/InAppMessagingExample.xcodeproj/project.pbxproj b/inappmessaging/InAppMessagingExample.xcodeproj/project.pbxproj index d08c61d24..faaf13bef 100644 --- a/inappmessaging/InAppMessagingExample.xcodeproj/project.pbxproj +++ b/inappmessaging/InAppMessagingExample.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -16,6 +16,10 @@ 8DB25F9420BE0C29000ABEE2 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DB25F9220BE0C29000ABEE2 /* Main.storyboard */; }; 8DB25F9620BE0C2A000ABEE2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8DB25F9520BE0C2A000ABEE2 /* Assets.xcassets */; }; 8DB25F9920BE0C2A000ABEE2 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DB25F9720BE0C2A000ABEE2 /* LaunchScreen.storyboard */; }; + 8DC73D7A2D41A90B0092B6EE /* FirebaseInAppMessaging-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D792D41A90B0092B6EE /* FirebaseInAppMessaging-Beta */; }; + 8DC73D7C2D41A9130092B6EE /* FirebaseInAppMessaging-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D7B2D41A9130092B6EE /* FirebaseInAppMessaging-Beta */; }; + 8DC73D7E2D41AA540092B6EE /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D7D2D41AA540092B6EE /* FirebaseAnalytics */; }; + 8DC73D802D41AA5A0092B6EE /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D7F2D41AA5A0092B6EE /* FirebaseAnalytics */; }; 8DECFE4E211CC14500DC99BD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECFE4D211CC14500DC99BD /* AppDelegate.m */; }; 8DECFE51211CC14600DC99BD /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECFE50211CC14600DC99BD /* ViewController.m */; }; 8DECFE54211CC14600DC99BD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DECFE52211CC14600DC99BD /* Main.storyboard */; }; @@ -99,6 +103,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8DC73D7E2D41AA540092B6EE /* FirebaseAnalytics in Frameworks */, + 8DC73D7A2D41A90B0092B6EE /* FirebaseInAppMessaging-Beta in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -106,6 +112,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8DC73D802D41AA5A0092B6EE /* FirebaseAnalytics in Frameworks */, + 8DC73D7C2D41A9130092B6EE /* FirebaseInAppMessaging-Beta in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -151,6 +159,7 @@ 8DECFE8F211CC16F00DC99BD /* InAppMessagingExampleSwiftUITests */, 8DB25F8C20BE0C29000ABEE2 /* Products */, 81A2FB070295F56CC0B2D523 /* GoogleService-Info.plist */, + 8DC73D782D41A90B0092B6EE /* Frameworks */, ); sourceTree = ""; }; @@ -180,6 +189,13 @@ path = InAppMessagingExampleSwift; sourceTree = ""; }; + 8DC73D782D41A90B0092B6EE /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; 8DECFE4B211CC14500DC99BD /* InAppMessagingExample */ = { isa = PBXGroup; children = ( @@ -347,8 +363,9 @@ 8DB25F8320BE0C29000ABEE2 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 0930; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1610; ORGANIZATIONNAME = Firebase; TargetAttributes = { 8DB25F8A20BE0C29000ABEE2 = { @@ -385,6 +402,9 @@ Base, ); mainGroup = 8DB25F8220BE0C29000ABEE2; + packageReferences = ( + 8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + ); productRefGroup = 8DB25F8C20BE0C29000ABEE2 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -595,6 +615,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -606,6 +627,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -655,6 +677,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -666,6 +689,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -828,7 +852,6 @@ 8DECFE88211CC15F00DC99BD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = InAppMessagingExampleSwiftTests/Info.plist; @@ -848,7 +871,6 @@ 8DECFE89211CC15F00DC99BD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = InAppMessagingExampleSwiftTests/Info.plist; @@ -868,7 +890,6 @@ 8DECFE96211CC16F00DC99BD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = InAppMessagingExampleSwiftUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -887,7 +908,6 @@ 8DECFE97211CC16F00DC99BD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = InAppMessagingExampleSwiftUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -970,6 +990,40 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 11.7.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 8DC73D792D41A90B0092B6EE /* FirebaseInAppMessaging-Beta */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseInAppMessaging-Beta"; + }; + 8DC73D7B2D41A9130092B6EE /* FirebaseInAppMessaging-Beta */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseInAppMessaging-Beta"; + }; + 8DC73D7D2D41AA540092B6EE /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; + 8DC73D7F2D41AA5A0092B6EE /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 8DB25F8320BE0C29000ABEE2 /* Project object */; } diff --git a/inappmessaging/InAppMessagingExample/AppDelegate.m b/inappmessaging/InAppMessagingExample/AppDelegate.m index c416fb13a..25625d51c 100644 --- a/inappmessaging/InAppMessagingExample/AppDelegate.m +++ b/inappmessaging/InAppMessagingExample/AppDelegate.m @@ -16,7 +16,6 @@ @import FirebaseCore; @import FirebaseInAppMessaging; -@import FirebaseDynamicLinks; @interface AppDelegate () @@ -29,42 +28,8 @@ - (BOOL)application:(UIApplication *)application // Uncomment the following line to disable In-App Messaging auto-startup. // [FIRInAppMessaging inAppMessaging].automaticDataCollectionEnabled = NO; - [FIROptions defaultOptions].deepLinkURLScheme = @"com.google.InAppMessagingExampleiOS"; [FIRApp configure]; return YES; } -- (BOOL)application:(UIApplication *)app - openURL:(NSURL *)url - options:(NSDictionary *)options { - return [self application:app - openURL:url - sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey] - annotation:options[UIApplicationOpenURLOptionsAnnotationKey]]; -} - -- (BOOL)application:(UIApplication *)application - openURL:(NSURL *)url - sourceApplication:(NSString *)sourceApplication - annotation:(id)annotation { - FIRDynamicLink *dynamicLink = [[FIRDynamicLinks dynamicLinks] dynamicLinkFromCustomSchemeURL:url]; - - NSLog(@"called here with %@", dynamicLink); - if (dynamicLink) { - if (dynamicLink.url) { - // Handle the deep link. For example, show the deep-linked content, - // apply a promotional offer to the user's account or show customized onboarding view. - // ... - - } else { - // Dynamic link has empty deep link. This situation will happens if - // Firebase Dynamic Links iOS SDK tried to retrieve pending dynamic link, - // but pending link is not available for this device/App combination. - // At this point you may display default onboarding view. - } - return YES; - } - return NO; -} - @end diff --git a/inappmessaging/InAppMessagingExampleSwift/AppDelegate.swift b/inappmessaging/InAppMessagingExampleSwift/AppDelegate.swift index 9b556de38..72983d8b8 100644 --- a/inappmessaging/InAppMessagingExampleSwift/AppDelegate.swift +++ b/inappmessaging/InAppMessagingExampleSwift/AppDelegate.swift @@ -18,7 +18,6 @@ import UIKit import FirebaseCore import FirebaseInAppMessaging -import FirebaseDynamicLinks @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate { @@ -30,39 +29,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate { // Uncomment the following line to disable In-App Messaging auto-startup. // InAppMessaging.inAppMessaging().automaticDataCollectionEnabled = false - FirebaseOptions.defaultOptions()?.deepLinkURLScheme = "com.google.InAppMessagingExampleSwiftiOS" FirebaseApp.configure() return true } - func application(_ app: UIApplication, - open url: URL, - options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool { - return application(app, - open: url, - sourceApplication: options[.sourceApplication] as? String, - annotation: options[.annotation] as Any) - } - - func application(_ application: UIApplication, - open url: URL, - sourceApplication: String?, - annotation: Any) -> Bool { - let dynamicLink = DynamicLinks.dynamicLinks().dynamicLink(fromCustomSchemeURL: url) - if dynamicLink != nil { - if dynamicLink?.url != nil { - // Handle the deep link. For example, show the deep-linked content, - // apply a promotional offer to the user's account or show customized onboarding view. - // ... - } else { - // Dynamic link has empty deep link. This situation will happens if - // Firebase Dynamic Links iOS SDK tried to retrieve pending dynamic link, - // but pending link is not available for this device/App combination. - // At this point you may display default onboarding view. - } - return true - } - return false - } } diff --git a/inappmessaging/Podfile b/inappmessaging/Podfile deleted file mode 100644 index 63416ab7b..000000000 --- a/inappmessaging/Podfile +++ /dev/null @@ -1,28 +0,0 @@ -# Uncomment the next line to define a global platform for your project -platform :ios, '13.0' - -use_frameworks! - -target 'InAppMessagingExample' do - pod 'FirebaseAnalytics' - pod 'FirebaseInAppMessaging', "> 8.11-beta" - pod 'FirebaseDynamicLinks' - - target 'InAppMessagingExampleTests' do - end - - target 'InAppMessagingExampleUITests' do - end -end - -target 'InAppMessagingExampleSwift' do - pod 'FirebaseAnalytics' - pod 'FirebaseInAppMessaging', "> 8.11-beta" - pod 'FirebaseDynamicLinks' - - target 'InAppMessagingExampleSwiftTests' do - end - - target 'InAppMessagingExampleSwiftUITests' do - end -end diff --git a/inappmessaging/Podfile.lock b/inappmessaging/Podfile.lock deleted file mode 100644 index a8f96f886..000000000 --- a/inappmessaging/Podfile.lock +++ /dev/null @@ -1,130 +0,0 @@ -PODS: - - FirebaseABTesting (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseAnalytics (11.7.0): - - FirebaseAnalytics/AdIdSupport (= 11.7.0) - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseCore (11.7.0): - - FirebaseCoreInternal (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreInternal (11.7.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseDynamicLinks (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseInAppMessaging (11.7.0-beta): - - FirebaseABTesting (~> 11.0) - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - nanopb (~> 3.30910.0) - - FirebaseInstallations (11.7.0): - - FirebaseCore (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - PromisesObjC (~> 2.4) - - GoogleAppMeasurement (11.7.0): - - GoogleAppMeasurement/AdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.7.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.7.0): - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleUtilities/AppDelegateSwizzler (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.0.2): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/MethodSwizzler (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.0.2): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Privacy - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.0.2)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/Reachability (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - nanopb (3.30910.0): - - nanopb/decode (= 3.30910.0) - - nanopb/encode (= 3.30910.0) - - nanopb/decode (3.30910.0) - - nanopb/encode (3.30910.0) - - PromisesObjC (2.4.0) - -DEPENDENCIES: - - FirebaseAnalytics - - FirebaseDynamicLinks - - FirebaseInAppMessaging (> 8.11-beta) - -SPEC REPOS: - trunk: - - FirebaseABTesting - - FirebaseAnalytics - - FirebaseCore - - FirebaseCoreInternal - - FirebaseDynamicLinks - - FirebaseInAppMessaging - - FirebaseInstallations - - GoogleAppMeasurement - - GoogleUtilities - - nanopb - - PromisesObjC - -SPEC CHECKSUMS: - FirebaseABTesting: 08b3e19b28504632a9cd03e7a796b355c5d39b27 - FirebaseAnalytics: bc9e565af9044ba8d6c6e4157e4edca8e5fdf7ec - FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4 - FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 - FirebaseDynamicLinks: e81e03f6076bd02081ae6e06631797e134380a76 - FirebaseInAppMessaging: f8a9fd60f71bf98cd098c7ee347846251ab1d1bc - FirebaseInstallations: 9347e719c3d52d8d7b9074b2c32407dd027305e9 - GoogleAppMeasurement: 0471a5b5bff51f3a91b1e76df22c952d04c63967 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - -PODFILE CHECKSUM: ba8b289ec40d7655e30a711caf4739beade873c8 - -COCOAPODS: 1.16.2 From 2b72b65a8a1ee35f2476839d285ca1df8287864f Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Wed, 22 Jan 2025 14:46:41 -0800 Subject: [PATCH 10/56] migrate installations to spm and remove todos --- .../project.pbxproj | 58 +++++++++++++++---- .../InstallationsExample/AppDelegate.m | 2 - .../InstallationsExample/ViewController.m | 4 -- installations/Podfile | 10 ---- installations/Podfile.lock | 46 --------------- 5 files changed, 46 insertions(+), 74 deletions(-) delete mode 100644 installations/Podfile delete mode 100644 installations/Podfile.lock diff --git a/installations/InstallationsExample.xcodeproj/project.pbxproj b/installations/InstallationsExample.xcodeproj/project.pbxproj index b99173485..b4628b804 100644 --- a/installations/InstallationsExample.xcodeproj/project.pbxproj +++ b/installations/InstallationsExample.xcodeproj/project.pbxproj @@ -3,12 +3,14 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ 1D96FE8F5661BCC40ADE48D3 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */; }; 7AB7C66CB639531B714014CA /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */; }; + 8DC73D842D41ABC00092B6EE /* FirebaseInstallations in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D832D41ABC00092B6EE /* FirebaseInstallations */; }; + 8DC73D862D41ACB30092B6EE /* FirebaseInstallations in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D852D41ACB30092B6EE /* FirebaseInstallations */; }; 9A0A6EE922CE55B2004CF0FF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A0A6EE822CE55B2004CF0FF /* AppDelegate.swift */; }; 9A0A6EEB22CE55B2004CF0FF /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A0A6EEA22CE55B2004CF0FF /* ViewController.swift */; }; 9A0A6EEE22CE55B2004CF0FF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9A0A6EEC22CE55B2004CF0FF /* Main.storyboard */; }; @@ -73,6 +75,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8DC73D842D41ABC00092B6EE /* FirebaseInstallations in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -80,6 +83,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8DC73D862D41ACB30092B6EE /* FirebaseInstallations in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -100,6 +104,13 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 8DC73D822D41ABC00092B6EE /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; 9A0A6EDC22CE55B2004CF0FF = { isa = PBXGroup; children = ( @@ -109,8 +120,8 @@ 9A76AE2F22E20A0C0024E473 /* InstallationsExampleSwiftTests */, 9A76AE3D22E20A240024E473 /* InstallationsExampleTests */, 9A0A6EE622CE55B2004CF0FF /* Products */, - F47D9EFBA47214D7699A8C26 /* Pods */, AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */, + 8DC73D822D41ABC00092B6EE /* Frameworks */, ); sourceTree = ""; }; @@ -178,13 +189,6 @@ path = InstallationsExampleTests; sourceTree = ""; }; - F47D9EFBA47214D7699A8C26 /* Pods */ = { - isa = PBXGroup; - children = ( - ); - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -264,8 +268,9 @@ 9A0A6EDD22CE55B2004CF0FF /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1020; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1610; ORGANIZATIONNAME = "Google Inc."; TargetAttributes = { 9A0A6EE422CE55B2004CF0FF = { @@ -294,6 +299,9 @@ Base, ); mainGroup = 9A0A6EDC22CE55B2004CF0FF; + packageReferences = ( + 8DC73D812D41ABB70092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + ); productRefGroup = 9A0A6EE622CE55B2004CF0FF /* Products */; projectDirPath = ""; projectRoot = ""; @@ -444,6 +452,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -455,6 +464,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -505,6 +515,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -516,6 +527,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -603,7 +615,6 @@ 9A76AE3522E20A0C0024E473 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = InstallationsExampleSwiftTests/Info.plist; @@ -622,7 +633,6 @@ 9A76AE3622E20A0C0024E473 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = InstallationsExampleSwiftTests/Info.plist; @@ -723,6 +733,30 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 8DC73D812D41ABB70092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 11.7.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 8DC73D832D41ABC00092B6EE /* FirebaseInstallations */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D812D41ABB70092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseInstallations; + }; + 8DC73D852D41ACB30092B6EE /* FirebaseInstallations */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D812D41ABB70092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseInstallations; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 9A0A6EDD22CE55B2004CF0FF /* Project object */; } diff --git a/installations/InstallationsExample/AppDelegate.m b/installations/InstallationsExample/AppDelegate.m index f93418379..69b470970 100644 --- a/installations/InstallationsExample/AppDelegate.m +++ b/installations/InstallationsExample/AppDelegate.m @@ -16,8 +16,6 @@ #import "AppDelegate.h" -// TODO: Remove once FirebaseInstallations has released. -#import @import FirebaseCore; @interface AppDelegate () diff --git a/installations/InstallationsExample/ViewController.m b/installations/InstallationsExample/ViewController.m index 605c58732..f35d8079b 100644 --- a/installations/InstallationsExample/ViewController.m +++ b/installations/InstallationsExample/ViewController.m @@ -16,10 +16,6 @@ #import "ViewController.h" -// TODO(M61): Remove once `Firebase/Installations` released. -#import -#import - @import FirebaseInstallations; @interface ViewController () diff --git a/installations/Podfile b/installations/Podfile deleted file mode 100644 index 55a734bc8..000000000 --- a/installations/Podfile +++ /dev/null @@ -1,10 +0,0 @@ -platform :ios, '13.0' -use_frameworks! - -pod 'FirebaseInstallations' - -target 'InstallationsExample' do -end - -target 'InstallationsExampleSwift' do -end diff --git a/installations/Podfile.lock b/installations/Podfile.lock deleted file mode 100644 index 6e6e0f4c1..000000000 --- a/installations/Podfile.lock +++ /dev/null @@ -1,46 +0,0 @@ -PODS: - - FirebaseCore (11.7.0): - - FirebaseCoreInternal (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreInternal (11.7.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.7.0): - - FirebaseCore (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - PromisesObjC (~> 2.4) - - GoogleUtilities/Environment (8.0.2): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - "GoogleUtilities/NSData+zlib (8.0.2)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/UserDefaults (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - PromisesObjC (2.4.0) - -DEPENDENCIES: - - FirebaseInstallations - -SPEC REPOS: - trunk: - - FirebaseCore - - FirebaseCoreInternal - - FirebaseInstallations - - GoogleUtilities - - PromisesObjC - -SPEC CHECKSUMS: - FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4 - FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 - FirebaseInstallations: 9347e719c3d52d8d7b9074b2c32407dd027305e9 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - -PODFILE CHECKSUM: 548b8cba05a34b1910a469d6754ac289b364aed4 - -COCOAPODS: 1.16.2 From 6d27fcb2d8341d7ead64e11eca8f6c3b0baeb2ea Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Wed, 22 Jan 2025 14:57:53 -0800 Subject: [PATCH 11/56] migrate messaging to spm --- .../project.pbxproj | 110 +++++++++++++-- .../xcschemes/MessagingExample.xcscheme | 2 +- .../xcschemes/MessagingExampleSwift.xcscheme | 2 +- messaging/Podfile | 19 --- messaging/Podfile.lock | 128 ------------------ 5 files changed, 98 insertions(+), 163 deletions(-) delete mode 100644 messaging/Podfile delete mode 100644 messaging/Podfile.lock diff --git a/messaging/MessagingExample.xcodeproj/project.pbxproj b/messaging/MessagingExample.xcodeproj/project.pbxproj index e62fd5a65..6d518e5c9 100644 --- a/messaging/MessagingExample.xcodeproj/project.pbxproj +++ b/messaging/MessagingExample.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -22,6 +22,8 @@ 5F99610C1AE0CF4F0034F503 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5F9961071AE0CF4F0034F503 /* LaunchScreen.xib */; }; 5F99610D1AE0CF4F0034F503 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5F9961071AE0CF4F0034F503 /* LaunchScreen.xib */; }; 5FDE055D1B0DAA090037B82F /* AppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FDE055C1B0DAA090037B82F /* AppTests.m */; }; + 8DC73D8A2D41AE7E0092B6EE /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D892D41AE7E0092B6EE /* FirebaseMessaging */; }; + 8DC73D8C2D41AE850092B6EE /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D8B2D41AE850092B6EE /* FirebaseMessaging */; }; 978E6F2CAAC2AD673D158985 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 82E79B6D15A982EAE7B0E31B /* GoogleService-Info.plist */; }; 9EC3C1193ECE4B761399CA62 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 82E79B6D15A982EAE7B0E31B /* GoogleService-Info.plist */; }; A2448B9D9232B1BAEE1CA86B /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 82E79B6D15A982EAE7B0E31B /* GoogleService-Info.plist */; }; @@ -105,6 +107,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8DC73D8A2D41AE7E0092B6EE /* FirebaseMessaging in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -112,6 +115,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8DC73D8C2D41AE850092B6EE /* FirebaseMessaging in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -155,6 +159,7 @@ 5F5A534D1ADE670C00F81DF0 /* Products */, 5F9961041AE0CF4F0034F503 /* Shared */, 82E79B6D15A982EAE7B0E31B /* GoogleService-Info.plist */, + 8DC73D882D41AE7E0092B6EE /* Frameworks */, ); sourceTree = ""; wrapsLines = 0; @@ -222,6 +227,13 @@ path = MessagingExampleTests; sourceTree = ""; }; + 8DC73D882D41AE7E0092B6EE /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; DEB13BC423AEC9DF0066A6F3 /* TestUtils */ = { isa = PBXGroup; children = ( @@ -332,8 +344,9 @@ 5F5A53441ADE670C00F81DF0 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1610; ORGANIZATIONNAME = "Google Inc."; TargetAttributes = { 107347A720315A3A004A66D1 = { @@ -386,6 +399,9 @@ Base, ); mainGroup = 5F5A53431ADE670C00F81DF0; + packageReferences = ( + 8DC73D872D41ADE00092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + ); productRefGroup = 5F5A534D1ADE670C00F81DF0 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -540,7 +556,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MessagingExampleSwiftUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleSwiftUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -566,7 +586,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MessagingExampleSwiftUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleSwiftUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; @@ -590,7 +614,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MessagingExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -613,7 +641,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MessagingExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -644,6 +676,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -654,6 +687,7 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -701,6 +735,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -711,6 +746,7 @@ ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -722,7 +758,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -739,7 +776,10 @@ DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = MessagingExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -757,7 +797,10 @@ DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = MessagingExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -774,7 +817,10 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = MessagingExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExample; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; @@ -792,10 +838,14 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = MessagingExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 5.0; }; @@ -811,7 +861,11 @@ "$(inherited)", ); INFOPLIST_FILE = MessagingExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MessagingExample.app/MessagingExample"; @@ -825,7 +879,11 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; INFOPLIST_FILE = MessagingExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MessagingExample.app/MessagingExample"; @@ -890,6 +948,30 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 8DC73D872D41ADE00092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 11.7.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 8DC73D892D41AE7E0092B6EE /* FirebaseMessaging */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D872D41ADE00092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseMessaging; + }; + 8DC73D8B2D41AE850092B6EE /* FirebaseMessaging */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D872D41ADE00092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseMessaging; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 5F5A53441ADE670C00F81DF0 /* Project object */; } diff --git a/messaging/MessagingExample.xcodeproj/xcshareddata/xcschemes/MessagingExample.xcscheme b/messaging/MessagingExample.xcodeproj/xcshareddata/xcschemes/MessagingExample.xcscheme index 5c49dc3f4..015661e7d 100644 --- a/messaging/MessagingExample.xcodeproj/xcshareddata/xcschemes/MessagingExample.xcscheme +++ b/messaging/MessagingExample.xcodeproj/xcshareddata/xcschemes/MessagingExample.xcscheme @@ -1,6 +1,6 @@ 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseCore (11.7.0): - - FirebaseCoreInternal (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreInternal (11.7.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.7.0): - - FirebaseCore (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - PromisesObjC (~> 2.4) - - FirebaseMessaging (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleDataTransport (~> 10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Reachability (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement (11.7.0): - - GoogleAppMeasurement/AdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.7.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.7.0): - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleDataTransport (10.1.0): - - nanopb (~> 3.30910.0) - - PromisesObjC (~> 2.4) - - GoogleUtilities/AppDelegateSwizzler (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.0.2): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/MethodSwizzler (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.0.2): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Privacy - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.0.2)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/Reachability (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - nanopb (3.30910.0): - - nanopb/decode (= 3.30910.0) - - nanopb/encode (= 3.30910.0) - - nanopb/decode (3.30910.0) - - nanopb/encode (3.30910.0) - - PromisesObjC (2.4.0) - -DEPENDENCIES: - - FirebaseAnalytics - - FirebaseMessaging - -SPEC REPOS: - trunk: - - FirebaseAnalytics - - FirebaseCore - - FirebaseCoreInternal - - FirebaseInstallations - - FirebaseMessaging - - GoogleAppMeasurement - - GoogleDataTransport - - GoogleUtilities - - nanopb - - PromisesObjC - -SPEC CHECKSUMS: - FirebaseAnalytics: bc9e565af9044ba8d6c6e4157e4edca8e5fdf7ec - FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4 - FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 - FirebaseInstallations: 9347e719c3d52d8d7b9074b2c32407dd027305e9 - FirebaseMessaging: 00ece041b71ddb52a2862ffdee73fb6e9824bd0c - GoogleAppMeasurement: 0471a5b5bff51f3a91b1e76df22c952d04c63967 - GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - -PODFILE CHECKSUM: 3bb9ae3f0c7a1b759c7fe7e43e99a5d4b0348ba0 - -COCOAPODS: 1.16.2 From 30a39346f74d7c0704e8c99699d8adf752470d22 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Wed, 22 Jan 2025 15:05:05 -0800 Subject: [PATCH 12/56] move perf to spm --- .../project.pbxproj | 124 +++++++++++-- performance/Podfile | 13 -- performance/Podfile.lock | 168 ------------------ 3 files changed, 110 insertions(+), 195 deletions(-) delete mode 100644 performance/Podfile delete mode 100644 performance/Podfile.lock diff --git a/performance/PerformanceExample.xcodeproj/project.pbxproj b/performance/PerformanceExample.xcodeproj/project.pbxproj index 8790b96f9..7b38f22cc 100644 --- a/performance/PerformanceExample.xcodeproj/project.pbxproj +++ b/performance/PerformanceExample.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -24,6 +24,10 @@ 5FDE055D1B0DAA090037B82F /* AppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FDE055C1B0DAA090037B82F /* AppTests.m */; }; 72597C97199D485A8666B65A /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 664D51F1D2849F1D6A5F39A3 /* GoogleService-Info.plist */; }; 7FBD5A73CBE80CA855DA8E22 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 664D51F1D2849F1D6A5F39A3 /* GoogleService-Info.plist */; }; + 8DC73D902D41B0430092B6EE /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D8F2D41B0430092B6EE /* FirebaseAnalytics */; }; + 8DC73D922D41B0430092B6EE /* FirebasePerformance in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D912D41B0430092B6EE /* FirebasePerformance */; }; + 8DC73D942D41B04B0092B6EE /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D932D41B04B0092B6EE /* FirebaseAnalytics */; }; + 8DC73D962D41B04B0092B6EE /* FirebasePerformance in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D952D41B04B0092B6EE /* FirebasePerformance */; }; A4ADF9F8B0B185014DA28C21 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 664D51F1D2849F1D6A5F39A3 /* GoogleService-Info.plist */; }; B3E22BC95F7192FC5242CC68 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 664D51F1D2849F1D6A5F39A3 /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ @@ -96,6 +100,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8DC73D922D41B0430092B6EE /* FirebasePerformance in Frameworks */, + 8DC73D902D41B0430092B6EE /* FirebaseAnalytics in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,6 +109,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8DC73D962D41B04B0092B6EE /* FirebasePerformance in Frameworks */, + 8DC73D942D41B04B0092B6EE /* FirebaseAnalytics in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -145,6 +153,7 @@ 5F5A534D1ADE670C00F81DF0 /* Products */, 5F9961041AE0CF4F0034F503 /* Shared */, 664D51F1D2849F1D6A5F39A3 /* GoogleService-Info.plist */, + 8DC73D8E2D41B0430092B6EE /* Frameworks */, ); sourceTree = ""; wrapsLines = 0; @@ -210,6 +219,13 @@ path = PerformanceExampleTests; sourceTree = ""; }; + 8DC73D8E2D41B0430092B6EE /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -307,8 +323,9 @@ 5F5A53441ADE670C00F81DF0 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1610; ORGANIZATIONNAME = "Google Inc."; TargetAttributes = { 107347C320315A61004A66D1 = { @@ -349,6 +366,9 @@ Base, ); mainGroup = 5F5A53431ADE670C00F81DF0; + packageReferences = ( + 8DC73D8D2D41B01F0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + ); productRefGroup = 5F5A534D1ADE670C00F81DF0 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -501,7 +521,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = PerformanceExampleSwiftUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.PerformanceExampleSwiftUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -527,7 +551,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = PerformanceExampleSwiftUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.PerformanceExampleSwiftUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -551,7 +579,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = PerformanceExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.PerformanceExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -574,7 +606,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = PerformanceExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.PerformanceExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -605,6 +641,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -615,6 +652,7 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -662,6 +700,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -672,6 +711,7 @@ ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -683,7 +723,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -698,7 +739,10 @@ DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = "$(SRCROOT)/PerformanceExample/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.PerformanceExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -714,7 +758,10 @@ DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = "$(SRCROOT)/PerformanceExample/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.PerformanceExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -729,7 +776,10 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/PerformanceExample/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.PerformanceExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -747,12 +797,16 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/PerformanceExample/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.PerformanceExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OBJC_BRIDGING_HEADER = ""; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; }; @@ -779,7 +833,11 @@ PerformanceExample, ); INFOPLIST_FILE = PerformanceExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PerformanceExample.app/PerformanceExample"; @@ -804,7 +862,11 @@ PerformanceExample, ); INFOPLIST_FILE = PerformanceExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PerformanceExample.app/PerformanceExample"; @@ -869,6 +931,40 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 8DC73D8D2D41B01F0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 11.7.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 8DC73D8F2D41B0430092B6EE /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D8D2D41B01F0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; + 8DC73D912D41B0430092B6EE /* FirebasePerformance */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D8D2D41B01F0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebasePerformance; + }; + 8DC73D932D41B04B0092B6EE /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D8D2D41B01F0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; + 8DC73D952D41B04B0092B6EE /* FirebasePerformance */ = { + isa = XCSwiftPackageProductDependency; + package = 8DC73D8D2D41B01F0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebasePerformance; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 5F5A53441ADE670C00F81DF0 /* Project object */; } diff --git a/performance/Podfile b/performance/Podfile deleted file mode 100644 index ba12d89ac..000000000 --- a/performance/Podfile +++ /dev/null @@ -1,13 +0,0 @@ -# PerformanceExample -use_frameworks! -platform :ios, '13.0' - -pod 'FirebaseAnalytics' -pod 'FirebasePerformance' - -target 'PerformanceExample' do -end -target 'PerformanceExampleSwift' do -end -target 'PerformanceExampleTests' do -end diff --git a/performance/Podfile.lock b/performance/Podfile.lock deleted file mode 100644 index c9026a931..000000000 --- a/performance/Podfile.lock +++ /dev/null @@ -1,168 +0,0 @@ -PODS: - - FirebaseABTesting (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseAnalytics (11.7.0): - - FirebaseAnalytics/AdIdSupport (= 11.7.0) - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseCore (11.7.0): - - FirebaseCoreInternal (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseCoreInternal (11.7.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.7.0): - - FirebaseCore (~> 11.7.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - PromisesObjC (~> 2.4) - - FirebasePerformance (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - FirebaseRemoteConfig (~> 11.0) - - FirebaseSessions (~> 11.0) - - GoogleDataTransport (~> 10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - nanopb (~> 3.30910.0) - - FirebaseRemoteConfig (11.7.0): - - FirebaseABTesting (~> 11.0) - - FirebaseCore (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - FirebaseRemoteConfigInterop (~> 11.0) - - FirebaseSharedSwift (~> 11.0) - - GoogleUtilities/Environment (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseRemoteConfigInterop (11.7.0) - - FirebaseSessions (11.7.0): - - FirebaseCore (~> 11.7.0) - - FirebaseCoreExtension (~> 11.7.0) - - FirebaseInstallations (~> 11.0) - - GoogleDataTransport (~> 10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - nanopb (~> 3.30910.0) - - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (11.7.0) - - GoogleAppMeasurement (11.7.0): - - GoogleAppMeasurement/AdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.7.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.7.0): - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleDataTransport (10.1.0): - - nanopb (~> 3.30910.0) - - PromisesObjC (~> 2.4) - - GoogleUtilities/AppDelegateSwizzler (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.0.2): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/MethodSwizzler (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.0.2): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Privacy - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.0.2)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/Reachability (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - nanopb (3.30910.0): - - nanopb/decode (= 3.30910.0) - - nanopb/encode (= 3.30910.0) - - nanopb/decode (3.30910.0) - - nanopb/encode (3.30910.0) - - PromisesObjC (2.4.0) - - PromisesSwift (2.4.0): - - PromisesObjC (= 2.4.0) - -DEPENDENCIES: - - FirebaseAnalytics - - FirebasePerformance - -SPEC REPOS: - trunk: - - FirebaseABTesting - - FirebaseAnalytics - - FirebaseCore - - FirebaseCoreExtension - - FirebaseCoreInternal - - FirebaseInstallations - - FirebasePerformance - - FirebaseRemoteConfig - - FirebaseRemoteConfigInterop - - FirebaseSessions - - FirebaseSharedSwift - - GoogleAppMeasurement - - GoogleDataTransport - - GoogleUtilities - - nanopb - - PromisesObjC - - PromisesSwift - -SPEC CHECKSUMS: - FirebaseABTesting: 08b3e19b28504632a9cd03e7a796b355c5d39b27 - FirebaseAnalytics: bc9e565af9044ba8d6c6e4157e4edca8e5fdf7ec - FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4 - FirebaseCoreExtension: 206c1b399f0d103055207c16f299b28e3dbd1949 - FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 - FirebaseInstallations: 9347e719c3d52d8d7b9074b2c32407dd027305e9 - FirebasePerformance: 0c6fe140f24967b09a59c40c5ad54a623b740ad8 - FirebaseRemoteConfig: aa1d4cb05ef4caad203448dfc87842de12f1ea8d - FirebaseRemoteConfigInterop: ca12abf9da0003efd3a476b2dff4f7a04fd31b4f - FirebaseSessions: 32ed7a9387ae71efe3a35a7f20f3a7292950957b - FirebaseSharedSwift: a45efd84d60ebbfdcdbaebc66948af3630459e62 - GoogleAppMeasurement: 0471a5b5bff51f3a91b1e76df22c952d04c63967 - GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 - -PODFILE CHECKSUM: 85868bde58b4dc0f0430324c4f4f52355989646b - -COCOAPODS: 1.16.2 From a7b7e8e0712117132af24dc2e8593faff532dfb8 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Wed, 22 Jan 2025 15:16:04 -0800 Subject: [PATCH 13/56] update firebase version --- .../StorageExample.xcodeproj/project.pbxproj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/storage/StorageExample/StorageExample.xcodeproj/project.pbxproj b/storage/StorageExample/StorageExample.xcodeproj/project.pbxproj index eb6b98ba3..d2915a199 100644 --- a/storage/StorageExample/StorageExample.xcodeproj/project.pbxproj +++ b/storage/StorageExample/StorageExample.xcodeproj/project.pbxproj @@ -252,7 +252,7 @@ attributes = { BuildIndependentTargetsInParallel = 1; LastSwiftUpdateCheck = 1330; - LastUpgradeCheck = 1330; + LastUpgradeCheck = 1610; TargetAttributes = { B94D0ABB27F5060C00753EEA = { CreatedOnToolsVersion = 13.3; @@ -368,6 +368,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"StorageExample (macOS)/Preview Content\""; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -395,6 +396,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"StorageExample (macOS)/Preview Content\""; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -449,6 +451,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -509,6 +512,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -695,7 +699,7 @@ repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 10.0.0; + minimumVersion = 11.0.0; }; }; /* End XCRemoteSwiftPackageReference section */ From 1df0e6e49c42ada8d50571686d77cb257b7c5cec Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Thu, 23 Jan 2025 15:39:18 -0800 Subject: [PATCH 14/56] use spm for tests --- .github/workflows/analytics.yml | 10 ++-------- .github/workflows/authentication.yml | 10 +++------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml index e4593acc3..5e14a738f 100644 --- a/.github/workflows/analytics.yml +++ b/.github/workflows/analytics.yml @@ -28,7 +28,7 @@ env: jobs: cocoapods: - name: cocoapods - ${{ matrix.os }} + name: spm - ${{ matrix.os }} runs-on: macOS-15 strategy: matrix: @@ -50,7 +50,7 @@ jobs: scheme: AnalyticsExampleMac test: true env: - SPM: false + SPM: true LEGACY: false OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} @@ -62,15 +62,9 @@ jobs: - name: Setup run: | cd analytics - gem install bundler - bundle install - gem install xcpretty - bundle exec pod install --repo-update ../scripts/install_prereqs/analytics.sh - name: Build Swift run: ./scripts/test.sh env: TEST: ${{ matrix.test }} SWIFT_SUFFIX: "" - - #TODO: Add `spm` job. diff --git a/.github/workflows/authentication.yml b/.github/workflows/authentication.yml index 2a43a46a6..1d18f548a 100644 --- a/.github/workflows/authentication.yml +++ b/.github/workflows/authentication.yml @@ -28,24 +28,20 @@ env: jobs: cocoapods: - name: cocoapods + name: spm runs-on: macOS-15 env: - SPM: false + SPM: true LEGACY: false OS: iOS DEVICE: iPhone 16 - TEST: false + TEST: true steps: - name: Checkout uses: actions/checkout@master - name: Setup run: | cd authentication - gem install bundler - bundle install - gem install xcpretty - bundle exec pod install --repo-update ../scripts/install_prereqs/authentication.sh - name: Build Swift run: ./scripts/test.sh From ff50fbde7aaf456950be6b33b817a7ad20c3741a Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Thu, 23 Jan 2025 15:44:10 -0800 Subject: [PATCH 15/56] move rc test to spm --- .github/workflows/analytics.yml | 21 ++++++++++----------- .github/workflows/authentication.yml | 17 ++++++++++------- .github/workflows/config.yml | 8 ++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml index 5e14a738f..5c07f5d37 100644 --- a/.github/workflows/analytics.yml +++ b/.github/workflows/analytics.yml @@ -32,15 +32,13 @@ jobs: runs-on: macOS-15 strategy: matrix: - os: [iOS, catalyst, tvOS, macOS] + os: [iOS, tvOS, macOS] xcode: ["16.1"] include: - os: iOS device: iPhone 16 + scheme: AnalyticsExample test: true - - os: catalyst - device: localhost - test: false # disabled due to a permissions error on launch (OSStatus -54). - os: tvOS device: Apple TV 4K (3rd generation) (at 1080p) scheme: AnalyticsExampleTV @@ -50,10 +48,13 @@ jobs: scheme: AnalyticsExampleMac test: true env: + OS: ${{ matrix.os }} + SETUP: analytics SPM: true LEGACY: false - OS: ${{ matrix.os }} + DIR: analytics DEVICE: ${{ matrix.device }} + TEST: ${{ matrix.test }} SCHEME: ${{ matrix.scheme }} DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer steps: @@ -61,10 +62,8 @@ jobs: uses: actions/checkout@master - name: Setup run: | - cd analytics - ../scripts/install_prereqs/analytics.sh - - name: Build Swift + gem install xcpretty + cd $SETUP + ../scripts/install_prereqs/${SETUP}.sh + - name: Build and Test SwiftUI (${{ matrix.os }}) run: ./scripts/test.sh - env: - TEST: ${{ matrix.test }} - SWIFT_SUFFIX: "" diff --git a/.github/workflows/authentication.yml b/.github/workflows/authentication.yml index 1d18f548a..518d5aa51 100644 --- a/.github/workflows/authentication.yml +++ b/.github/workflows/authentication.yml @@ -31,19 +31,22 @@ jobs: name: spm runs-on: macOS-15 env: + OS: iOS + SETUP: authentication SPM: true LEGACY: false - OS: iOS + DIR: authentication DEVICE: iPhone 16 - TEST: true + TEST: false + SCHEME: AuthenticationExample + DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@master - name: Setup run: | - cd authentication - ../scripts/install_prereqs/authentication.sh - - name: Build Swift + gem install xcpretty + cd $SETUP + ../scripts/install_prereqs/${SETUP}.sh + - name: Build and Test SwiftUI (${OS}) run: ./scripts/test.sh - env: - SWIFT_SUFFIX: "" diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index f14ee86d5..d131d42aa 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -28,10 +28,10 @@ env: jobs: cocoapods: - name: cocoapods + name: spm runs-on: macOS-15 env: - SPM: false + SPM: true LEGACY: false SWIFT_SUFFIX: "" TEST: true @@ -41,10 +41,6 @@ jobs: - name: Setup run: | cd config - gem install bundler - bundle install - gem install xcpretty - bundle exec pod install --repo-update ../scripts/install_prereqs/config.sh xcrun simctl boot "iPhone 16" - name: Build Swift From 1f902bb1d9af27e2fae0d75984b8cb2d6d2c557a Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Mon, 27 Jan 2025 15:33:02 -0800 Subject: [PATCH 16/56] fix database tests --- .github/workflows/database.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index f3b725611..cf7ec7571 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -28,29 +28,27 @@ env: jobs: cocoapods: - name: cocoapods + name: spm (non-SwiftUI) runs-on: macOS-15 env: - SPM: false - LEGACY: false OS: iOS + SPM: true + LEGACY: false + DIR: database DEVICE: iPhone 16 TEST: false + SCHEME: DatabaseExampleSwift steps: - name: Checkout uses: actions/checkout@master - name: Setup run: | - cd database - gem install bundler - bundle install gem install xcpretty - bundle exec pod install --repo-update + cd database ../scripts/install_prereqs/database.sh - name: Build Swift run: ./scripts/test.sh - env: - SWIFT_SUFFIX: Swift + spm: name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }}) runs-on: macOS-15 From 4991febd9701378d06868d305d7c5fade1978ddb Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Mon, 27 Jan 2025 15:57:30 -0800 Subject: [PATCH 17/56] fix firestore build --- .github/workflows/database.yml | 2 +- .github/workflows/firestore.yml | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index cf7ec7571..7f7a19528 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -27,7 +27,7 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - cocoapods: + spm-buildonly: name: spm (non-SwiftUI) runs-on: macOS-15 env: diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index 9ab5536d3..2277f71df 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -27,27 +27,24 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - cocoapods: + spm: name: cocoapods runs-on: macOS-15 env: - SPM: false + SPM: true LEGACY: false OS: iOS + DIR: firestore DEVICE: iPhone 16 TEST: false + SCHEME: FirestoreExample steps: - name: Checkout uses: actions/checkout@master - name: Setup run: | cd firestore - gem install bundler - bundle install gem install xcpretty - bundle exec pod install --repo-update ../scripts/install_prereqs/firestore.sh - name: Build run: ./scripts/test.sh - env: - SWIFT_SUFFIX: "" From 79b0b9847b76e3abdb5b57297077be2ed198cf68 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Mon, 27 Jan 2025 16:04:44 -0800 Subject: [PATCH 18/56] fix iam and installations tests --- .github/workflows/inappmessaging.yml | 14 ++++++-------- .github/workflows/installations.yml | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/inappmessaging.yml b/.github/workflows/inappmessaging.yml index cf824f9c0..1f7f6b466 100644 --- a/.github/workflows/inappmessaging.yml +++ b/.github/workflows/inappmessaging.yml @@ -27,12 +27,13 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - cocoapods: - name: cocoapods + spm: + name: spm runs-on: macOS-15 env: - SPM: false + SPM: true LEGACY: false + DIR: inappmessaging OS: iOS DEVICE: iPhone 16 TEST: true @@ -42,16 +43,13 @@ jobs: - name: Setup run: | cd inappmessaging - gem install bundler - bundle install gem install xcpretty - bundle exec pod install --repo-update ../scripts/install_prereqs/inappmessaging.sh - name: Build ObjC run: ./scripts/test.sh env: - SWIFT_SUFFIX: "" + SCHEME: InAppMessagingExample - name: Build Swift run: ./scripts/test.sh env: - SWIFT_SUFFIX: Swift + SCHEME: InAppMessagingExampleSwift diff --git a/.github/workflows/installations.yml b/.github/workflows/installations.yml index 37f281558..f178be375 100644 --- a/.github/workflows/installations.yml +++ b/.github/workflows/installations.yml @@ -27,31 +27,29 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - cocoapods: - name: cocoapods + spm: + name: spm runs-on: macOS-15 env: - SPM: false + SPM: true LEGACY: false OS: iOS DEVICE: iPhone 16 TEST: true + DIR: installations steps: - name: Checkout uses: actions/checkout@master - name: Setup run: | cd installations - gem install bundler - bundle install gem install xcpretty - bundle exec pod install --repo-update ../scripts/install_prereqs/installations.sh - name: Build ObjC run: ./scripts/test.sh env: - SWIFT_SUFFIX: "" + SCHEME: InstallationsExampleSwift - name: Build Swift run: ./scripts/test.sh env: - SWIFT_SUFFIX: Swift + SCHEME: InstallationsExample From e4d4ea9b36f2f56d0efd514c09898be54d217195 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Mon, 27 Jan 2025 16:24:37 -0800 Subject: [PATCH 19/56] fix style and remaining tests --- .github/workflows/config.yml | 10 +++++----- .github/workflows/messaging.yml | 14 ++++++-------- .github/workflows/performance.yml | 14 ++++++-------- .../InAppMessagingExampleSwift/AppDelegate.swift | 2 -- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index d131d42aa..5c02d38f6 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -27,13 +27,16 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - cocoapods: + spm: name: spm runs-on: macOS-15 env: + OS: iOS + DEVICE: iPhone 16 + DIR: config SPM: true LEGACY: false - SWIFT_SUFFIX: "" + SCHEME: ConfigExample TEST: true steps: - name: Checkout @@ -45,6 +48,3 @@ jobs: xcrun simctl boot "iPhone 16" - name: Build Swift run: ./scripts/test.sh - env: - OS: iOS - DEVICE: iPhone 16 diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml index 0186e8858..f77abf9d5 100644 --- a/.github/workflows/messaging.yml +++ b/.github/workflows/messaging.yml @@ -27,31 +27,29 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - cocoapods: - name: cocoapods + spm: + name: spm runs-on: macOS-15 env: - SPM: false + SPM: true LEGACY: false OS: iOS DEVICE: iPhone 16 TEST: false + DIR: messaging steps: - name: Checkout uses: actions/checkout@master - name: Setup run: | cd messaging - gem install bundler - bundle install gem install xcpretty - bundle exec pod install --repo-update ../scripts/install_prereqs/messaging.sh - name: Build ObjC run: ./scripts/test.sh env: - SWIFT_SUFFIX: "" + SCHEME: MessagingExample - name: Build Swift run: ./scripts/test.sh env: - SWIFT_SUFFIX: Swift + SCHEME: MessagingExampleSwift diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 114ab58b1..3c29897a6 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -31,30 +31,28 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - cocoapods: - name: cocoapods + spm: + name: spm runs-on: macOS-15 env: - SPM: false + SPM: true LEGACY: false OS: iOS DEVICE: iPhone 16 TEST: true + DIR: performance + SCHEME: PerformanceExampleSwift steps: - name: Checkout uses: actions/checkout@master - name: Setup run: | cd performance - gem install bundler - bundle install gem install xcpretty - bundle exec pod install --repo-update ../scripts/install_prereqs/performance.sh - name: Build Swift run: ./scripts/test.sh - env: - SWIFT_SUFFIX: Swift + spm: name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }}) runs-on: macOS-15 diff --git a/inappmessaging/InAppMessagingExampleSwift/AppDelegate.swift b/inappmessaging/InAppMessagingExampleSwift/AppDelegate.swift index 72983d8b8..638516d3f 100644 --- a/inappmessaging/InAppMessagingExampleSwift/AppDelegate.swift +++ b/inappmessaging/InAppMessagingExampleSwift/AppDelegate.swift @@ -32,6 +32,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate { FirebaseApp.configure() return true } - - } From b132aec70c04e7fcb63a7ee03cdb756f60b6e026 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Fri, 29 Aug 2025 15:30:43 -0400 Subject: [PATCH 20/56] Update authentication.yml --- .github/workflows/authentication.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/authentication.yml b/.github/workflows/authentication.yml index 518d5aa51..b01ecc541 100644 --- a/.github/workflows/authentication.yml +++ b/.github/workflows/authentication.yml @@ -43,6 +43,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@master + - name: Xcode + run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup run: | gem install xcpretty From 662d08254a4dfd722ede604467ef82b3e4e3e490 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Thu, 4 Sep 2025 21:46:45 -0400 Subject: [PATCH 21/56] Auto-update dependencies. --- Gemfile.lock | 6 +- .../LegacyABTestingQuickstart/Podfile.lock | 82 ++++++------- .../LegacyAnalyticsQuickstart/Podfile.lock | 54 ++++----- analytics/Podfile.lock | 54 ++++----- appdistribution/Podfile.lock | 62 +++++----- .../LegacyAuthQuickstart/Podfile.lock | 104 ++++++++--------- authentication/Podfile.lock | 104 ++++++++--------- config/LegacyConfigQuickstart/Podfile.lock | 44 +++---- config/Podfile.lock | 44 +++---- .../LegacyCrashlyticsQuickstart/Podfile.lock | 48 ++++---- database/Podfile.lock | 50 ++++---- firestore/Podfile.lock | 68 +++++------ .../LegacyFunctionsQuickstart/Podfile.lock | 104 ++++++++--------- inappmessaging/Podfile.lock | 70 +++++------ installations/Podfile.lock | 16 +-- messaging/Podfile.lock | 62 +++++----- performance/Podfile.lock | 110 +++++++++--------- storage/LegacyStorageQuickstart/Podfile.lock | 48 ++++---- swiftui/PasswordlessSwiftUI/Podfile.lock | 36 +++--- 19 files changed, 583 insertions(+), 583 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6934a3ee1..914353498 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,7 +26,7 @@ GEM atomos (0.1.3) base64 (0.3.0) benchmark (0.4.1) - bigdecimal (3.2.2) + bigdecimal (3.2.3) claide (1.1.0) cocoapods (1.16.2) addressable (~> 2.8) @@ -67,7 +67,7 @@ GEM cocoapods-try (1.2.0) colored2 (3.1.2) concurrent-ruby (1.3.5) - connection_pool (2.5.3) + connection_pool (2.5.4) drb (2.2.3) escape (0.0.4) ethon (0.17.0) @@ -90,7 +90,7 @@ GEM netrc (0.11.0) nkf (0.2.0) public_suffix (4.0.7) - rexml (3.4.1) + rexml (3.4.2) ruby-macho (2.5.1) securerandom (0.3.2) typhoeus (1.4.1) diff --git a/abtesting/LegacyABTestingQuickstart/Podfile.lock b/abtesting/LegacyABTestingQuickstart/Podfile.lock index 6294f9bd2..856622f38 100644 --- a/abtesting/LegacyABTestingQuickstart/Podfile.lock +++ b/abtesting/LegacyABTestingQuickstart/Podfile.lock @@ -1,66 +1,66 @@ PODS: - - FirebaseABTesting (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseAnalytics (12.1.0): - - FirebaseAnalytics/Default (= 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseABTesting (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseAnalytics (12.2.0): + - FirebaseAnalytics/Default (= 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - GoogleAppMeasurement/Default (= 12.1.0) + - FirebaseAnalytics/Default (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - GoogleAppMeasurement/Default (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseRemoteConfig (12.1.0): - - FirebaseABTesting (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - FirebaseRemoteConfigInterop (~> 12.1.0) - - FirebaseSharedSwift (~> 12.1.0) + - FirebaseRemoteConfig (12.2.0): + - FirebaseABTesting (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - FirebaseRemoteConfigInterop (~> 12.2.0) + - FirebaseSharedSwift (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseRemoteConfigInterop (12.1.0) - - FirebaseSharedSwift (12.1.0) - - GoogleAdsOnDeviceConversion (2.2.0): + - FirebaseRemoteConfigInterop (12.2.0) + - FirebaseSharedSwift (12.2.0) + - GoogleAdsOnDeviceConversion (2.3.0): - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.1.0): + - GoogleAppMeasurement/Core (12.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.1.0): - - GoogleAdsOnDeviceConversion (= 2.2.0) - - GoogleAppMeasurement/Core (= 12.1.0) - - GoogleAppMeasurement/IdentitySupport (= 12.1.0) + - GoogleAppMeasurement/Default (12.2.0): + - GoogleAdsOnDeviceConversion (= 2.3.0) + - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.1.0): - - GoogleAppMeasurement/Core (= 12.1.0) + - GoogleAppMeasurement/IdentitySupport (12.2.0): + - GoogleAppMeasurement/Core (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -121,16 +121,16 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseABTesting: dfac26fef831cb16c35aa2df8bf5990ddada81d9 - FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - FirebaseRemoteConfig: d4b28137ecdf1d92ddeb886066074eb3936736a7 - FirebaseRemoteConfigInterop: a30ffe29b80e3aec9580a44ec9deb7e19e08e6e8 - FirebaseSharedSwift: ee4344de8a4d5b5290de3600667307a44f85fd40 - GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215 - GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca + FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031 + FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + FirebaseRemoteConfig: e3ae5500b92e813f3a0b12fa09701a26441dfc95 + FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1 + FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 + GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe + GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/analytics/LegacyAnalyticsQuickstart/Podfile.lock b/analytics/LegacyAnalyticsQuickstart/Podfile.lock index bbcc93ca6..3be81b9a5 100644 --- a/analytics/LegacyAnalyticsQuickstart/Podfile.lock +++ b/analytics/LegacyAnalyticsQuickstart/Podfile.lock @@ -1,54 +1,54 @@ PODS: - - FirebaseAnalytics (12.1.0): - - FirebaseAnalytics/Default (= 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseAnalytics (12.2.0): + - FirebaseAnalytics/Default (= 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - GoogleAppMeasurement/Default (= 12.1.0) + - FirebaseAnalytics/Default (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - GoogleAppMeasurement/Default (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.2.0): + - GoogleAdsOnDeviceConversion (2.3.0): - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.1.0): + - GoogleAppMeasurement/Core (12.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.1.0): - - GoogleAdsOnDeviceConversion (= 2.2.0) - - GoogleAppMeasurement/Core (= 12.1.0) - - GoogleAppMeasurement/IdentitySupport (= 12.1.0) + - GoogleAppMeasurement/Default (12.2.0): + - GoogleAdsOnDeviceConversion (= 2.3.0) + - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.1.0): - - GoogleAppMeasurement/Core (= 12.1.0) + - GoogleAppMeasurement/IdentitySupport (12.2.0): + - GoogleAppMeasurement/Core (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -104,12 +104,12 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215 - GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca + FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe + GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/analytics/Podfile.lock b/analytics/Podfile.lock index c238d3f1b..4294a5431 100644 --- a/analytics/Podfile.lock +++ b/analytics/Podfile.lock @@ -1,54 +1,54 @@ PODS: - - FirebaseAnalytics (12.1.0): - - FirebaseAnalytics/Default (= 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseAnalytics (12.2.0): + - FirebaseAnalytics/Default (= 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - GoogleAppMeasurement/Default (= 12.1.0) + - FirebaseAnalytics/Default (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - GoogleAppMeasurement/Default (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.2.0): + - GoogleAdsOnDeviceConversion (2.3.0): - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.1.0): + - GoogleAppMeasurement/Core (12.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.1.0): - - GoogleAdsOnDeviceConversion (= 2.2.0) - - GoogleAppMeasurement/Core (= 12.1.0) - - GoogleAppMeasurement/IdentitySupport (= 12.1.0) + - GoogleAppMeasurement/Default (12.2.0): + - GoogleAdsOnDeviceConversion (= 2.3.0) + - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.1.0): - - GoogleAppMeasurement/Core (= 12.1.0) + - GoogleAppMeasurement/IdentitySupport (12.2.0): + - GoogleAppMeasurement/Core (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -104,12 +104,12 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215 - GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca + FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe + GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/appdistribution/Podfile.lock b/appdistribution/Podfile.lock index 8860363c1..5ff87b4b1 100644 --- a/appdistribution/Podfile.lock +++ b/appdistribution/Podfile.lock @@ -1,59 +1,59 @@ PODS: - - FirebaseAnalytics (12.1.0): - - FirebaseAnalytics/Default (= 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseAnalytics (12.2.0): + - FirebaseAnalytics/Default (= 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - GoogleAppMeasurement/Default (= 12.1.0) + - FirebaseAnalytics/Default (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - GoogleAppMeasurement/Default (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAppDistribution (12.1.0-beta): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseAppDistribution (12.2.0-beta): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.2.0): + - GoogleAdsOnDeviceConversion (2.3.0): - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.1.0): + - GoogleAppMeasurement/Core (12.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.1.0): - - GoogleAdsOnDeviceConversion (= 2.2.0) - - GoogleAppMeasurement/Core (= 12.1.0) - - GoogleAppMeasurement/IdentitySupport (= 12.1.0) + - GoogleAppMeasurement/Default (12.2.0): + - GoogleAdsOnDeviceConversion (= 2.3.0) + - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.1.0): - - GoogleAppMeasurement/Core (= 12.1.0) + - GoogleAppMeasurement/IdentitySupport (12.2.0): + - GoogleAppMeasurement/Core (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -111,13 +111,13 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624 - FirebaseAppDistribution: 3091ba10621b4f67c63a7fc8c58298b3c55c32e3 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215 - GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca + FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 + FirebaseAppDistribution: 468c75794945e899fe5ab2b7991dbd3dca110745 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe + GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/authentication/LegacyAuthQuickstart/Podfile.lock b/authentication/LegacyAuthQuickstart/Podfile.lock index 81aa85566..06da0ac67 100644 --- a/authentication/LegacyAuthQuickstart/Podfile.lock +++ b/authentication/LegacyAuthQuickstart/Podfile.lock @@ -9,77 +9,77 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FBAEMKit (18.0.0): - - FBSDKCoreKit_Basics (= 18.0.0) - - FBSDKCoreKit (18.0.0): - - FBAEMKit (= 18.0.0) - - FBSDKCoreKit_Basics (= 18.0.0) - - FBSDKCoreKit_Basics (18.0.0) - - FBSDKLoginKit (18.0.0): - - FBSDKCoreKit (= 18.0.0) - - FirebaseAnalytics (12.1.0): - - FirebaseAnalytics/Default (= 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FBAEMKit (18.0.1): + - FBSDKCoreKit_Basics (= 18.0.1) + - FBSDKCoreKit (18.0.1): + - FBAEMKit (= 18.0.1) + - FBSDKCoreKit_Basics (= 18.0.1) + - FBSDKCoreKit_Basics (18.0.1) + - FBSDKLoginKit (18.0.1): + - FBSDKCoreKit (= 18.0.1) + - FirebaseAnalytics (12.2.0): + - FirebaseAnalytics/Default (= 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - GoogleAppMeasurement/Default (= 12.1.0) + - FirebaseAnalytics/Default (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - GoogleAppMeasurement/Default (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAppCheckInterop (12.1.0) - - FirebaseAuth (12.1.0): - - FirebaseAppCheckInterop (~> 12.1.0) - - FirebaseAuthInterop (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) + - FirebaseAppCheckInterop (12.2.0) + - FirebaseAuth (12.2.0): + - FirebaseAppCheckInterop (~> 12.2.0) + - FirebaseAuthInterop (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.1.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseAuthInterop (12.2.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreExtension (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.2.0): + - GoogleAdsOnDeviceConversion (2.3.0): - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.1.0): + - GoogleAppMeasurement/Core (12.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.1.0): - - GoogleAdsOnDeviceConversion (= 2.2.0) - - GoogleAppMeasurement/Core (= 12.1.0) - - GoogleAppMeasurement/IdentitySupport (= 12.1.0) + - GoogleAppMeasurement/Default (12.2.0): + - GoogleAdsOnDeviceConversion (= 2.3.0) + - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.1.0): - - GoogleAppMeasurement/Core (= 12.1.0) + - GoogleAppMeasurement/IdentitySupport (12.2.0): + - GoogleAppMeasurement/Core (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -164,20 +164,20 @@ SPEC REPOS: SPEC CHECKSUMS: AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063 AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f - FBAEMKit: e34530df538b8eb8aeb53c35867715ba6c63ef0c - FBSDKCoreKit: d3f479a69127acebb1c6aad91c1a33907bcf6c2f - FBSDKCoreKit_Basics: 017b6dc2a1862024815a8229e75661e627ac1e29 - FBSDKLoginKit: 5875762d1fe09ddcb05d03365d4f5dc34413843d - FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624 - FirebaseAppCheckInterop: de890554a81967f16a0eb8d3def541c2bb42dece - FirebaseAuth: 6d0f2d449195c401e6d6ef1a891fff22bc60356d - FirebaseAuthInterop: ede927b03baf02453e6e9de2df513cc28d3eb742 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreExtension: dd89d73548ee9be5d8dc60e5c76bc421b965853b - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215 - GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca + FBAEMKit: b2ed182002dbcb65d5a60059c9693d322186cd00 + FBSDKCoreKit: 7f96852f2539bdb88ba8d47e5ab4ae70a6f8d691 + FBSDKCoreKit_Basics: 22d4c1a509ded4e45116f3bb167a14907550f62e + FBSDKLoginKit: f48c06446995cd209332831f692cea28b26e51da + FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 + FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 + FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 + FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe + GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238 diff --git a/authentication/Podfile.lock b/authentication/Podfile.lock index 45f67bcb7..e8a9a46ab 100644 --- a/authentication/Podfile.lock +++ b/authentication/Podfile.lock @@ -9,77 +9,77 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FBAEMKit (18.0.0): - - FBSDKCoreKit_Basics (= 18.0.0) - - FBSDKCoreKit (18.0.0): - - FBAEMKit (= 18.0.0) - - FBSDKCoreKit_Basics (= 18.0.0) - - FBSDKCoreKit_Basics (18.0.0) - - FBSDKLoginKit (18.0.0): - - FBSDKCoreKit (= 18.0.0) - - FirebaseAnalytics (12.1.0): - - FirebaseAnalytics/Default (= 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FBAEMKit (18.0.1): + - FBSDKCoreKit_Basics (= 18.0.1) + - FBSDKCoreKit (18.0.1): + - FBAEMKit (= 18.0.1) + - FBSDKCoreKit_Basics (= 18.0.1) + - FBSDKCoreKit_Basics (18.0.1) + - FBSDKLoginKit (18.0.1): + - FBSDKCoreKit (= 18.0.1) + - FirebaseAnalytics (12.2.0): + - FirebaseAnalytics/Default (= 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - GoogleAppMeasurement/Default (= 12.1.0) + - FirebaseAnalytics/Default (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - GoogleAppMeasurement/Default (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAppCheckInterop (12.1.0) - - FirebaseAuth (12.1.0): - - FirebaseAppCheckInterop (~> 12.1.0) - - FirebaseAuthInterop (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) + - FirebaseAppCheckInterop (12.2.0) + - FirebaseAuth (12.2.0): + - FirebaseAppCheckInterop (~> 12.2.0) + - FirebaseAuthInterop (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.1.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseAuthInterop (12.2.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreExtension (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.2.0): + - GoogleAdsOnDeviceConversion (2.3.0): - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.1.0): + - GoogleAppMeasurement/Core (12.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.1.0): - - GoogleAdsOnDeviceConversion (= 2.2.0) - - GoogleAppMeasurement/Core (= 12.1.0) - - GoogleAppMeasurement/IdentitySupport (= 12.1.0) + - GoogleAppMeasurement/Default (12.2.0): + - GoogleAdsOnDeviceConversion (= 2.3.0) + - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.1.0): - - GoogleAppMeasurement/Core (= 12.1.0) + - GoogleAppMeasurement/IdentitySupport (12.2.0): + - GoogleAppMeasurement/Core (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -164,20 +164,20 @@ SPEC REPOS: SPEC CHECKSUMS: AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063 AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f - FBAEMKit: e34530df538b8eb8aeb53c35867715ba6c63ef0c - FBSDKCoreKit: d3f479a69127acebb1c6aad91c1a33907bcf6c2f - FBSDKCoreKit_Basics: 017b6dc2a1862024815a8229e75661e627ac1e29 - FBSDKLoginKit: 5875762d1fe09ddcb05d03365d4f5dc34413843d - FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624 - FirebaseAppCheckInterop: de890554a81967f16a0eb8d3def541c2bb42dece - FirebaseAuth: 6d0f2d449195c401e6d6ef1a891fff22bc60356d - FirebaseAuthInterop: ede927b03baf02453e6e9de2df513cc28d3eb742 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreExtension: dd89d73548ee9be5d8dc60e5c76bc421b965853b - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215 - GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca + FBAEMKit: b2ed182002dbcb65d5a60059c9693d322186cd00 + FBSDKCoreKit: 7f96852f2539bdb88ba8d47e5ab4ae70a6f8d691 + FBSDKCoreKit_Basics: 22d4c1a509ded4e45116f3bb167a14907550f62e + FBSDKLoginKit: f48c06446995cd209332831f692cea28b26e51da + FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 + FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 + FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 + FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe + GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238 diff --git a/config/LegacyConfigQuickstart/Podfile.lock b/config/LegacyConfigQuickstart/Podfile.lock index 67d0d4d82..c69a53040 100644 --- a/config/LegacyConfigQuickstart/Podfile.lock +++ b/config/LegacyConfigQuickstart/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - FirebaseABTesting (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseABTesting (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseRemoteConfig (12.1.0): - - FirebaseABTesting (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - FirebaseRemoteConfigInterop (~> 12.1.0) - - FirebaseSharedSwift (~> 12.1.0) + - FirebaseRemoteConfig (12.2.0): + - FirebaseABTesting (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - FirebaseRemoteConfigInterop (~> 12.2.0) + - FirebaseSharedSwift (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseRemoteConfigInterop (12.1.0) - - FirebaseSharedSwift (12.1.0) + - FirebaseRemoteConfigInterop (12.2.0) + - FirebaseSharedSwift (12.2.0) - GoogleUtilities/Environment (8.1.0): - GoogleUtilities/Privacy - GoogleUtilities/Logger (8.1.0): @@ -51,13 +51,13 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseABTesting: dfac26fef831cb16c35aa2df8bf5990ddada81d9 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - FirebaseRemoteConfig: d4b28137ecdf1d92ddeb886066074eb3936736a7 - FirebaseRemoteConfigInterop: a30ffe29b80e3aec9580a44ec9deb7e19e08e6e8 - FirebaseSharedSwift: ee4344de8a4d5b5290de3600667307a44f85fd40 + FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + FirebaseRemoteConfig: e3ae5500b92e813f3a0b12fa09701a26441dfc95 + FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1 + FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/config/Podfile.lock b/config/Podfile.lock index 7e32b941f..67c198a8a 100644 --- a/config/Podfile.lock +++ b/config/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - FirebaseABTesting (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseABTesting (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseRemoteConfig (12.1.0): - - FirebaseABTesting (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - FirebaseRemoteConfigInterop (~> 12.1.0) - - FirebaseSharedSwift (~> 12.1.0) + - FirebaseRemoteConfig (12.2.0): + - FirebaseABTesting (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - FirebaseRemoteConfigInterop (~> 12.2.0) + - FirebaseSharedSwift (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseRemoteConfigInterop (12.1.0) - - FirebaseSharedSwift (12.1.0) + - FirebaseRemoteConfigInterop (12.2.0) + - FirebaseSharedSwift (12.2.0) - GoogleUtilities/Environment (8.1.0): - GoogleUtilities/Privacy - GoogleUtilities/Logger (8.1.0): @@ -51,13 +51,13 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseABTesting: dfac26fef831cb16c35aa2df8bf5990ddada81d9 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - FirebaseRemoteConfig: d4b28137ecdf1d92ddeb886066074eb3936736a7 - FirebaseRemoteConfigInterop: a30ffe29b80e3aec9580a44ec9deb7e19e08e6e8 - FirebaseSharedSwift: ee4344de8a4d5b5290de3600667307a44f85fd40 + FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + FirebaseRemoteConfig: e3ae5500b92e813f3a0b12fa09701a26441dfc95 + FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1 + FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/crashlytics/LegacyCrashlyticsQuickstart/Podfile.lock b/crashlytics/LegacyCrashlyticsQuickstart/Podfile.lock index 8f484c6be..1435aeea3 100644 --- a/crashlytics/LegacyCrashlyticsQuickstart/Podfile.lock +++ b/crashlytics/LegacyCrashlyticsQuickstart/Podfile.lock @@ -1,31 +1,31 @@ PODS: - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreExtension (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseCrashlytics (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - FirebaseRemoteConfigInterop (~> 12.1.0) - - FirebaseSessions (~> 12.1.0) + - FirebaseCrashlytics (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - FirebaseRemoteConfigInterop (~> 12.2.0) + - FirebaseSessions (~> 12.2.0) - GoogleDataTransport (~> 10.1) - GoogleUtilities/Environment (~> 8.1) - nanopb (~> 3.30910.0) - PromisesObjC (~> 2.4) - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseRemoteConfigInterop (12.1.0) - - FirebaseSessions (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseRemoteConfigInterop (12.2.0) + - FirebaseSessions (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleDataTransport (~> 10.1) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) @@ -76,13 +76,13 @@ SPEC REPOS: - ReachabilitySwift SPEC CHECKSUMS: - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreExtension: dd89d73548ee9be5d8dc60e5c76bc421b965853b - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseCrashlytics: 5834becad22032e1075ff945dcac2d66500d7f1f - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - FirebaseRemoteConfigInterop: a30ffe29b80e3aec9580a44ec9deb7e19e08e6e8 - FirebaseSessions: 778459b8339fcd8201361f552db4d7223f74eb72 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseCrashlytics: f83cbf176d5c637ade108c0aacf1ccbd5ec499bf + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1 + FirebaseSessions: f4692789e770bec66ce17d772c0e9561c4f11737 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 diff --git a/database/Podfile.lock b/database/Podfile.lock index cb280fdfe..c1e0f164a 100644 --- a/database/Podfile.lock +++ b/database/Podfile.lock @@ -1,32 +1,32 @@ PODS: - - FirebaseAppCheckInterop (12.1.0) - - FirebaseAuth (12.1.0): - - FirebaseAppCheckInterop (~> 12.1.0) - - FirebaseAuthInterop (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) + - FirebaseAppCheckInterop (12.2.0) + - FirebaseAuth (12.2.0): + - FirebaseAppCheckInterop (~> 12.2.0) + - FirebaseAuthInterop (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.1.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseAuthInterop (12.2.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreExtension (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseDatabase (12.1.0): - - FirebaseAppCheckInterop (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseSharedSwift (~> 12.1.0) + - FirebaseDatabase (12.2.0): + - FirebaseAppCheckInterop (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseSharedSwift (~> 12.2.0) - GoogleUtilities/UserDefaults (~> 8.1) - leveldb-library (~> 1.22) - FirebaseDatabaseUI (15.1.0): - FirebaseDatabase (< 13.0, >= 8.0) - - FirebaseSharedSwift (12.1.0) + - FirebaseSharedSwift (12.2.0) - FirebaseUI/Database (15.1.0): - FirebaseDatabaseUI (~> 15.0) - GoogleUtilities/AppDelegateSwizzler (8.1.0): @@ -80,15 +80,15 @@ SPEC REPOS: - RecaptchaInterop SPEC CHECKSUMS: - FirebaseAppCheckInterop: de890554a81967f16a0eb8d3def541c2bb42dece - FirebaseAuth: 6d0f2d449195c401e6d6ef1a891fff22bc60356d - FirebaseAuthInterop: ede927b03baf02453e6e9de2df513cc28d3eb742 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreExtension: dd89d73548ee9be5d8dc60e5c76bc421b965853b - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseDatabase: 05bc094f88aa59eeadab7e30a62a6bb8ee76bf13 + FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 + FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 + FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseDatabase: d7f6b8dc187fe7e72db1c1e2b03a7611d8ec2813 FirebaseDatabaseUI: 5280abb5536ee0947e23ab8aaf009342b78a5eb2 - FirebaseSharedSwift: ee4344de8a4d5b5290de3600667307a44f85fd40 + FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 FirebaseUI: 1dfcf45d4bb4073380091394c9c555d697ecca11 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMSessionFetcher: 02d6e866e90bc236f48a703a041dfe43e6221a29 diff --git a/firestore/Podfile.lock b/firestore/Podfile.lock index c1cdc28f9..19eee1890 100644 --- a/firestore/Podfile.lock +++ b/firestore/Podfile.lock @@ -1194,39 +1194,39 @@ PODS: - BoringSSL-GRPC/Implementation (0.0.37): - BoringSSL-GRPC/Interface (= 0.0.37) - BoringSSL-GRPC/Interface (0.0.37) - - FirebaseAppCheckInterop (12.1.0) - - FirebaseAuth (12.1.0): - - FirebaseAppCheckInterop (~> 12.1.0) - - FirebaseAuthInterop (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) + - FirebaseAppCheckInterop (12.2.0) + - FirebaseAuth (12.2.0): + - FirebaseAppCheckInterop (~> 12.2.0) + - FirebaseAuthInterop (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.1.0) + - FirebaseAuthInterop (12.2.0) - FirebaseAuthUI (15.1.0): - FirebaseAuth (< 13.0, >= 11.0) - FirebaseCore - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreExtension (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - FirebaseEmailAuthUI (15.1.0): - FirebaseAuth - FirebaseAuthUI (~> 15.0) - FirebaseCore - GoogleUtilities/UserDefaults - - FirebaseFirestore (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) - - FirebaseFirestoreInternal (~> 12.1.0) - - FirebaseSharedSwift (~> 12.1.0) - - FirebaseFirestoreInternal (12.1.0): + - FirebaseFirestore (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) + - FirebaseFirestoreInternal (~> 12.2.0) + - FirebaseSharedSwift (~> 12.2.0) + - FirebaseFirestoreInternal (12.2.0): - abseil/algorithm (~> 1.20240722.0) - abseil/base (~> 1.20240722.0) - abseil/container/flat_hash_map (~> 1.20240722.0) @@ -1235,13 +1235,13 @@ PODS: - abseil/strings/strings (~> 1.20240722.0) - abseil/time (~> 1.20240722.0) - abseil/types (~> 1.20240722.0) - - FirebaseAppCheckInterop (~> 12.1.0) - - FirebaseCore (~> 12.1.0) + - FirebaseAppCheckInterop (~> 12.2.0) + - FirebaseCore (~> 12.2.0) - "gRPC-C++ (~> 1.69.0)" - gRPC-Core (~> 1.69.0) - leveldb-library (~> 1.22) - nanopb (~> 3.30910.0) - - FirebaseSharedSwift (12.1.0) + - FirebaseSharedSwift (12.2.0) - FirebaseUI/Auth (15.1.0): - FirebaseAuthUI (~> 15.0) - FirebaseUI/Email (15.1.0): @@ -1370,9 +1370,9 @@ PODS: - nanopb/decode (3.30910.0) - nanopb/encode (3.30910.0) - RecaptchaInterop (101.0.0) - - SDWebImage (5.21.1): - - SDWebImage/Core (= 5.21.1) - - SDWebImage/Core (5.21.1) + - SDWebImage (5.21.2): + - SDWebImage/Core (= 5.21.2) + - SDWebImage/Core (5.21.2) - SDWebImageSwiftUI (3.1.3): - SDWebImage (~> 5.10) @@ -1413,17 +1413,17 @@ SPEC REPOS: SPEC CHECKSUMS: abseil: a05cc83bf02079535e17169a73c5be5ba47f714b BoringSSL-GRPC: dded2a44897e45f28f08ae87a55ee4bcd19bc508 - FirebaseAppCheckInterop: de890554a81967f16a0eb8d3def541c2bb42dece - FirebaseAuth: 6d0f2d449195c401e6d6ef1a891fff22bc60356d - FirebaseAuthInterop: ede927b03baf02453e6e9de2df513cc28d3eb742 + FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 + FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 + FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 FirebaseAuthUI: c574e8904bd14503ff47e55ba2fc9ec64aacaed6 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreExtension: dd89d73548ee9be5d8dc60e5c76bc421b965853b - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b FirebaseEmailAuthUI: b6c80ac6ae42bacf2fece92762fa79bc4ee736ed - FirebaseFirestore: 7f06732c905092d12a6e060aace72a28ad528190 - FirebaseFirestoreInternal: 1e6d681414d7fe2b8b99315784e242e7f301cf44 - FirebaseSharedSwift: ee4344de8a4d5b5290de3600667307a44f85fd40 + FirebaseFirestore: 2baa1360623e942007726627653d43a5bc618ba8 + FirebaseFirestoreInternal: 6506aef21ac270bf137c34cd7283723d930eddb0 + FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 FirebaseUI: 1dfcf45d4bb4073380091394c9c555d697ecca11 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 "gRPC-C++": cc207623316fb041a7a3e774c252cf68a058b9e8 @@ -1432,7 +1432,7 @@ SPEC CHECKSUMS: leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba - SDWebImage: f29024626962457f3470184232766516dee8dfea + SDWebImage: 9f177d83116802728e122410fb25ad88f5c7608a SDWebImageSwiftUI: a6d7129fb68fc18c8b930b869ddcfce314e49ded PODFILE CHECKSUM: 2585dac1c3f679eecfb4775b842304e0377270b5 diff --git a/functions/LegacyFunctionsQuickstart/Podfile.lock b/functions/LegacyFunctionsQuickstart/Podfile.lock index 953ab70b3..a60c35f45 100644 --- a/functions/LegacyFunctionsQuickstart/Podfile.lock +++ b/functions/LegacyFunctionsQuickstart/Podfile.lock @@ -9,91 +9,91 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FirebaseAnalytics (12.1.0): - - FirebaseAnalytics/Default (= 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseAnalytics (12.2.0): + - FirebaseAnalytics/Default (= 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - GoogleAppMeasurement/Default (= 12.1.0) + - FirebaseAnalytics/Default (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - GoogleAppMeasurement/Default (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAppCheckInterop (12.1.0) - - FirebaseAuth (12.1.0): - - FirebaseAppCheckInterop (~> 12.1.0) - - FirebaseAuthInterop (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) + - FirebaseAppCheckInterop (12.2.0) + - FirebaseAuth (12.2.0): + - FirebaseAppCheckInterop (~> 12.2.0) + - FirebaseAuthInterop (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.1.0) + - FirebaseAuthInterop (12.2.0) - FirebaseAuthUI (15.1.0): - FirebaseAuth (< 13.0, >= 11.0) - FirebaseCore - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreExtension (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseFunctions (12.1.0): - - FirebaseAppCheckInterop (~> 12.1.0) - - FirebaseAuthInterop (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) - - FirebaseMessagingInterop (~> 12.1.0) - - FirebaseSharedSwift (~> 12.1.0) + - FirebaseFunctions (12.2.0): + - FirebaseAppCheckInterop (~> 12.2.0) + - FirebaseAuthInterop (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) + - FirebaseMessagingInterop (~> 12.2.0) + - FirebaseSharedSwift (~> 12.2.0) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - FirebaseGoogleAuthUI (15.1.0): - FirebaseAuth - FirebaseAuthUI (~> 15.0) - FirebaseCore - GoogleSignIn (~> 8.0) - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseMessagingInterop (12.1.0) - - FirebaseSharedSwift (12.1.0) + - FirebaseMessagingInterop (12.2.0) + - FirebaseSharedSwift (12.2.0) - FirebaseUI/Auth (15.1.0): - FirebaseAuthUI (~> 15.0) - FirebaseUI/Google (15.1.0): - FirebaseGoogleAuthUI (~> 15.0) - - GoogleAdsOnDeviceConversion (2.2.0): + - GoogleAdsOnDeviceConversion (2.3.0): - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.1.0): + - GoogleAppMeasurement/Core (12.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.1.0): - - GoogleAdsOnDeviceConversion (= 2.2.0) - - GoogleAppMeasurement/Core (= 12.1.0) - - GoogleAppMeasurement/IdentitySupport (= 12.1.0) + - GoogleAppMeasurement/Default (12.2.0): + - GoogleAdsOnDeviceConversion (= 2.3.0) + - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.1.0): - - GoogleAppMeasurement/Core (= 12.1.0) + - GoogleAppMeasurement/IdentitySupport (12.2.0): + - GoogleAppMeasurement/Core (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -284,22 +284,22 @@ SPEC REPOS: SPEC CHECKSUMS: AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73 AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f - FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624 - FirebaseAppCheckInterop: de890554a81967f16a0eb8d3def541c2bb42dece - FirebaseAuth: 6d0f2d449195c401e6d6ef1a891fff22bc60356d - FirebaseAuthInterop: ede927b03baf02453e6e9de2df513cc28d3eb742 + FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 + FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 + FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 + FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 FirebaseAuthUI: c574e8904bd14503ff47e55ba2fc9ec64aacaed6 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreExtension: dd89d73548ee9be5d8dc60e5c76bc421b965853b - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseFunctions: a3da4b0c69f1240ef51bbe39a78a1393b6c12323 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseFunctions: fc68f7e566da9b2eb714f66bc9e633d3111da7fb FirebaseGoogleAuthUI: 740a15519a36b4d15802c4ef1db4aaeb7f7bad0b - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - FirebaseMessagingInterop: 1e9db269130b57cf791776b6c32dad1645fabca3 - FirebaseSharedSwift: ee4344de8a4d5b5290de3600667307a44f85fd40 + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + FirebaseMessagingInterop: 913e21aa8526740cd2ac17b30e89dd3e56ff112e + FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 FirebaseUI: 1dfcf45d4bb4073380091394c9c555d697ecca11 - GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215 - GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca + GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe + GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af GoogleSignIn: ce8c89bb9b37fb624b92e7514cc67335d1e277e4 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de diff --git a/inappmessaging/Podfile.lock b/inappmessaging/Podfile.lock index d9c961228..ca26e490e 100644 --- a/inappmessaging/Podfile.lock +++ b/inappmessaging/Podfile.lock @@ -1,63 +1,63 @@ PODS: - - FirebaseABTesting (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseAnalytics (12.1.0): - - FirebaseAnalytics/Default (= 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseABTesting (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseAnalytics (12.2.0): + - FirebaseAnalytics/Default (= 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - GoogleAppMeasurement/Default (= 12.1.0) + - FirebaseAnalytics/Default (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - GoogleAppMeasurement/Default (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInAppMessaging (12.1.0-beta): - - FirebaseABTesting (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseInAppMessaging (12.2.0-beta): + - FirebaseABTesting (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - nanopb (~> 3.30910.0) - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.2.0): + - GoogleAdsOnDeviceConversion (2.3.0): - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.1.0): + - GoogleAppMeasurement/Core (12.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.1.0): - - GoogleAdsOnDeviceConversion (= 2.2.0) - - GoogleAppMeasurement/Core (= 12.1.0) - - GoogleAppMeasurement/IdentitySupport (= 12.1.0) + - GoogleAppMeasurement/Default (12.2.0): + - GoogleAdsOnDeviceConversion (= 2.3.0) + - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.1.0): - - GoogleAppMeasurement/Core (= 12.1.0) + - GoogleAppMeasurement/IdentitySupport (12.2.0): + - GoogleAppMeasurement/Core (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -116,14 +116,14 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseABTesting: dfac26fef831cb16c35aa2df8bf5990ddada81d9 - FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInAppMessaging: 06353126a10d6351e10f29fd61769eb2e176e956 - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215 - GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca + FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031 + FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInAppMessaging: fecba63d44c5cd8f874e9d661a5aa5047380c7d0 + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe + GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/installations/Podfile.lock b/installations/Podfile.lock index 0fbc21ae3..a4c5a6993 100644 --- a/installations/Podfile.lock +++ b/installations/Podfile.lock @@ -1,12 +1,12 @@ PODS: - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) @@ -35,9 +35,9 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/messaging/Podfile.lock b/messaging/Podfile.lock index dd9c868fe..de82ef2cf 100644 --- a/messaging/Podfile.lock +++ b/messaging/Podfile.lock @@ -1,63 +1,63 @@ PODS: - - FirebaseAnalytics (12.1.0): - - FirebaseAnalytics/Default (= 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseAnalytics (12.2.0): + - FirebaseAnalytics/Default (= 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - GoogleAppMeasurement/Default (= 12.1.0) + - FirebaseAnalytics/Default (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - GoogleAppMeasurement/Default (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseMessaging (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseMessaging (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleDataTransport (~> 10.1) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Reachability (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAdsOnDeviceConversion (2.2.0): + - GoogleAdsOnDeviceConversion (2.3.0): - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.1.0): + - GoogleAppMeasurement/Core (12.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.1.0): - - GoogleAdsOnDeviceConversion (= 2.2.0) - - GoogleAppMeasurement/Core (= 12.1.0) - - GoogleAppMeasurement/IdentitySupport (= 12.1.0) + - GoogleAppMeasurement/Default (12.2.0): + - GoogleAdsOnDeviceConversion (= 2.3.0) + - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.1.0): - - GoogleAppMeasurement/Core (= 12.1.0) + - GoogleAppMeasurement/IdentitySupport (12.2.0): + - GoogleAppMeasurement/Core (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -119,13 +119,13 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - FirebaseMessaging: 6538be0d8e8d0a3405407bc3813e2223287c0d17 - GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215 - GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca + FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + FirebaseMessaging: 43ec73bbfedd0c385a849bb91593ab4ad4b9e48e + GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe + GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 diff --git a/performance/Podfile.lock b/performance/Podfile.lock index 42d5bb7d4..9b818c8d5 100644 --- a/performance/Podfile.lock +++ b/performance/Podfile.lock @@ -1,87 +1,87 @@ PODS: - - FirebaseABTesting (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseAnalytics (12.1.0): - - FirebaseAnalytics/Default (= 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseABTesting (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseAnalytics (12.2.0): + - FirebaseAnalytics/Default (= 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - GoogleAppMeasurement/Default (= 12.1.0) + - FirebaseAnalytics/Default (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - GoogleAppMeasurement/Default (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreExtension (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.1.0): - - FirebaseCore (~> 12.1.0) + - FirebaseInstallations (12.2.0): + - FirebaseCore (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebasePerformance (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - FirebaseRemoteConfig (~> 12.1.0) - - FirebaseSessions (~> 12.1.0) + - FirebasePerformance (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - FirebaseRemoteConfig (~> 12.2.0) + - FirebaseSessions (~> 12.2.0) - GoogleDataTransport (~> 10.1) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - nanopb (~> 3.30910.0) - - FirebaseRemoteConfig (12.1.0): - - FirebaseABTesting (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) - - FirebaseRemoteConfigInterop (~> 12.1.0) - - FirebaseSharedSwift (~> 12.1.0) + - FirebaseRemoteConfig (12.2.0): + - FirebaseABTesting (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) + - FirebaseRemoteConfigInterop (~> 12.2.0) + - FirebaseSharedSwift (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseRemoteConfigInterop (12.1.0) - - FirebaseSessions (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) - - FirebaseInstallations (~> 12.1.0) + - FirebaseRemoteConfigInterop (12.2.0) + - FirebaseSessions (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) + - FirebaseInstallations (~> 12.2.0) - GoogleDataTransport (~> 10.1) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - nanopb (~> 3.30910.0) - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (12.1.0) - - GoogleAdsOnDeviceConversion (2.2.0): + - FirebaseSharedSwift (12.2.0) + - GoogleAdsOnDeviceConversion (2.3.0): - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.1.0): + - GoogleAppMeasurement/Core (12.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.1.0): - - GoogleAdsOnDeviceConversion (= 2.2.0) - - GoogleAppMeasurement/Core (= 12.1.0) - - GoogleAppMeasurement/IdentitySupport (= 12.1.0) + - GoogleAppMeasurement/Default (12.2.0): + - GoogleAdsOnDeviceConversion (= 2.3.0) + - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.1.0): - - GoogleAppMeasurement/Core (= 12.1.0) + - GoogleAppMeasurement/IdentitySupport (12.2.0): + - GoogleAppMeasurement/Core (= 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -152,19 +152,19 @@ SPEC REPOS: - PromisesSwift SPEC CHECKSUMS: - FirebaseABTesting: dfac26fef831cb16c35aa2df8bf5990ddada81d9 - FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreExtension: dd89d73548ee9be5d8dc60e5c76bc421b965853b - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779 - FirebasePerformance: 4f89b3699eea328c32aeee940bb9e5c22cfa6645 - FirebaseRemoteConfig: d4b28137ecdf1d92ddeb886066074eb3936736a7 - FirebaseRemoteConfigInterop: a30ffe29b80e3aec9580a44ec9deb7e19e08e6e8 - FirebaseSessions: 778459b8339fcd8201361f552db4d7223f74eb72 - FirebaseSharedSwift: ee4344de8a4d5b5290de3600667307a44f85fd40 - GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215 - GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca + FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031 + FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + FirebasePerformance: 9071eb99f3ed135defc1c145391a82edb98e0b93 + FirebaseRemoteConfig: e3ae5500b92e813f3a0b12fa09701a26441dfc95 + FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1 + FirebaseSessions: f4692789e770bec66ce17d772c0e9561c4f11737 + FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 + GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe + GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 diff --git a/storage/LegacyStorageQuickstart/Podfile.lock b/storage/LegacyStorageQuickstart/Podfile.lock index a438ed2f7..b1ec21250 100644 --- a/storage/LegacyStorageQuickstart/Podfile.lock +++ b/storage/LegacyStorageQuickstart/Podfile.lock @@ -1,28 +1,28 @@ PODS: - - FirebaseAppCheckInterop (12.1.0) - - FirebaseAuth (12.1.0): - - FirebaseAppCheckInterop (~> 12.1.0) - - FirebaseAuthInterop (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) + - FirebaseAppCheckInterop (12.2.0) + - FirebaseAuth (12.2.0): + - FirebaseAppCheckInterop (~> 12.2.0) + - FirebaseAuthInterop (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.1.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseAuthInterop (12.2.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreExtension (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseStorage (12.1.0): - - FirebaseAppCheckInterop (~> 12.1.0) - - FirebaseAuthInterop (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) + - FirebaseStorage (12.2.0): + - FirebaseAppCheckInterop (~> 12.2.0) + - FirebaseAuthInterop (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - GoogleUtilities/AppDelegateSwizzler (8.1.0): @@ -67,13 +67,13 @@ SPEC REPOS: - RecaptchaInterop SPEC CHECKSUMS: - FirebaseAppCheckInterop: de890554a81967f16a0eb8d3def541c2bb42dece - FirebaseAuth: 6d0f2d449195c401e6d6ef1a891fff22bc60356d - FirebaseAuthInterop: ede927b03baf02453e6e9de2df513cc28d3eb742 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreExtension: dd89d73548ee9be5d8dc60e5c76bc421b965853b - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee - FirebaseStorage: 91432ddfb31e83de1e9fa5833b4399b39bc722f7 + FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 + FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 + FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseStorage: f1578d57e1fd3683fc05f5d4d7b24b7490b321ac GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMSessionFetcher: 02d6e866e90bc236f48a703a041dfe43e6221a29 RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba diff --git a/swiftui/PasswordlessSwiftUI/Podfile.lock b/swiftui/PasswordlessSwiftUI/Podfile.lock index e7d626b3e..d285d2a7b 100644 --- a/swiftui/PasswordlessSwiftUI/Podfile.lock +++ b/swiftui/PasswordlessSwiftUI/Podfile.lock @@ -1,22 +1,22 @@ PODS: - - FirebaseAppCheckInterop (12.1.0) - - FirebaseAuth (12.1.0): - - FirebaseAppCheckInterop (~> 12.1.0) - - FirebaseAuthInterop (~> 12.1.0) - - FirebaseCore (~> 12.1.0) - - FirebaseCoreExtension (~> 12.1.0) + - FirebaseAppCheckInterop (12.2.0) + - FirebaseAuth (12.2.0): + - FirebaseAppCheckInterop (~> 12.2.0) + - FirebaseAuthInterop (~> 12.2.0) + - FirebaseCore (~> 12.2.0) + - FirebaseCoreExtension (~> 12.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.1.0) - - FirebaseCore (12.1.0): - - FirebaseCoreInternal (~> 12.1.0) + - FirebaseAuthInterop (12.2.0) + - FirebaseCore (12.2.0): + - FirebaseCoreInternal (~> 12.2.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.1.0): - - FirebaseCore (~> 12.1.0) - - FirebaseCoreInternal (12.1.0): + - FirebaseCoreExtension (12.2.0): + - FirebaseCore (~> 12.2.0) + - FirebaseCoreInternal (12.2.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - GoogleUtilities/AppDelegateSwizzler (8.1.0): - GoogleUtilities/Environment @@ -58,12 +58,12 @@ SPEC REPOS: - RecaptchaInterop SPEC CHECKSUMS: - FirebaseAppCheckInterop: de890554a81967f16a0eb8d3def541c2bb42dece - FirebaseAuth: 6d0f2d449195c401e6d6ef1a891fff22bc60356d - FirebaseAuthInterop: ede927b03baf02453e6e9de2df513cc28d3eb742 - FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090 - FirebaseCoreExtension: dd89d73548ee9be5d8dc60e5c76bc421b965853b - FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee + FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 + FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 + FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 + FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd + FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 + FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMSessionFetcher: 02d6e866e90bc236f48a703a041dfe43e6221a29 RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba From b6508807318a2abb13a9139f71060aba698a9ca7 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Sun, 7 Sep 2025 13:16:22 -0400 Subject: [PATCH 22/56] refactor(storage): Move storage qs to root of storage directory --- storage/{StorageExample => }/Shared/ContentView.swift | 0 storage/{StorageExample => }/Shared/ImagePicker.swift | 0 storage/{StorageExample => }/Shared/StorageExampleApp.swift | 0 storage/{StorageExample => }/Shared/ViewModel.swift | 0 .../Assets.xcassets/AccentColor.colorset/Contents.json | 0 .../Assets.xcassets/AppIcon.appiconset/Contents.json | 0 .../StorageExample (iOS)/Assets.xcassets/Contents.json | 0 .../Preview Content/Preview Assets.xcassets/Contents.json | 0 .../Assets.xcassets/AccentColor.colorset/Contents.json | 0 .../Assets.xcassets/AppIcon.appiconset/Contents.json | 0 .../StorageExample (macOS)/Assets.xcassets/Contents.json | 0 .../Preview Content/Preview Assets.xcassets/Contents.json | 0 .../StorageExample (macOS)/StorageExample__macOS_.entitlements | 0 .../Assets.xcassets/AccentColor.colorset/Contents.json | 0 .../Back.imagestacklayer/Content.imageset/Contents.json | 0 .../Back.imagestacklayer/Contents.json | 0 .../App Icon - App Store.imagestack/Contents.json | 0 .../Front.imagestacklayer/Content.imageset/Contents.json | 0 .../Front.imagestacklayer/Contents.json | 0 .../Middle.imagestacklayer/Content.imageset/Contents.json | 0 .../Middle.imagestacklayer/Contents.json | 0 .../Back.imagestacklayer/Content.imageset/Contents.json | 0 .../App Icon.imagestack/Back.imagestacklayer/Contents.json | 0 .../App Icon.imagestack/Contents.json | 0 .../Front.imagestacklayer/Content.imageset/Contents.json | 0 .../App Icon.imagestack/Front.imagestacklayer/Contents.json | 0 .../Middle.imagestacklayer/Content.imageset/Contents.json | 0 .../App Icon.imagestack/Middle.imagestacklayer/Contents.json | 0 .../App Icon & Top Shelf Image.brandassets/Contents.json | 0 .../Top Shelf Image Wide.imageset/Contents.json | 0 .../Top Shelf Image.imageset/Contents.json | 0 .../StorageExample (tvOS)/Assets.xcassets/Contents.json | 0 .../Preview Content/Preview Assets.xcassets/Contents.json | 0 .../{StorageExample => }/StorageExample.xcodeproj/project.pbxproj | 0 34 files changed, 0 insertions(+), 0 deletions(-) rename storage/{StorageExample => }/Shared/ContentView.swift (100%) rename storage/{StorageExample => }/Shared/ImagePicker.swift (100%) rename storage/{StorageExample => }/Shared/StorageExampleApp.swift (100%) rename storage/{StorageExample => }/Shared/ViewModel.swift (100%) rename storage/{StorageExample => }/StorageExample (iOS)/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (iOS)/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (iOS)/Assets.xcassets/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (iOS)/Preview Content/Preview Assets.xcassets/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (macOS)/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (macOS)/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (macOS)/Assets.xcassets/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (macOS)/Preview Content/Preview Assets.xcassets/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (macOS)/StorageExample__macOS_.entitlements (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Assets.xcassets/Contents.json (100%) rename storage/{StorageExample => }/StorageExample (tvOS)/Preview Content/Preview Assets.xcassets/Contents.json (100%) rename storage/{StorageExample => }/StorageExample.xcodeproj/project.pbxproj (100%) diff --git a/storage/StorageExample/Shared/ContentView.swift b/storage/Shared/ContentView.swift similarity index 100% rename from storage/StorageExample/Shared/ContentView.swift rename to storage/Shared/ContentView.swift diff --git a/storage/StorageExample/Shared/ImagePicker.swift b/storage/Shared/ImagePicker.swift similarity index 100% rename from storage/StorageExample/Shared/ImagePicker.swift rename to storage/Shared/ImagePicker.swift diff --git a/storage/StorageExample/Shared/StorageExampleApp.swift b/storage/Shared/StorageExampleApp.swift similarity index 100% rename from storage/StorageExample/Shared/StorageExampleApp.swift rename to storage/Shared/StorageExampleApp.swift diff --git a/storage/StorageExample/Shared/ViewModel.swift b/storage/Shared/ViewModel.swift similarity index 100% rename from storage/StorageExample/Shared/ViewModel.swift rename to storage/Shared/ViewModel.swift diff --git a/storage/StorageExample/StorageExample (iOS)/Assets.xcassets/AccentColor.colorset/Contents.json b/storage/StorageExample (iOS)/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (iOS)/Assets.xcassets/AccentColor.colorset/Contents.json rename to storage/StorageExample (iOS)/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/storage/StorageExample/StorageExample (iOS)/Assets.xcassets/AppIcon.appiconset/Contents.json b/storage/StorageExample (iOS)/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (iOS)/Assets.xcassets/AppIcon.appiconset/Contents.json rename to storage/StorageExample (iOS)/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/storage/StorageExample/StorageExample (iOS)/Assets.xcassets/Contents.json b/storage/StorageExample (iOS)/Assets.xcassets/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (iOS)/Assets.xcassets/Contents.json rename to storage/StorageExample (iOS)/Assets.xcassets/Contents.json diff --git a/storage/StorageExample/StorageExample (iOS)/Preview Content/Preview Assets.xcassets/Contents.json b/storage/StorageExample (iOS)/Preview Content/Preview Assets.xcassets/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (iOS)/Preview Content/Preview Assets.xcassets/Contents.json rename to storage/StorageExample (iOS)/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/storage/StorageExample/StorageExample (macOS)/Assets.xcassets/AccentColor.colorset/Contents.json b/storage/StorageExample (macOS)/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (macOS)/Assets.xcassets/AccentColor.colorset/Contents.json rename to storage/StorageExample (macOS)/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/storage/StorageExample/StorageExample (macOS)/Assets.xcassets/AppIcon.appiconset/Contents.json b/storage/StorageExample (macOS)/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (macOS)/Assets.xcassets/AppIcon.appiconset/Contents.json rename to storage/StorageExample (macOS)/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/storage/StorageExample/StorageExample (macOS)/Assets.xcassets/Contents.json b/storage/StorageExample (macOS)/Assets.xcassets/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (macOS)/Assets.xcassets/Contents.json rename to storage/StorageExample (macOS)/Assets.xcassets/Contents.json diff --git a/storage/StorageExample/StorageExample (macOS)/Preview Content/Preview Assets.xcassets/Contents.json b/storage/StorageExample (macOS)/Preview Content/Preview Assets.xcassets/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (macOS)/Preview Content/Preview Assets.xcassets/Contents.json rename to storage/StorageExample (macOS)/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/storage/StorageExample/StorageExample (macOS)/StorageExample__macOS_.entitlements b/storage/StorageExample (macOS)/StorageExample__macOS_.entitlements similarity index 100% rename from storage/StorageExample/StorageExample (macOS)/StorageExample__macOS_.entitlements rename to storage/StorageExample (macOS)/StorageExample__macOS_.entitlements diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/AccentColor.colorset/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/AccentColor.colorset/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/Contents.json b/storage/StorageExample (tvOS)/Assets.xcassets/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Assets.xcassets/Contents.json rename to storage/StorageExample (tvOS)/Assets.xcassets/Contents.json diff --git a/storage/StorageExample/StorageExample (tvOS)/Preview Content/Preview Assets.xcassets/Contents.json b/storage/StorageExample (tvOS)/Preview Content/Preview Assets.xcassets/Contents.json similarity index 100% rename from storage/StorageExample/StorageExample (tvOS)/Preview Content/Preview Assets.xcassets/Contents.json rename to storage/StorageExample (tvOS)/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/storage/StorageExample/StorageExample.xcodeproj/project.pbxproj b/storage/StorageExample.xcodeproj/project.pbxproj similarity index 100% rename from storage/StorageExample/StorageExample.xcodeproj/project.pbxproj rename to storage/StorageExample.xcodeproj/project.pbxproj From 50a095996997a014cefe271114949675eaaa5a97 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Sun, 7 Sep 2025 21:43:50 -0400 Subject: [PATCH 23/56] Auto-update dependencies. --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 914353498..626cab3c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,7 +90,7 @@ GEM netrc (0.11.0) nkf (0.2.0) public_suffix (4.0.7) - rexml (3.4.2) + rexml (3.4.3) ruby-macho (2.5.1) securerandom (0.3.2) typhoeus (1.4.1) From 0b31b4ac5ce8d0b15e17145e460164eb386ed4a1 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Mon, 8 Sep 2025 11:29:11 -0400 Subject: [PATCH 24/56] scheme logic --- scripts/test.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index bbc78fb45..c34186941 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -69,7 +69,23 @@ fi # Set scheme if [[ -z "${SCHEME:-}" ]]; then if [[ "$SPM" == true ]];then - SCHEME="${SAMPLE}Example (${OS})" + # Get the list of schemes + schemes=$(xcodebuild -list -project "${DIR}/${SAMPLE}Example.xcodeproj" | + grep -E '^\s+' | + sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + + # Check for the base scheme name + if echo "$schemes" | grep -q "^${SAMPLE}Example$"; then + SCHEME="${SAMPLE}Example" + # Check for the OS-suffixed scheme name + elif echo "$schemes" | grep -q "^${SAMPLE}Example (${OS})$"; then + SCHEME="${SAMPLE}Example (${OS})" + else + echo "Error: Could not find a suitable scheme for ${SAMPLE}Example in ${OS}." + echo "Available schemes:" + echo "$schemes" + exit 1 + fi else SCHEME="${SAMPLE}Example${SWIFT_SUFFIX:-}" fi From 7f273e30dd3b34d7dc796042a854d31a673cbc7d Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Mon, 8 Sep 2025 11:52:01 -0400 Subject: [PATCH 25/56] abtesting warning fixes --- abtesting/Shared/AppConfig.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/abtesting/Shared/AppConfig.swift b/abtesting/Shared/AppConfig.swift index b180eefe9..41b7ec08f 100644 --- a/abtesting/Shared/AppConfig.swift +++ b/abtesting/Shared/AppConfig.swift @@ -22,7 +22,7 @@ class AppConfig: ObservableObject { @Published var colorScheme: ColorScheme init() { - let value = RemoteConfig.remoteConfig()["color_scheme"].stringValue ?? "nil" + let value = RemoteConfig.remoteConfig()["color_scheme"].stringValue colorScheme = ColorScheme(value) #if !targetEnvironment(macCatalyst) && DEBUG NotificationCenter.default.addObserver(self, @@ -38,13 +38,13 @@ class AppConfig: ObservableObject { func updateFromRemoteConfig() { let remoteConfig = RemoteConfig.remoteConfig() - let oldValue = remoteConfig["color_scheme"].stringValue ?? "nil" + let oldValue = remoteConfig["color_scheme"].stringValue remoteConfig.fetchAndActivate { status, error in print("Fetch-and-activate completed with status: \(status.debugDescription)") if let error = error { print("Error fetching and activating config: \(error)") } else { - let newValue = remoteConfig["color_scheme"].stringValue ?? "nil" + let newValue = remoteConfig["color_scheme"].stringValue if newValue != oldValue { print("Remote Config changed to: \(newValue)") DispatchQueue.main.async { self.colorScheme = ColorScheme(newValue) } @@ -59,11 +59,11 @@ class AppConfig: ObservableObject { @available(iOS 15, tvOS 15, macOS 12, watchOS 8, *) func updateFromRemoteConfigAsync() async { let remoteConfig = RemoteConfig.remoteConfig() - let oldValue = remoteConfig["color_scheme"].stringValue ?? "nil" + let oldValue = remoteConfig["color_scheme"].stringValue do { let status = try await remoteConfig.fetchAndActivate() print("Fetch-and-activate completed with status: \(status.debugDescription)") - let newValue = remoteConfig["color_scheme"].stringValue ?? "nil" + let newValue = remoteConfig["color_scheme"].stringValue if newValue != oldValue { print("Remote Config changed to: \(newValue)") Task.detached { @MainActor in self.colorScheme = ColorScheme(newValue) } From 7f27d686d2b18bfb3437a2a9d9d17b89fd5e1947 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Mon, 8 Sep 2025 12:35:58 -0400 Subject: [PATCH 26/56] maybe revert: source_root --- database/DatabaseExample.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/DatabaseExample.xcodeproj/project.pbxproj b/database/DatabaseExample.xcodeproj/project.pbxproj index 9f63f04fa..a48f9b55f 100644 --- a/database/DatabaseExample.xcodeproj/project.pbxproj +++ b/database/DatabaseExample.xcodeproj/project.pbxproj @@ -365,7 +365,7 @@ ); name = Shared; path = ../shared; - sourceTree = ""; + sourceTree = SOURCE_ROOT; }; 5FDE05591B0DAA090037B82F /* DatabaseExampleTests */ = { isa = PBXGroup; From f4731f4afe21e244a00d9d6917a26452b7e3ce68 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Mon, 8 Sep 2025 12:57:31 -0400 Subject: [PATCH 27/56] Revert "maybe revert: source_root" This reverts commit 7f27d686d2b18bfb3437a2a9d9d17b89fd5e1947. --- database/DatabaseExample.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/DatabaseExample.xcodeproj/project.pbxproj b/database/DatabaseExample.xcodeproj/project.pbxproj index a48f9b55f..9f63f04fa 100644 --- a/database/DatabaseExample.xcodeproj/project.pbxproj +++ b/database/DatabaseExample.xcodeproj/project.pbxproj @@ -365,7 +365,7 @@ ); name = Shared; path = ../shared; - sourceTree = SOURCE_ROOT; + sourceTree = ""; }; 5FDE05591B0DAA090037B82F /* DatabaseExampleTests */ = { isa = PBXGroup; From 1564f34c18982b6a8fe7d96a74af7993d0dc3c7b Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Mon, 8 Sep 2025 14:14:22 -0400 Subject: [PATCH 28/56] fix storage plist location --- storage/StorageExample.xcodeproj/project.pbxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/storage/StorageExample.xcodeproj/project.pbxproj b/storage/StorageExample.xcodeproj/project.pbxproj index d2915a199..d9254044d 100644 --- a/storage/StorageExample.xcodeproj/project.pbxproj +++ b/storage/StorageExample.xcodeproj/project.pbxproj @@ -11,14 +11,12 @@ 864F1ABA2A964D27009743F2 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 864F1AB92A964D27009743F2 /* FirebaseStorage */; }; 864F1ABC2A964D31009743F2 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 864F1ABB2A964D31009743F2 /* FirebaseStorage */; }; B9380F7627E3EEBD00B5C769 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = B9380F7527E3EEBD00B5C769 /* FirebaseAuth */; }; - B9380F7A27E3FABA00B5C769 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B9380F7927E3FABA00B5C769 /* GoogleService-Info.plist */; }; B94D0AC327F5060D00753EEA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B94D0AC227F5060D00753EEA /* Assets.xcassets */; }; B94D0AC627F5060D00753EEA /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B94D0AC527F5060D00753EEA /* Preview Assets.xcassets */; }; B94D0ACB27F506C000753EEA /* StorageExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = B983CA1527F21B1D00E4E201 /* StorageExampleApp.swift */; }; B94D0ACC27F506C600753EEA /* ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B983CA1627F21B1D00E4E201 /* ViewModel.swift */; }; B94D0ACD27F506CC00753EEA /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B983CA1827F21B1D00E4E201 /* ContentView.swift */; }; B94D0ACF27F5075900753EEA /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = B94D0ACE27F5075900753EEA /* FirebaseAuth */; }; - B94D0AD227F5157400753EEA /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B9380F7927E3FABA00B5C769 /* GoogleService-Info.plist */; }; B94D0AD327F52FBB00753EEA /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B983CA1727F21B1D00E4E201 /* ImagePicker.swift */; }; B983CA1927F21B1D00E4E201 /* StorageExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = B983CA1527F21B1D00E4E201 /* StorageExampleApp.swift */; }; B983CA1A27F21B1D00E4E201 /* ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B983CA1627F21B1D00E4E201 /* ViewModel.swift */; }; @@ -33,11 +31,12 @@ B9EABE3527FB83CD00E055FD /* ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B983CA1627F21B1D00E4E201 /* ViewModel.swift */; }; B9EABE3627FB83D100E055FD /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B983CA1827F21B1D00E4E201 /* ContentView.swift */; }; B9EABE3727FB83D100E055FD /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B983CA1727F21B1D00E4E201 /* ImagePicker.swift */; }; - B9EABE3827FB9B2700E055FD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B9380F7927E3FABA00B5C769 /* GoogleService-Info.plist */; }; + EA4A29E82E6F543800B647BC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = EA4A29E72E6F543800B647BC /* GoogleService-Info.plist */; }; + EA4A29E92E6F543800B647BC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = EA4A29E72E6F543800B647BC /* GoogleService-Info.plist */; }; + EA4A29EA2E6F543800B647BC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = EA4A29E72E6F543800B647BC /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - B9380F7927E3FABA00B5C769 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../GoogleService-Info.plist"; sourceTree = ""; }; B94D0ABC27F5060C00753EEA /* StorageExample (macOS).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "StorageExample (macOS).app"; sourceTree = BUILT_PRODUCTS_DIR; }; B94D0AC227F5060D00753EEA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; B94D0AC527F5060D00753EEA /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; @@ -52,6 +51,7 @@ B9EABE2127FB82B200E055FD /* StorageExample (tvOS).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "StorageExample (tvOS).app"; sourceTree = BUILT_PRODUCTS_DIR; }; B9EABE2727FB82B300E055FD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; B9EABE2A27FB82B300E055FD /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; + EA4A29E72E6F543800B647BC /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -117,7 +117,7 @@ B9A598B127E3D169003BCFD0 = { isa = PBXGroup; children = ( - B9380F7927E3FABA00B5C769 /* GoogleService-Info.plist */, + EA4A29E72E6F543800B647BC /* GoogleService-Info.plist */, B983CA1427F21B1D00E4E201 /* Shared */, B9A598BC27E3D169003BCFD0 /* StorageExample (iOS) */, B94D0ABD27F5060C00753EEA /* StorageExample (macOS) */, @@ -296,7 +296,7 @@ files = ( B94D0AC627F5060D00753EEA /* Preview Assets.xcassets in Resources */, B94D0AC327F5060D00753EEA /* Assets.xcassets in Resources */, - B94D0AD227F5157400753EEA /* GoogleService-Info.plist in Resources */, + EA4A29EA2E6F543800B647BC /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -306,7 +306,7 @@ files = ( B9A598C527E3D16A003BCFD0 /* Preview Assets.xcassets in Resources */, B9A598C227E3D16A003BCFD0 /* Assets.xcassets in Resources */, - B9380F7A27E3FABA00B5C769 /* GoogleService-Info.plist in Resources */, + EA4A29E92E6F543800B647BC /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -316,7 +316,7 @@ files = ( B9EABE2B27FB82B300E055FD /* Preview Assets.xcassets in Resources */, B9EABE2827FB82B300E055FD /* Assets.xcassets in Resources */, - B9EABE3827FB9B2700E055FD /* GoogleService-Info.plist in Resources */, + EA4A29E82E6F543800B647BC /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; From 0da362db4cef51c6de11b8eecc00feb6ec15cdb6 Mon Sep 17 00:00:00 2001 From: DPEBot Date: Wed, 10 Sep 2025 21:10:16 -0700 Subject: [PATCH 29/56] Auto-update dependencies. (#1759) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 626cab3c6..2b8cf4a09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,7 +90,7 @@ GEM netrc (0.11.0) nkf (0.2.0) public_suffix (4.0.7) - rexml (3.4.3) + rexml (3.4.4) ruby-macho (2.5.1) securerandom (0.3.2) typhoeus (1.4.1) From 1ba7ac48cca9c741c22e2a9c56710d8c22fc73c3 Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Mon, 15 Sep 2025 16:21:51 -0400 Subject: [PATCH 30/56] [CI] Add support for macOS / Xcode 26 in `test.sh` (#1761) --- .github/workflows/firebaseai.yml | 21 ++++++++++++++------- scripts/test.sh | 17 ++++++++++++----- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/.github/workflows/firebaseai.yml b/.github/workflows/firebaseai.yml index eb3357cdb..65378ba39 100644 --- a/.github/workflows/firebaseai.yml +++ b/.github/workflows/firebaseai.yml @@ -1,5 +1,8 @@ name: firebaseai +permissions: + contents: read + on: pull_request: paths: @@ -19,20 +22,24 @@ env: jobs: spm: - name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }}) - runs-on: macOS-15 + name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.platform }}) strategy: matrix: - xcode: ["16.4"] - os: [iOS] include: - - os: iOS + - os: macos-15 + xcode: "16.4" + platform: iOS device: iPhone 16 + - os: macos-26 + xcode: "26.0" + platform: iOS + device: iPhone 16e + runs-on: ${{ matrix.os }} env: SETUP: firebaseai SPM: true DIR: firebaseai - OS: ${{ matrix.os }} + OS: ${{ matrix.platform }} DEVICE: ${{ matrix.device }} TEST: false XCODE_VERSION: ${{ matrix.xcode }} @@ -45,5 +52,5 @@ jobs: gem install xcpretty - name: Placeholder GoogleService-Info.plist good enough for build only testing. run: cp ./mock-GoogleService-Info.plist ./firebaseai/GoogleService-Info.plist - - name: Build and Test SwiftUI (${{ matrix.os }}) + - name: Build and Test SwiftUI (${{ matrix.platform }}) run: ./scripts/test.sh diff --git a/scripts/test.sh b/scripts/test.sh index bbc78fb45..283035efa 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -20,12 +20,19 @@ set -euo pipefail -if [ -d "/Applications/Xcode_16.4.app" ]; then - xcode_version="16.4" - iphone_version="16" +xcode_version=$(xcodebuild -version | grep Xcode) +xcode_version="${xcode_version/Xcode /}" +xcode_major="${xcode_version/.*/}" + +if [[ "$xcode_major" -ge 26 ]]; then + iphone_version="17" +elif [[ "$xcode_major" -ge 16 ]]; then + iphone_version="16" +elif [[ "$xcode_major" -ge 15 ]]; then + iphone_version="15" else - xcode_version="15.3" - iphone_version="15" + echo "Unsupported Xcode version $xcode_version; exiting." 1>&2 + exit 1 fi # Set default parameters From ef7c1c7c0c3961f14b415de0af33e098f4dc6f9a Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Mon, 15 Sep 2025 16:57:42 -0400 Subject: [PATCH 31/56] Remove Xcode 15 support from test script (#1762) Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> --- scripts/test.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index 283035efa..6fcf43687 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -28,8 +28,6 @@ if [[ "$xcode_major" -ge 26 ]]; then iphone_version="17" elif [[ "$xcode_major" -ge 16 ]]; then iphone_version="16" -elif [[ "$xcode_major" -ge 15 ]]; then - iphone_version="15" else echo "Unsupported Xcode version $xcode_version; exiting." 1>&2 exit 1 From ef3953d1d234a7b033e2ed0c01d7dcec76ce07f6 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Mon, 15 Sep 2025 21:43:42 -0400 Subject: [PATCH 32/56] Auto-update dependencies. --- .../LegacyABTestingQuickstart/Podfile.lock | 83 ++++++------- .../LegacyAnalyticsQuickstart/Podfile.lock | 55 ++++----- analytics/Podfile.lock | 55 ++++----- appdistribution/Podfile.lock | 63 +++++----- .../LegacyAuthQuickstart/Podfile.lock | 81 ++++++------- authentication/Podfile.lock | 81 ++++++------- config/LegacyConfigQuickstart/Podfile.lock | 44 +++---- config/Podfile.lock | 44 +++---- .../LegacyCrashlyticsQuickstart/Podfile.lock | 48 ++++---- database/Podfile.lock | 50 ++++---- firestore/Podfile.lock | 60 +++++----- .../LegacyFunctionsQuickstart/Podfile.lock | 105 +++++++++-------- inappmessaging/Podfile.lock | 71 +++++------ installations/Podfile.lock | 16 +-- messaging/Podfile.lock | 63 +++++----- performance/Podfile.lock | 111 +++++++++--------- storage/LegacyStorageQuickstart/Podfile.lock | 48 ++++---- swiftui/PasswordlessSwiftUI/Podfile.lock | 36 +++--- 18 files changed, 562 insertions(+), 552 deletions(-) diff --git a/abtesting/LegacyABTestingQuickstart/Podfile.lock b/abtesting/LegacyABTestingQuickstart/Podfile.lock index 856622f38..01de1d336 100644 --- a/abtesting/LegacyABTestingQuickstart/Podfile.lock +++ b/abtesting/LegacyABTestingQuickstart/Podfile.lock @@ -1,66 +1,67 @@ PODS: - - FirebaseABTesting (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseAnalytics (12.2.0): - - FirebaseAnalytics/Default (= 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseABTesting (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseAnalytics (12.3.0): + - FirebaseAnalytics/Default (= 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - GoogleAppMeasurement/Default (= 12.2.0) + - FirebaseAnalytics/Default (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - GoogleAppMeasurement/Default (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseRemoteConfig (12.2.0): - - FirebaseABTesting (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - FirebaseRemoteConfigInterop (~> 12.2.0) - - FirebaseSharedSwift (~> 12.2.0) + - FirebaseRemoteConfig (12.3.0): + - FirebaseABTesting (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - FirebaseRemoteConfigInterop (~> 12.3.0) + - FirebaseSharedSwift (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseRemoteConfigInterop (12.2.0) - - FirebaseSharedSwift (12.2.0) - - GoogleAdsOnDeviceConversion (2.3.0): + - FirebaseRemoteConfigInterop (12.3.0) + - FirebaseSharedSwift (12.3.0) + - GoogleAdsOnDeviceConversion (3.0.0): + - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.2.0): + - GoogleAppMeasurement/Core (12.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.2.0): - - GoogleAdsOnDeviceConversion (= 2.3.0) - - GoogleAppMeasurement/Core (= 12.2.0) - - GoogleAppMeasurement/IdentitySupport (= 12.2.0) + - GoogleAppMeasurement/Default (12.3.0): + - GoogleAdsOnDeviceConversion (~> 3.0.0) + - GoogleAppMeasurement/Core (= 12.3.0) + - GoogleAppMeasurement/IdentitySupport (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.2.0): - - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (12.3.0): + - GoogleAppMeasurement/Core (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -121,16 +122,16 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031 - FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - FirebaseRemoteConfig: e3ae5500b92e813f3a0b12fa09701a26441dfc95 - FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1 - FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 - GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe - GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af + FirebaseABTesting: 6e748dfecb81a49539c030adb5b12263acf62865 + FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + FirebaseRemoteConfig: 4f4785cfc62e3e3b2f3715d1b7e41ade5ac0419e + FirebaseRemoteConfigInterop: 66d61ad6cee1cd2137cb8dedf468112e9ba92c6a + FirebaseSharedSwift: a08758c5e2617f3ebb47865b45ecca6f02cd35ea + GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261 + GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/analytics/LegacyAnalyticsQuickstart/Podfile.lock b/analytics/LegacyAnalyticsQuickstart/Podfile.lock index 3be81b9a5..0702c227f 100644 --- a/analytics/LegacyAnalyticsQuickstart/Podfile.lock +++ b/analytics/LegacyAnalyticsQuickstart/Podfile.lock @@ -1,54 +1,55 @@ PODS: - - FirebaseAnalytics (12.2.0): - - FirebaseAnalytics/Default (= 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseAnalytics (12.3.0): + - FirebaseAnalytics/Default (= 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - GoogleAppMeasurement/Default (= 12.2.0) + - FirebaseAnalytics/Default (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - GoogleAppMeasurement/Default (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.3.0): + - GoogleAdsOnDeviceConversion (3.0.0): + - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.2.0): + - GoogleAppMeasurement/Core (12.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.2.0): - - GoogleAdsOnDeviceConversion (= 2.3.0) - - GoogleAppMeasurement/Core (= 12.2.0) - - GoogleAppMeasurement/IdentitySupport (= 12.2.0) + - GoogleAppMeasurement/Default (12.3.0): + - GoogleAdsOnDeviceConversion (~> 3.0.0) + - GoogleAppMeasurement/Core (= 12.3.0) + - GoogleAppMeasurement/IdentitySupport (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.2.0): - - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (12.3.0): + - GoogleAppMeasurement/Core (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -104,12 +105,12 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe - GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af + FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261 + GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/analytics/Podfile.lock b/analytics/Podfile.lock index 4294a5431..e0e606d72 100644 --- a/analytics/Podfile.lock +++ b/analytics/Podfile.lock @@ -1,54 +1,55 @@ PODS: - - FirebaseAnalytics (12.2.0): - - FirebaseAnalytics/Default (= 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseAnalytics (12.3.0): + - FirebaseAnalytics/Default (= 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - GoogleAppMeasurement/Default (= 12.2.0) + - FirebaseAnalytics/Default (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - GoogleAppMeasurement/Default (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.3.0): + - GoogleAdsOnDeviceConversion (3.0.0): + - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.2.0): + - GoogleAppMeasurement/Core (12.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.2.0): - - GoogleAdsOnDeviceConversion (= 2.3.0) - - GoogleAppMeasurement/Core (= 12.2.0) - - GoogleAppMeasurement/IdentitySupport (= 12.2.0) + - GoogleAppMeasurement/Default (12.3.0): + - GoogleAdsOnDeviceConversion (~> 3.0.0) + - GoogleAppMeasurement/Core (= 12.3.0) + - GoogleAppMeasurement/IdentitySupport (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.2.0): - - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (12.3.0): + - GoogleAppMeasurement/Core (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -104,12 +105,12 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe - GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af + FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261 + GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/appdistribution/Podfile.lock b/appdistribution/Podfile.lock index 5ff87b4b1..eef1fc78a 100644 --- a/appdistribution/Podfile.lock +++ b/appdistribution/Podfile.lock @@ -1,59 +1,60 @@ PODS: - - FirebaseAnalytics (12.2.0): - - FirebaseAnalytics/Default (= 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseAnalytics (12.3.0): + - FirebaseAnalytics/Default (= 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - GoogleAppMeasurement/Default (= 12.2.0) + - FirebaseAnalytics/Default (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - GoogleAppMeasurement/Default (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAppDistribution (12.2.0-beta): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseAppDistribution (12.3.0-beta): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.3.0): + - GoogleAdsOnDeviceConversion (3.0.0): + - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.2.0): + - GoogleAppMeasurement/Core (12.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.2.0): - - GoogleAdsOnDeviceConversion (= 2.3.0) - - GoogleAppMeasurement/Core (= 12.2.0) - - GoogleAppMeasurement/IdentitySupport (= 12.2.0) + - GoogleAppMeasurement/Default (12.3.0): + - GoogleAdsOnDeviceConversion (~> 3.0.0) + - GoogleAppMeasurement/Core (= 12.3.0) + - GoogleAppMeasurement/IdentitySupport (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.2.0): - - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (12.3.0): + - GoogleAppMeasurement/Core (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -111,13 +112,13 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 - FirebaseAppDistribution: 468c75794945e899fe5ab2b7991dbd3dca110745 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe - GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af + FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae + FirebaseAppDistribution: 3fde0890a124a057ba11189cad34839d599173f7 + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261 + GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/authentication/LegacyAuthQuickstart/Podfile.lock b/authentication/LegacyAuthQuickstart/Podfile.lock index 06da0ac67..3e48b5b58 100644 --- a/authentication/LegacyAuthQuickstart/Podfile.lock +++ b/authentication/LegacyAuthQuickstart/Podfile.lock @@ -17,69 +17,70 @@ PODS: - FBSDKCoreKit_Basics (18.0.1) - FBSDKLoginKit (18.0.1): - FBSDKCoreKit (= 18.0.1) - - FirebaseAnalytics (12.2.0): - - FirebaseAnalytics/Default (= 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseAnalytics (12.3.0): + - FirebaseAnalytics/Default (= 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - GoogleAppMeasurement/Default (= 12.2.0) + - FirebaseAnalytics/Default (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - GoogleAppMeasurement/Default (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAppCheckInterop (12.2.0) - - FirebaseAuth (12.2.0): - - FirebaseAppCheckInterop (~> 12.2.0) - - FirebaseAuthInterop (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) + - FirebaseAppCheckInterop (12.3.0) + - FirebaseAuth (12.3.0): + - FirebaseAppCheckInterop (~> 12.3.0) + - FirebaseAuthInterop (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.2.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseAuthInterop (12.3.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreExtension (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.3.0): + - GoogleAdsOnDeviceConversion (3.0.0): + - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.2.0): + - GoogleAppMeasurement/Core (12.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.2.0): - - GoogleAdsOnDeviceConversion (= 2.3.0) - - GoogleAppMeasurement/Core (= 12.2.0) - - GoogleAppMeasurement/IdentitySupport (= 12.2.0) + - GoogleAppMeasurement/Default (12.3.0): + - GoogleAdsOnDeviceConversion (~> 3.0.0) + - GoogleAppMeasurement/Core (= 12.3.0) + - GoogleAppMeasurement/IdentitySupport (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.2.0): - - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (12.3.0): + - GoogleAppMeasurement/Core (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -168,16 +169,16 @@ SPEC CHECKSUMS: FBSDKCoreKit: 7f96852f2539bdb88ba8d47e5ab4ae70a6f8d691 FBSDKCoreKit_Basics: 22d4c1a509ded4e45116f3bb167a14907550f62e FBSDKLoginKit: f48c06446995cd209332831f692cea28b26e51da - FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 - FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 - FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 - FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe - GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af + FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae + FirebaseAppCheckInterop: 3a8527abb8bb89fb1bd2bd3d1d7b463c0ceb0cbf + FirebaseAuth: 4fdd7ee2da745f79145124f5191639d2ea756a77 + FirebaseAuthInterop: a7c394818a93d374c543ca085f3a46ab7c71372e + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreExtension: 898ca55c7cb126f83747b32cb0daa95394b10853 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261 + GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238 diff --git a/authentication/Podfile.lock b/authentication/Podfile.lock index e8a9a46ab..7a1715bb0 100644 --- a/authentication/Podfile.lock +++ b/authentication/Podfile.lock @@ -17,69 +17,70 @@ PODS: - FBSDKCoreKit_Basics (18.0.1) - FBSDKLoginKit (18.0.1): - FBSDKCoreKit (= 18.0.1) - - FirebaseAnalytics (12.2.0): - - FirebaseAnalytics/Default (= 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseAnalytics (12.3.0): + - FirebaseAnalytics/Default (= 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - GoogleAppMeasurement/Default (= 12.2.0) + - FirebaseAnalytics/Default (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - GoogleAppMeasurement/Default (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAppCheckInterop (12.2.0) - - FirebaseAuth (12.2.0): - - FirebaseAppCheckInterop (~> 12.2.0) - - FirebaseAuthInterop (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) + - FirebaseAppCheckInterop (12.3.0) + - FirebaseAuth (12.3.0): + - FirebaseAppCheckInterop (~> 12.3.0) + - FirebaseAuthInterop (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.2.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseAuthInterop (12.3.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreExtension (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.3.0): + - GoogleAdsOnDeviceConversion (3.0.0): + - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.2.0): + - GoogleAppMeasurement/Core (12.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.2.0): - - GoogleAdsOnDeviceConversion (= 2.3.0) - - GoogleAppMeasurement/Core (= 12.2.0) - - GoogleAppMeasurement/IdentitySupport (= 12.2.0) + - GoogleAppMeasurement/Default (12.3.0): + - GoogleAdsOnDeviceConversion (~> 3.0.0) + - GoogleAppMeasurement/Core (= 12.3.0) + - GoogleAppMeasurement/IdentitySupport (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.2.0): - - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (12.3.0): + - GoogleAppMeasurement/Core (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -168,16 +169,16 @@ SPEC CHECKSUMS: FBSDKCoreKit: 7f96852f2539bdb88ba8d47e5ab4ae70a6f8d691 FBSDKCoreKit_Basics: 22d4c1a509ded4e45116f3bb167a14907550f62e FBSDKLoginKit: f48c06446995cd209332831f692cea28b26e51da - FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 - FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 - FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 - FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe - GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af + FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae + FirebaseAppCheckInterop: 3a8527abb8bb89fb1bd2bd3d1d7b463c0ceb0cbf + FirebaseAuth: 4fdd7ee2da745f79145124f5191639d2ea756a77 + FirebaseAuthInterop: a7c394818a93d374c543ca085f3a46ab7c71372e + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreExtension: 898ca55c7cb126f83747b32cb0daa95394b10853 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261 + GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238 diff --git a/config/LegacyConfigQuickstart/Podfile.lock b/config/LegacyConfigQuickstart/Podfile.lock index c69a53040..1fe3c2089 100644 --- a/config/LegacyConfigQuickstart/Podfile.lock +++ b/config/LegacyConfigQuickstart/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - FirebaseABTesting (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseABTesting (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseRemoteConfig (12.2.0): - - FirebaseABTesting (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - FirebaseRemoteConfigInterop (~> 12.2.0) - - FirebaseSharedSwift (~> 12.2.0) + - FirebaseRemoteConfig (12.3.0): + - FirebaseABTesting (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - FirebaseRemoteConfigInterop (~> 12.3.0) + - FirebaseSharedSwift (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseRemoteConfigInterop (12.2.0) - - FirebaseSharedSwift (12.2.0) + - FirebaseRemoteConfigInterop (12.3.0) + - FirebaseSharedSwift (12.3.0) - GoogleUtilities/Environment (8.1.0): - GoogleUtilities/Privacy - GoogleUtilities/Logger (8.1.0): @@ -51,13 +51,13 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - FirebaseRemoteConfig: e3ae5500b92e813f3a0b12fa09701a26441dfc95 - FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1 - FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 + FirebaseABTesting: 6e748dfecb81a49539c030adb5b12263acf62865 + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + FirebaseRemoteConfig: 4f4785cfc62e3e3b2f3715d1b7e41ade5ac0419e + FirebaseRemoteConfigInterop: 66d61ad6cee1cd2137cb8dedf468112e9ba92c6a + FirebaseSharedSwift: a08758c5e2617f3ebb47865b45ecca6f02cd35ea GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/config/Podfile.lock b/config/Podfile.lock index 67c198a8a..2ea90ce9a 100644 --- a/config/Podfile.lock +++ b/config/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - FirebaseABTesting (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseABTesting (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseRemoteConfig (12.2.0): - - FirebaseABTesting (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - FirebaseRemoteConfigInterop (~> 12.2.0) - - FirebaseSharedSwift (~> 12.2.0) + - FirebaseRemoteConfig (12.3.0): + - FirebaseABTesting (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - FirebaseRemoteConfigInterop (~> 12.3.0) + - FirebaseSharedSwift (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseRemoteConfigInterop (12.2.0) - - FirebaseSharedSwift (12.2.0) + - FirebaseRemoteConfigInterop (12.3.0) + - FirebaseSharedSwift (12.3.0) - GoogleUtilities/Environment (8.1.0): - GoogleUtilities/Privacy - GoogleUtilities/Logger (8.1.0): @@ -51,13 +51,13 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - FirebaseRemoteConfig: e3ae5500b92e813f3a0b12fa09701a26441dfc95 - FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1 - FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 + FirebaseABTesting: 6e748dfecb81a49539c030adb5b12263acf62865 + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + FirebaseRemoteConfig: 4f4785cfc62e3e3b2f3715d1b7e41ade5ac0419e + FirebaseRemoteConfigInterop: 66d61ad6cee1cd2137cb8dedf468112e9ba92c6a + FirebaseSharedSwift: a08758c5e2617f3ebb47865b45ecca6f02cd35ea GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/crashlytics/LegacyCrashlyticsQuickstart/Podfile.lock b/crashlytics/LegacyCrashlyticsQuickstart/Podfile.lock index 1435aeea3..6a44ea8f3 100644 --- a/crashlytics/LegacyCrashlyticsQuickstart/Podfile.lock +++ b/crashlytics/LegacyCrashlyticsQuickstart/Podfile.lock @@ -1,31 +1,31 @@ PODS: - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreExtension (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseCrashlytics (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - FirebaseRemoteConfigInterop (~> 12.2.0) - - FirebaseSessions (~> 12.2.0) + - FirebaseCrashlytics (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - FirebaseRemoteConfigInterop (~> 12.3.0) + - FirebaseSessions (~> 12.3.0) - GoogleDataTransport (~> 10.1) - GoogleUtilities/Environment (~> 8.1) - nanopb (~> 3.30910.0) - PromisesObjC (~> 2.4) - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseRemoteConfigInterop (12.2.0) - - FirebaseSessions (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseRemoteConfigInterop (12.3.0) + - FirebaseSessions (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleDataTransport (~> 10.1) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) @@ -76,13 +76,13 @@ SPEC REPOS: - ReachabilitySwift SPEC CHECKSUMS: - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseCrashlytics: f83cbf176d5c637ade108c0aacf1ccbd5ec499bf - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1 - FirebaseSessions: f4692789e770bec66ce17d772c0e9561c4f11737 + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreExtension: 898ca55c7cb126f83747b32cb0daa95394b10853 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseCrashlytics: a2a9947c0c265575a98213e7c25b0d777f6921b3 + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + FirebaseRemoteConfigInterop: 66d61ad6cee1cd2137cb8dedf468112e9ba92c6a + FirebaseSessions: 352b204966530e5cb7036c02d8c366922210e681 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 diff --git a/database/Podfile.lock b/database/Podfile.lock index c1e0f164a..a1f2aadf3 100644 --- a/database/Podfile.lock +++ b/database/Podfile.lock @@ -1,32 +1,32 @@ PODS: - - FirebaseAppCheckInterop (12.2.0) - - FirebaseAuth (12.2.0): - - FirebaseAppCheckInterop (~> 12.2.0) - - FirebaseAuthInterop (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) + - FirebaseAppCheckInterop (12.3.0) + - FirebaseAuth (12.3.0): + - FirebaseAppCheckInterop (~> 12.3.0) + - FirebaseAuthInterop (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.2.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseAuthInterop (12.3.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreExtension (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseDatabase (12.2.0): - - FirebaseAppCheckInterop (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseSharedSwift (~> 12.2.0) + - FirebaseDatabase (12.3.0): + - FirebaseAppCheckInterop (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseSharedSwift (~> 12.3.0) - GoogleUtilities/UserDefaults (~> 8.1) - leveldb-library (~> 1.22) - FirebaseDatabaseUI (15.1.0): - FirebaseDatabase (< 13.0, >= 8.0) - - FirebaseSharedSwift (12.2.0) + - FirebaseSharedSwift (12.3.0) - FirebaseUI/Database (15.1.0): - FirebaseDatabaseUI (~> 15.0) - GoogleUtilities/AppDelegateSwizzler (8.1.0): @@ -80,15 +80,15 @@ SPEC REPOS: - RecaptchaInterop SPEC CHECKSUMS: - FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 - FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 - FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseDatabase: d7f6b8dc187fe7e72db1c1e2b03a7611d8ec2813 + FirebaseAppCheckInterop: 3a8527abb8bb89fb1bd2bd3d1d7b463c0ceb0cbf + FirebaseAuth: 4fdd7ee2da745f79145124f5191639d2ea756a77 + FirebaseAuthInterop: a7c394818a93d374c543ca085f3a46ab7c71372e + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreExtension: 898ca55c7cb126f83747b32cb0daa95394b10853 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseDatabase: 7e976df55e05b91b354b1e02ea483c2e302bee46 FirebaseDatabaseUI: 5280abb5536ee0947e23ab8aaf009342b78a5eb2 - FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 + FirebaseSharedSwift: a08758c5e2617f3ebb47865b45ecca6f02cd35ea FirebaseUI: 1dfcf45d4bb4073380091394c9c555d697ecca11 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMSessionFetcher: 02d6e866e90bc236f48a703a041dfe43e6221a29 diff --git a/firestore/Podfile.lock b/firestore/Podfile.lock index 19eee1890..16dbcd0f5 100644 --- a/firestore/Podfile.lock +++ b/firestore/Podfile.lock @@ -1194,39 +1194,39 @@ PODS: - BoringSSL-GRPC/Implementation (0.0.37): - BoringSSL-GRPC/Interface (= 0.0.37) - BoringSSL-GRPC/Interface (0.0.37) - - FirebaseAppCheckInterop (12.2.0) - - FirebaseAuth (12.2.0): - - FirebaseAppCheckInterop (~> 12.2.0) - - FirebaseAuthInterop (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) + - FirebaseAppCheckInterop (12.3.0) + - FirebaseAuth (12.3.0): + - FirebaseAppCheckInterop (~> 12.3.0) + - FirebaseAuthInterop (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.2.0) + - FirebaseAuthInterop (12.3.0) - FirebaseAuthUI (15.1.0): - FirebaseAuth (< 13.0, >= 11.0) - FirebaseCore - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreExtension (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - FirebaseEmailAuthUI (15.1.0): - FirebaseAuth - FirebaseAuthUI (~> 15.0) - FirebaseCore - GoogleUtilities/UserDefaults - - FirebaseFirestore (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) - - FirebaseFirestoreInternal (~> 12.2.0) - - FirebaseSharedSwift (~> 12.2.0) - - FirebaseFirestoreInternal (12.2.0): + - FirebaseFirestore (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) + - FirebaseFirestoreInternal (~> 12.3.0) + - FirebaseSharedSwift (~> 12.3.0) + - FirebaseFirestoreInternal (12.3.0): - abseil/algorithm (~> 1.20240722.0) - abseil/base (~> 1.20240722.0) - abseil/container/flat_hash_map (~> 1.20240722.0) @@ -1235,13 +1235,13 @@ PODS: - abseil/strings/strings (~> 1.20240722.0) - abseil/time (~> 1.20240722.0) - abseil/types (~> 1.20240722.0) - - FirebaseAppCheckInterop (~> 12.2.0) - - FirebaseCore (~> 12.2.0) + - FirebaseAppCheckInterop (~> 12.3.0) + - FirebaseCore (~> 12.3.0) - "gRPC-C++ (~> 1.69.0)" - gRPC-Core (~> 1.69.0) - leveldb-library (~> 1.22) - nanopb (~> 3.30910.0) - - FirebaseSharedSwift (12.2.0) + - FirebaseSharedSwift (12.3.0) - FirebaseUI/Auth (15.1.0): - FirebaseAuthUI (~> 15.0) - FirebaseUI/Email (15.1.0): @@ -1413,17 +1413,17 @@ SPEC REPOS: SPEC CHECKSUMS: abseil: a05cc83bf02079535e17169a73c5be5ba47f714b BoringSSL-GRPC: dded2a44897e45f28f08ae87a55ee4bcd19bc508 - FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 - FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 - FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 + FirebaseAppCheckInterop: 3a8527abb8bb89fb1bd2bd3d1d7b463c0ceb0cbf + FirebaseAuth: 4fdd7ee2da745f79145124f5191639d2ea756a77 + FirebaseAuthInterop: a7c394818a93d374c543ca085f3a46ab7c71372e FirebaseAuthUI: c574e8904bd14503ff47e55ba2fc9ec64aacaed6 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreExtension: 898ca55c7cb126f83747b32cb0daa95394b10853 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf FirebaseEmailAuthUI: b6c80ac6ae42bacf2fece92762fa79bc4ee736ed - FirebaseFirestore: 2baa1360623e942007726627653d43a5bc618ba8 - FirebaseFirestoreInternal: 6506aef21ac270bf137c34cd7283723d930eddb0 - FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 + FirebaseFirestore: 93138b63239303eeb035d922920f4e48216f0c2d + FirebaseFirestoreInternal: 81150153b7b25b5eee4633cc5c7f08ab83bda966 + FirebaseSharedSwift: a08758c5e2617f3ebb47865b45ecca6f02cd35ea FirebaseUI: 1dfcf45d4bb4073380091394c9c555d697ecca11 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 "gRPC-C++": cc207623316fb041a7a3e774c252cf68a058b9e8 diff --git a/functions/LegacyFunctionsQuickstart/Podfile.lock b/functions/LegacyFunctionsQuickstart/Podfile.lock index a60c35f45..018d6256f 100644 --- a/functions/LegacyFunctionsQuickstart/Podfile.lock +++ b/functions/LegacyFunctionsQuickstart/Podfile.lock @@ -9,91 +9,92 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FirebaseAnalytics (12.2.0): - - FirebaseAnalytics/Default (= 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseAnalytics (12.3.0): + - FirebaseAnalytics/Default (= 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - GoogleAppMeasurement/Default (= 12.2.0) + - FirebaseAnalytics/Default (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - GoogleAppMeasurement/Default (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAppCheckInterop (12.2.0) - - FirebaseAuth (12.2.0): - - FirebaseAppCheckInterop (~> 12.2.0) - - FirebaseAuthInterop (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) + - FirebaseAppCheckInterop (12.3.0) + - FirebaseAuth (12.3.0): + - FirebaseAppCheckInterop (~> 12.3.0) + - FirebaseAuthInterop (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.2.0) + - FirebaseAuthInterop (12.3.0) - FirebaseAuthUI (15.1.0): - FirebaseAuth (< 13.0, >= 11.0) - FirebaseCore - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreExtension (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseFunctions (12.2.0): - - FirebaseAppCheckInterop (~> 12.2.0) - - FirebaseAuthInterop (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) - - FirebaseMessagingInterop (~> 12.2.0) - - FirebaseSharedSwift (~> 12.2.0) + - FirebaseFunctions (12.3.0): + - FirebaseAppCheckInterop (~> 12.3.0) + - FirebaseAuthInterop (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) + - FirebaseMessagingInterop (~> 12.3.0) + - FirebaseSharedSwift (~> 12.3.0) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - FirebaseGoogleAuthUI (15.1.0): - FirebaseAuth - FirebaseAuthUI (~> 15.0) - FirebaseCore - GoogleSignIn (~> 8.0) - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseMessagingInterop (12.2.0) - - FirebaseSharedSwift (12.2.0) + - FirebaseMessagingInterop (12.3.0) + - FirebaseSharedSwift (12.3.0) - FirebaseUI/Auth (15.1.0): - FirebaseAuthUI (~> 15.0) - FirebaseUI/Google (15.1.0): - FirebaseGoogleAuthUI (~> 15.0) - - GoogleAdsOnDeviceConversion (2.3.0): + - GoogleAdsOnDeviceConversion (3.0.0): + - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.2.0): + - GoogleAppMeasurement/Core (12.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.2.0): - - GoogleAdsOnDeviceConversion (= 2.3.0) - - GoogleAppMeasurement/Core (= 12.2.0) - - GoogleAppMeasurement/IdentitySupport (= 12.2.0) + - GoogleAppMeasurement/Default (12.3.0): + - GoogleAdsOnDeviceConversion (~> 3.0.0) + - GoogleAppMeasurement/Core (= 12.3.0) + - GoogleAppMeasurement/IdentitySupport (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.2.0): - - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (12.3.0): + - GoogleAppMeasurement/Core (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -284,22 +285,22 @@ SPEC REPOS: SPEC CHECKSUMS: AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73 AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f - FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 - FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 - FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 - FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 + FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae + FirebaseAppCheckInterop: 3a8527abb8bb89fb1bd2bd3d1d7b463c0ceb0cbf + FirebaseAuth: 4fdd7ee2da745f79145124f5191639d2ea756a77 + FirebaseAuthInterop: a7c394818a93d374c543ca085f3a46ab7c71372e FirebaseAuthUI: c574e8904bd14503ff47e55ba2fc9ec64aacaed6 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseFunctions: fc68f7e566da9b2eb714f66bc9e633d3111da7fb + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreExtension: 898ca55c7cb126f83747b32cb0daa95394b10853 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseFunctions: 7ed4b5e4834c9cf6db02753723ee29fce3f5f440 FirebaseGoogleAuthUI: 740a15519a36b4d15802c4ef1db4aaeb7f7bad0b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - FirebaseMessagingInterop: 913e21aa8526740cd2ac17b30e89dd3e56ff112e - FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + FirebaseMessagingInterop: f5ed999a2c51bd454beb9f75a5f966b321660884 + FirebaseSharedSwift: a08758c5e2617f3ebb47865b45ecca6f02cd35ea FirebaseUI: 1dfcf45d4bb4073380091394c9c555d697ecca11 - GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe - GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af + GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261 + GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e GoogleSignIn: ce8c89bb9b37fb624b92e7514cc67335d1e277e4 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de diff --git a/inappmessaging/Podfile.lock b/inappmessaging/Podfile.lock index ca26e490e..084aac263 100644 --- a/inappmessaging/Podfile.lock +++ b/inappmessaging/Podfile.lock @@ -1,63 +1,64 @@ PODS: - - FirebaseABTesting (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseAnalytics (12.2.0): - - FirebaseAnalytics/Default (= 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseABTesting (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseAnalytics (12.3.0): + - FirebaseAnalytics/Default (= 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - GoogleAppMeasurement/Default (= 12.2.0) + - FirebaseAnalytics/Default (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - GoogleAppMeasurement/Default (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInAppMessaging (12.2.0-beta): - - FirebaseABTesting (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseInAppMessaging (12.3.0-beta): + - FirebaseABTesting (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - nanopb (~> 3.30910.0) - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - GoogleAdsOnDeviceConversion (2.3.0): + - GoogleAdsOnDeviceConversion (3.0.0): + - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.2.0): + - GoogleAppMeasurement/Core (12.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.2.0): - - GoogleAdsOnDeviceConversion (= 2.3.0) - - GoogleAppMeasurement/Core (= 12.2.0) - - GoogleAppMeasurement/IdentitySupport (= 12.2.0) + - GoogleAppMeasurement/Default (12.3.0): + - GoogleAdsOnDeviceConversion (~> 3.0.0) + - GoogleAppMeasurement/Core (= 12.3.0) + - GoogleAppMeasurement/IdentitySupport (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.2.0): - - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (12.3.0): + - GoogleAppMeasurement/Core (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -116,14 +117,14 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031 - FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInAppMessaging: fecba63d44c5cd8f874e9d661a5aa5047380c7d0 - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe - GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af + FirebaseABTesting: 6e748dfecb81a49539c030adb5b12263acf62865 + FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInAppMessaging: 6680461dced3c6270fb221c72e8c21f625c6779d + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261 + GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/installations/Podfile.lock b/installations/Podfile.lock index a4c5a6993..5363e3f43 100644 --- a/installations/Podfile.lock +++ b/installations/Podfile.lock @@ -1,12 +1,12 @@ PODS: - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) @@ -35,9 +35,9 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/messaging/Podfile.lock b/messaging/Podfile.lock index de82ef2cf..e779026b0 100644 --- a/messaging/Podfile.lock +++ b/messaging/Podfile.lock @@ -1,63 +1,64 @@ PODS: - - FirebaseAnalytics (12.2.0): - - FirebaseAnalytics/Default (= 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseAnalytics (12.3.0): + - FirebaseAnalytics/Default (= 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - GoogleAppMeasurement/Default (= 12.2.0) + - FirebaseAnalytics/Default (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - GoogleAppMeasurement/Default (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseMessaging (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseMessaging (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleDataTransport (~> 10.1) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Reachability (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAdsOnDeviceConversion (2.3.0): + - GoogleAdsOnDeviceConversion (3.0.0): + - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.2.0): + - GoogleAppMeasurement/Core (12.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.2.0): - - GoogleAdsOnDeviceConversion (= 2.3.0) - - GoogleAppMeasurement/Core (= 12.2.0) - - GoogleAppMeasurement/IdentitySupport (= 12.2.0) + - GoogleAppMeasurement/Default (12.3.0): + - GoogleAdsOnDeviceConversion (~> 3.0.0) + - GoogleAppMeasurement/Core (= 12.3.0) + - GoogleAppMeasurement/IdentitySupport (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.2.0): - - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (12.3.0): + - GoogleAppMeasurement/Core (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -119,13 +120,13 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - FirebaseMessaging: 43ec73bbfedd0c385a849bb91593ab4ad4b9e48e - GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe - GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af + FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + FirebaseMessaging: 919ce76cb353f0c36d463f5461d8ab584e6ed765 + GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261 + GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 diff --git a/performance/Podfile.lock b/performance/Podfile.lock index 9b818c8d5..9d50015bb 100644 --- a/performance/Podfile.lock +++ b/performance/Podfile.lock @@ -1,87 +1,88 @@ PODS: - - FirebaseABTesting (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseAnalytics (12.2.0): - - FirebaseAnalytics/Default (= 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseABTesting (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseAnalytics (12.3.0): + - FirebaseAnalytics/Default (= 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - GoogleAppMeasurement/Default (= 12.2.0) + - FirebaseAnalytics/Default (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - GoogleAppMeasurement/Default (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreExtension (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.2.0): - - FirebaseCore (~> 12.2.0) + - FirebaseInstallations (12.3.0): + - FirebaseCore (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebasePerformance (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - FirebaseRemoteConfig (~> 12.2.0) - - FirebaseSessions (~> 12.2.0) + - FirebasePerformance (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - FirebaseRemoteConfig (~> 12.3.0) + - FirebaseSessions (~> 12.3.0) - GoogleDataTransport (~> 10.1) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - nanopb (~> 3.30910.0) - - FirebaseRemoteConfig (12.2.0): - - FirebaseABTesting (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) - - FirebaseRemoteConfigInterop (~> 12.2.0) - - FirebaseSharedSwift (~> 12.2.0) + - FirebaseRemoteConfig (12.3.0): + - FirebaseABTesting (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) + - FirebaseRemoteConfigInterop (~> 12.3.0) + - FirebaseSharedSwift (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseRemoteConfigInterop (12.2.0) - - FirebaseSessions (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) - - FirebaseInstallations (~> 12.2.0) + - FirebaseRemoteConfigInterop (12.3.0) + - FirebaseSessions (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) + - FirebaseInstallations (~> 12.3.0) - GoogleDataTransport (~> 10.1) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/UserDefaults (~> 8.1) - nanopb (~> 3.30910.0) - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (12.2.0) - - GoogleAdsOnDeviceConversion (2.3.0): + - FirebaseSharedSwift (12.3.0) + - GoogleAdsOnDeviceConversion (3.0.0): + - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.2.0): + - GoogleAppMeasurement/Core (12.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.2.0): - - GoogleAdsOnDeviceConversion (= 2.3.0) - - GoogleAppMeasurement/Core (= 12.2.0) - - GoogleAppMeasurement/IdentitySupport (= 12.2.0) + - GoogleAppMeasurement/Default (12.3.0): + - GoogleAdsOnDeviceConversion (~> 3.0.0) + - GoogleAppMeasurement/Core (= 12.3.0) + - GoogleAppMeasurement/IdentitySupport (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.2.0): - - GoogleAppMeasurement/Core (= 12.2.0) + - GoogleAppMeasurement/IdentitySupport (12.3.0): + - GoogleAppMeasurement/Core (= 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/MethodSwizzler (~> 8.1) - GoogleUtilities/Network (~> 8.1) @@ -152,19 +153,19 @@ SPEC REPOS: - PromisesSwift SPEC CHECKSUMS: - FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031 - FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed - FirebasePerformance: 9071eb99f3ed135defc1c145391a82edb98e0b93 - FirebaseRemoteConfig: e3ae5500b92e813f3a0b12fa09701a26441dfc95 - FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1 - FirebaseSessions: f4692789e770bec66ce17d772c0e9561c4f11737 - FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25 - GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe - GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af + FirebaseABTesting: 6e748dfecb81a49539c030adb5b12263acf62865 + FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreExtension: 898ca55c7cb126f83747b32cb0daa95394b10853 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5 + FirebasePerformance: 12f8e5e26b7b7ae91db36e5fcd01e0c8b323e364 + FirebaseRemoteConfig: 4f4785cfc62e3e3b2f3715d1b7e41ade5ac0419e + FirebaseRemoteConfigInterop: 66d61ad6cee1cd2137cb8dedf468112e9ba92c6a + FirebaseSessions: 352b204966530e5cb7036c02d8c366922210e681 + FirebaseSharedSwift: a08758c5e2617f3ebb47865b45ecca6f02cd35ea + GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261 + GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 diff --git a/storage/LegacyStorageQuickstart/Podfile.lock b/storage/LegacyStorageQuickstart/Podfile.lock index b1ec21250..a34066be8 100644 --- a/storage/LegacyStorageQuickstart/Podfile.lock +++ b/storage/LegacyStorageQuickstart/Podfile.lock @@ -1,28 +1,28 @@ PODS: - - FirebaseAppCheckInterop (12.2.0) - - FirebaseAuth (12.2.0): - - FirebaseAppCheckInterop (~> 12.2.0) - - FirebaseAuthInterop (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) + - FirebaseAppCheckInterop (12.3.0) + - FirebaseAuth (12.3.0): + - FirebaseAppCheckInterop (~> 12.3.0) + - FirebaseAuthInterop (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.2.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseAuthInterop (12.3.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreExtension (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseStorage (12.2.0): - - FirebaseAppCheckInterop (~> 12.2.0) - - FirebaseAuthInterop (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) + - FirebaseStorage (12.3.0): + - FirebaseAppCheckInterop (~> 12.3.0) + - FirebaseAuthInterop (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - GoogleUtilities/AppDelegateSwizzler (8.1.0): @@ -67,13 +67,13 @@ SPEC REPOS: - RecaptchaInterop SPEC CHECKSUMS: - FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 - FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 - FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b - FirebaseStorage: f1578d57e1fd3683fc05f5d4d7b24b7490b321ac + FirebaseAppCheckInterop: 3a8527abb8bb89fb1bd2bd3d1d7b463c0ceb0cbf + FirebaseAuth: 4fdd7ee2da745f79145124f5191639d2ea756a77 + FirebaseAuthInterop: a7c394818a93d374c543ca085f3a46ab7c71372e + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreExtension: 898ca55c7cb126f83747b32cb0daa95394b10853 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf + FirebaseStorage: 23c8869d6e9d93f159766c4f81f6ead6410aff4f GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMSessionFetcher: 02d6e866e90bc236f48a703a041dfe43e6221a29 RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba diff --git a/swiftui/PasswordlessSwiftUI/Podfile.lock b/swiftui/PasswordlessSwiftUI/Podfile.lock index d285d2a7b..227bb47d8 100644 --- a/swiftui/PasswordlessSwiftUI/Podfile.lock +++ b/swiftui/PasswordlessSwiftUI/Podfile.lock @@ -1,22 +1,22 @@ PODS: - - FirebaseAppCheckInterop (12.2.0) - - FirebaseAuth (12.2.0): - - FirebaseAppCheckInterop (~> 12.2.0) - - FirebaseAuthInterop (~> 12.2.0) - - FirebaseCore (~> 12.2.0) - - FirebaseCoreExtension (~> 12.2.0) + - FirebaseAppCheckInterop (12.3.0) + - FirebaseAuth (12.3.0): + - FirebaseAppCheckInterop (~> 12.3.0) + - FirebaseAuthInterop (~> 12.3.0) + - FirebaseCore (~> 12.3.0) + - FirebaseCoreExtension (~> 12.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 6.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.2.0) - - FirebaseCore (12.2.0): - - FirebaseCoreInternal (~> 12.2.0) + - FirebaseAuthInterop (12.3.0) + - FirebaseCore (12.3.0): + - FirebaseCoreInternal (~> 12.3.0) - GoogleUtilities/Environment (~> 8.1) - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.2.0): - - FirebaseCore (~> 12.2.0) - - FirebaseCoreInternal (12.2.0): + - FirebaseCoreExtension (12.3.0): + - FirebaseCore (~> 12.3.0) + - FirebaseCoreInternal (12.3.0): - "GoogleUtilities/NSData+zlib (~> 8.1)" - GoogleUtilities/AppDelegateSwizzler (8.1.0): - GoogleUtilities/Environment @@ -58,12 +58,12 @@ SPEC REPOS: - RecaptchaInterop SPEC CHECKSUMS: - FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678 - FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4 - FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16 - FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd - FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5 - FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b + FirebaseAppCheckInterop: 3a8527abb8bb89fb1bd2bd3d1d7b463c0ceb0cbf + FirebaseAuth: 4fdd7ee2da745f79145124f5191639d2ea756a77 + FirebaseAuthInterop: a7c394818a93d374c543ca085f3a46ab7c71372e + FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8 + FirebaseCoreExtension: 898ca55c7cb126f83747b32cb0daa95394b10853 + FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMSessionFetcher: 02d6e866e90bc236f48a703a041dfe43e6221a29 RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba From bf44964e495d2b49591e65b5962299f2ee3b0d84 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Sep 2025 11:15:26 -0400 Subject: [PATCH 33/56] Restore analytics.yml --- .github/workflows/analytics.yml | 79 +++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 .github/workflows/analytics.yml diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml new file mode 100644 index 000000000..e31a6576f --- /dev/null +++ b/.github/workflows/analytics.yml @@ -0,0 +1,79 @@ +name: Analytics + +on: + push: + branches: [ main ] + paths: + - '.github/workflows/analytics.yml' + - 'analytics/**' + - 'scripts/*' + - 'scripts/analytics.sh' + pull_request: + branches: [ main ] + paths: + - '.github/workflows/analytics.yml' + - 'analytics/**' + - 'scripts/*' + - 'scripts/analytics.sh' + + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + cancel-in-progress: true + +env: + SAMPLE: Analytics + secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} + +jobs: + cocoapods: + name: cocoapods - ${{ matrix.os }} + runs-on: macOS-15 + strategy: + matrix: + # TODO: Re-enable when ODM2 catalyst support is investigated + # os: [iOS, catalyst, tvOS, macOS] + os: [iOS, tvOS, macOS] + xcode: ["16.4"] + include: + - os: iOS + device: iPhone 16 + test: true + # TODO: Re-enable when ODM2 catalyst support is investigated + # - os: catalyst + # device: localhost + # test: false # disabled due to a permissions error on launch (OSStatus -54). + - os: tvOS + device: Apple TV 4K (3rd generation) (at 1080p) + scheme: AnalyticsExampleTV + test: true + - os: macOS + device: localhost + scheme: AnalyticsExampleMac + test: true + env: + SPM: false + LEGACY: false + OS: ${{ matrix.os }} + DEVICE: ${{ matrix.device }} + SCHEME: ${{ matrix.scheme }} + DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer + steps: + - name: Checkout + uses: actions/checkout@master + - name: Setup + run: | + cd analytics + gem install bundler + bundle install + gem install xcpretty + bundle exec pod install --repo-update + ../scripts/install_prereqs/analytics.sh + - name: Build Swift + run: ./scripts/test.sh + env: + TEST: ${{ matrix.test }} + SWIFT_SUFFIX: "" + + #TODO: Add `spm` job. From 4aaf45f3974f39abca0f2450bb5d0239b98dec8a Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Sep 2025 11:25:20 -0400 Subject: [PATCH 34/56] analytics CI improvements --- .github/workflows/analytics.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml index e31a6576f..4f3ad2717 100644 --- a/.github/workflows/analytics.yml +++ b/.github/workflows/analytics.yml @@ -27,8 +27,8 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - cocoapods: - name: cocoapods - ${{ matrix.os }} + spm: + name: spm - ${{ matrix.os }} runs-on: macOS-15 strategy: matrix: @@ -52,28 +52,27 @@ jobs: device: localhost scheme: AnalyticsExampleMac test: true + env: - SPM: false + SPM: true LEGACY: false OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} SCHEME: ${{ matrix.scheme }} DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer + DIR: analytics steps: - name: Checkout uses: actions/checkout@master - name: Setup run: | cd analytics - gem install bundler - bundle install gem install xcpretty - bundle exec pod install --repo-update ../scripts/install_prereqs/analytics.sh - name: Build Swift run: ./scripts/test.sh env: TEST: ${{ matrix.test }} - SWIFT_SUFFIX: "" + SCHEME: AnalyticsExample #TODO: Add `spm` job. From 1cbf5896ce40a0742619cfeb395ac108fe1388bc Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Sep 2025 11:38:47 -0400 Subject: [PATCH 35/56] add permissions --- .github/workflows/abtesting.yml | 3 +++ .github/workflows/analytics.yml | 3 +++ .github/workflows/authentication.yml | 3 +++ .github/workflows/check.yml | 3 +++ .github/workflows/config.yml | 3 +++ .github/workflows/crashlytics.yml | 3 +++ .github/workflows/database.yml | 3 +++ .github/workflows/firestore.yml | 3 +++ .github/workflows/functions.yml | 3 +++ .github/workflows/inappmessaging.yml | 3 +++ .github/workflows/installations.yml | 3 +++ .github/workflows/messaging.yml | 3 +++ .github/workflows/performance.yml | 3 +++ .github/workflows/storage.yml | 3 +++ 14 files changed, 42 insertions(+) diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml index 7fc91ff89..846de36c5 100644 --- a/.github/workflows/abtesting.yml +++ b/.github/workflows/abtesting.yml @@ -1,5 +1,8 @@ name: A/B Testing +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml index 4f3ad2717..bacd87b86 100644 --- a/.github/workflows/analytics.yml +++ b/.github/workflows/analytics.yml @@ -1,5 +1,8 @@ name: Analytics +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/authentication.yml b/.github/workflows/authentication.yml index b01ecc541..867c28e38 100644 --- a/.github/workflows/authentication.yml +++ b/.github/workflows/authentication.yml @@ -1,5 +1,8 @@ name: Authentication +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index c6e040f20..d6d92e2a8 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -1,5 +1,8 @@ name: check +permissions: + contents: read + on: pull_request: push: diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 5c02d38f6..9a0fa9640 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -1,5 +1,8 @@ name: Remote Config +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml index e4b788785..e1c17dffc 100644 --- a/.github/workflows/crashlytics.yml +++ b/.github/workflows/crashlytics.yml @@ -1,5 +1,8 @@ name: Crashlytics +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index cf05fac48..52d4e8fc6 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -1,5 +1,8 @@ name: Database +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index 2277f71df..bed1a3103 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -1,5 +1,8 @@ name: Firestore +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml index 93c0ea57e..5b3d1ae6c 100644 --- a/.github/workflows/functions.yml +++ b/.github/workflows/functions.yml @@ -1,5 +1,8 @@ name: Functions +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/inappmessaging.yml b/.github/workflows/inappmessaging.yml index 1f7f6b466..707758a2e 100644 --- a/.github/workflows/inappmessaging.yml +++ b/.github/workflows/inappmessaging.yml @@ -1,5 +1,8 @@ name: InAppMessaging +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/installations.yml b/.github/workflows/installations.yml index f178be375..d70fbad62 100644 --- a/.github/workflows/installations.yml +++ b/.github/workflows/installations.yml @@ -1,5 +1,8 @@ name: Installations +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml index f77abf9d5..aef809d49 100644 --- a/.github/workflows/messaging.yml +++ b/.github/workflows/messaging.yml @@ -1,5 +1,8 @@ name: Messaging +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index ac492a627..8e8af4424 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -1,5 +1,8 @@ name: Performance +permissions: + contents: read + on: push: branches: [ main ] diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 2cefc3bcb..fd261978d 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -1,5 +1,8 @@ name: Storage +permissions: + contents: read + on: push: branches: [ main ] From b2b0a7d8aa49d0372829c6688aa1b2800a40bc3e Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Sep 2025 12:26:56 -0400 Subject: [PATCH 36/56] Storage path fix --- .github/workflows/storage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index fd261978d..1dd193fc6 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -73,7 +73,7 @@ jobs: env: SETUP: storage SPM: true - DIR: storage/StorageExample + DIR: storage OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: false From acbdb2ad47768df11c27bf93e1a7a119ac13cc33 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Sep 2025 12:30:03 -0400 Subject: [PATCH 37/56] address nullability warnings and errors --- abtesting/Shared/AppConfig.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/abtesting/Shared/AppConfig.swift b/abtesting/Shared/AppConfig.swift index 41b7ec08f..be877e6b4 100644 --- a/abtesting/Shared/AppConfig.swift +++ b/abtesting/Shared/AppConfig.swift @@ -22,7 +22,7 @@ class AppConfig: ObservableObject { @Published var colorScheme: ColorScheme init() { - let value = RemoteConfig.remoteConfig()["color_scheme"].stringValue + let value = RemoteConfig.remoteConfig()["color_scheme"].stringValue ?? "" colorScheme = ColorScheme(value) #if !targetEnvironment(macCatalyst) && DEBUG NotificationCenter.default.addObserver(self, @@ -38,13 +38,13 @@ class AppConfig: ObservableObject { func updateFromRemoteConfig() { let remoteConfig = RemoteConfig.remoteConfig() - let oldValue = remoteConfig["color_scheme"].stringValue + let oldValue = remoteConfig["color_scheme"].stringValue ?? "" remoteConfig.fetchAndActivate { status, error in print("Fetch-and-activate completed with status: \(status.debugDescription)") if let error = error { print("Error fetching and activating config: \(error)") } else { - let newValue = remoteConfig["color_scheme"].stringValue + let newValue = remoteConfig["color_scheme"].stringValue ?? "" if newValue != oldValue { print("Remote Config changed to: \(newValue)") DispatchQueue.main.async { self.colorScheme = ColorScheme(newValue) } @@ -59,11 +59,11 @@ class AppConfig: ObservableObject { @available(iOS 15, tvOS 15, macOS 12, watchOS 8, *) func updateFromRemoteConfigAsync() async { let remoteConfig = RemoteConfig.remoteConfig() - let oldValue = remoteConfig["color_scheme"].stringValue + let oldValue = remoteConfig["color_scheme"].stringValue ?? "" do { let status = try await remoteConfig.fetchAndActivate() print("Fetch-and-activate completed with status: \(status.debugDescription)") - let newValue = remoteConfig["color_scheme"].stringValue + let newValue = remoteConfig["color_scheme"].stringValue ?? "" if newValue != oldValue { print("Remote Config changed to: \(newValue)") Task.detached { @MainActor in self.colorScheme = ColorScheme(newValue) } From f59dcb6a74982daa1ae73e754a5f93bea865370e Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Sep 2025 12:48:57 -0400 Subject: [PATCH 38/56] fix auth dev dir --- .github/workflows/authentication.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/authentication.yml b/.github/workflows/authentication.yml index 867c28e38..2ae8ce5c8 100644 --- a/.github/workflows/authentication.yml +++ b/.github/workflows/authentication.yml @@ -42,7 +42,7 @@ jobs: DEVICE: iPhone 16 TEST: false SCHEME: AuthenticationExample - DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@master From a04f60f52906aeafd4c99f5c0f6e9bd68e1251fe Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Sep 2025 14:50:47 -0400 Subject: [PATCH 39/56] showdestinations --- scripts/test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/test.sh b/scripts/test.sh index 852ed5cb9..432958127 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -154,5 +154,8 @@ function xcb() { # Run xcodebuild sudo xcode-select -s "/Applications/Xcode_${xcode_version}.app/Contents/Developer" +echo "mango start" +xcodebuild -showdestinations +echo "mango end" xcb "${flags[@]}" echo "$message" From 4b1a828404efb25280dc7166a45aa89ce783a96f Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Sep 2025 17:40:33 -0400 Subject: [PATCH 40/56] list destinations --- scripts/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index 432958127..13d6c202f 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -155,7 +155,7 @@ function xcb() { # Run xcodebuild sudo xcode-select -s "/Applications/Xcode_${xcode_version}.app/Contents/Developer" echo "mango start" -xcodebuild -showdestinations +xcodebuild -project storage/StorageExample.xcodeproj -scheme "StorageExample (tvOS)" -showdestinations echo "mango end" xcb "${flags[@]}" echo "$message" From 6841a36f138165390256e3a045e8fe735770aafb Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 13:16:46 -0400 Subject: [PATCH 41/56] Removed unused env var. Xcode should be set in workflow file --- .github/workflows/abtesting.yml | 1 - .github/workflows/analytics.yml | 1 - .github/workflows/authentication.yml | 1 - .github/workflows/crashlytics.yml | 1 - .github/workflows/database.yml | 1 - .github/workflows/firebaseai.yml | 1 - .github/workflows/functions.yml | 1 - .github/workflows/performance.yml | 1 - .github/workflows/storage.yml | 1 - 9 files changed, 9 deletions(-) diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml index 846de36c5..e746f2288 100644 --- a/.github/workflows/abtesting.yml +++ b/.github/workflows/abtesting.yml @@ -95,7 +95,6 @@ jobs: OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: ${{ matrix.test }} - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml index bacd87b86..bce69677c 100644 --- a/.github/workflows/analytics.yml +++ b/.github/workflows/analytics.yml @@ -62,7 +62,6 @@ jobs: OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} SCHEME: ${{ matrix.scheme }} - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer DIR: analytics steps: - name: Checkout diff --git a/.github/workflows/authentication.yml b/.github/workflows/authentication.yml index 2ae8ce5c8..df794b6df 100644 --- a/.github/workflows/authentication.yml +++ b/.github/workflows/authentication.yml @@ -42,7 +42,6 @@ jobs: DEVICE: iPhone 16 TEST: false SCHEME: AuthenticationExample - DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml index e1c17dffc..90d4770a4 100644 --- a/.github/workflows/crashlytics.yml +++ b/.github/workflows/crashlytics.yml @@ -82,7 +82,6 @@ jobs: OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: ${{ matrix.test }} - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 52d4e8fc6..6b50705cd 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -76,7 +76,6 @@ jobs: OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: ${{ matrix.test }} - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/firebaseai.yml b/.github/workflows/firebaseai.yml index 65378ba39..fc516bdbd 100644 --- a/.github/workflows/firebaseai.yml +++ b/.github/workflows/firebaseai.yml @@ -43,7 +43,6 @@ jobs: DEVICE: ${{ matrix.device }} TEST: false XCODE_VERSION: ${{ matrix.xcode }} - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml index 5b3d1ae6c..a62c4a612 100644 --- a/.github/workflows/functions.yml +++ b/.github/workflows/functions.yml @@ -52,7 +52,6 @@ jobs: DEVICE: ${{ matrix.device }} TEST: false XCODE_VERSION: ${{ matrix.xcode }} - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 8e8af4424..6cc54e7bc 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -78,7 +78,6 @@ jobs: DEVICE: ${{ matrix.device }} TEST: ${{ matrix.test }} XCODE_VERSION: ${{ matrix.xcode }} - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 1dd193fc6..8caebbf22 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -78,7 +78,6 @@ jobs: DEVICE: ${{ matrix.device }} TEST: false XCODE_VERSION: ${{ matrix.xcode }} - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@master From 6a96991c3df15ddbca81b9f3e3ed96804ca366c2 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 13:27:51 -0400 Subject: [PATCH 42/56] Set Xcode in ga4f --- .github/workflows/analytics.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml index bce69677c..4f59987c8 100644 --- a/.github/workflows/analytics.yml +++ b/.github/workflows/analytics.yml @@ -31,7 +31,7 @@ env: jobs: spm: - name: spm - ${{ matrix.os }} + name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }}) runs-on: macOS-15 strategy: matrix: @@ -63,9 +63,12 @@ jobs: DEVICE: ${{ matrix.device }} SCHEME: ${{ matrix.scheme }} DIR: analytics + XCODE_VERSION: ${{ matrix.xcode }} steps: - name: Checkout uses: actions/checkout@master + - name: Xcode + run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer - name: Setup run: | cd analytics From 164253b0cb9dbc6378a9c2ba3f7c19b01753e5fc Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 13:32:23 -0400 Subject: [PATCH 43/56] remove another unused env var --- .github/workflows/firebaseai.yml | 4 ++++ .github/workflows/functions.yml | 4 ++++ .github/workflows/performance.yml | 4 ++++ .github/workflows/storage.yml | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/.github/workflows/firebaseai.yml b/.github/workflows/firebaseai.yml index fc516bdbd..6d0904201 100644 --- a/.github/workflows/firebaseai.yml +++ b/.github/workflows/firebaseai.yml @@ -42,7 +42,11 @@ jobs: OS: ${{ matrix.platform }} DEVICE: ${{ matrix.device }} TEST: false +<<<<<<< Updated upstream XCODE_VERSION: ${{ matrix.xcode }} +======= + DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer +>>>>>>> Stashed changes steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml index a62c4a612..04b60ddfa 100644 --- a/.github/workflows/functions.yml +++ b/.github/workflows/functions.yml @@ -51,7 +51,11 @@ jobs: OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: false +<<<<<<< Updated upstream XCODE_VERSION: ${{ matrix.xcode }} +======= + DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer +>>>>>>> Stashed changes steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 6cc54e7bc..f14caaf5a 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -77,7 +77,11 @@ jobs: OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: ${{ matrix.test }} +<<<<<<< Updated upstream XCODE_VERSION: ${{ matrix.xcode }} +======= + DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer +>>>>>>> Stashed changes steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 8caebbf22..1b5c06e71 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -77,7 +77,11 @@ jobs: OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: false +<<<<<<< Updated upstream XCODE_VERSION: ${{ matrix.xcode }} +======= + DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer +>>>>>>> Stashed changes steps: - name: Checkout uses: actions/checkout@master From 7951a24c9c45c0fa338e42fea39fcebaafe86b2a Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 13:40:17 -0400 Subject: [PATCH 44/56] finish --- .github/workflows/analytics.yml | 1 - .github/workflows/firebaseai.yml | 5 ----- .github/workflows/functions.yml | 5 ----- .github/workflows/performance.yml | 5 ----- .github/workflows/storage.yml | 5 ----- 5 files changed, 21 deletions(-) diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml index 4f59987c8..6d04b0ac2 100644 --- a/.github/workflows/analytics.yml +++ b/.github/workflows/analytics.yml @@ -63,7 +63,6 @@ jobs: DEVICE: ${{ matrix.device }} SCHEME: ${{ matrix.scheme }} DIR: analytics - XCODE_VERSION: ${{ matrix.xcode }} steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/firebaseai.yml b/.github/workflows/firebaseai.yml index 6d0904201..8c31fd7bb 100644 --- a/.github/workflows/firebaseai.yml +++ b/.github/workflows/firebaseai.yml @@ -42,11 +42,6 @@ jobs: OS: ${{ matrix.platform }} DEVICE: ${{ matrix.device }} TEST: false -<<<<<<< Updated upstream - XCODE_VERSION: ${{ matrix.xcode }} -======= - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer ->>>>>>> Stashed changes steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml index 04b60ddfa..e8b3a626e 100644 --- a/.github/workflows/functions.yml +++ b/.github/workflows/functions.yml @@ -51,11 +51,6 @@ jobs: OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: false -<<<<<<< Updated upstream - XCODE_VERSION: ${{ matrix.xcode }} -======= - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer ->>>>>>> Stashed changes steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index f14caaf5a..49d565a44 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -77,11 +77,6 @@ jobs: OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: ${{ matrix.test }} -<<<<<<< Updated upstream - XCODE_VERSION: ${{ matrix.xcode }} -======= - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer ->>>>>>> Stashed changes steps: - name: Checkout uses: actions/checkout@master diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 1b5c06e71..5ae79d28d 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -77,11 +77,6 @@ jobs: OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: false -<<<<<<< Updated upstream - XCODE_VERSION: ${{ matrix.xcode }} -======= - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer ->>>>>>> Stashed changes steps: - name: Checkout uses: actions/checkout@master From ef74e21414dc6f8898301fd9cee8eabcf1556abe Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 13:59:44 -0400 Subject: [PATCH 45/56] fix ci --- .github/workflows/analytics.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml index 6d04b0ac2..b5d39ddde 100644 --- a/.github/workflows/analytics.yml +++ b/.github/workflows/analytics.yml @@ -61,7 +61,7 @@ jobs: LEGACY: false OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} - SCHEME: ${{ matrix.scheme }} + SCHEME: ${{ matrix.scheme || 'AnalyticsExample' }} DIR: analytics steps: - name: Checkout @@ -77,6 +77,5 @@ jobs: run: ./scripts/test.sh env: TEST: ${{ matrix.test }} - SCHEME: AnalyticsExample #TODO: Add `spm` job. From 3352b82259dabcb1a4ee5405d66217415444df7e Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 14:47:17 -0400 Subject: [PATCH 46/56] fix? --- .github/workflows/firebaseai.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/firebaseai.yml b/.github/workflows/firebaseai.yml index 8c31fd7bb..ea807fc9b 100644 --- a/.github/workflows/firebaseai.yml +++ b/.github/workflows/firebaseai.yml @@ -45,6 +45,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@master + - name: Xcode + run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer - name: Setup run: | gem install xcpretty From a1bf9828928b48ff18106e74b84737a003b4e0dc Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 14:51:34 -0400 Subject: [PATCH 47/56] Remove debug --- scripts/test.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index 13d6c202f..852ed5cb9 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -154,8 +154,5 @@ function xcb() { # Run xcodebuild sudo xcode-select -s "/Applications/Xcode_${xcode_version}.app/Contents/Developer" -echo "mango start" -xcodebuild -project storage/StorageExample.xcodeproj -scheme "StorageExample (tvOS)" -showdestinations -echo "mango end" xcb "${flags[@]}" echo "$message" From e44182524f1c07fca9e016836b49b62503e25cd9 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 16:51:06 -0400 Subject: [PATCH 48/56] reverse scheme detection ordering --- scripts/test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index 852ed5cb9..e5483c508 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -79,12 +79,12 @@ if [[ -z "${SCHEME:-}" ]]; then grep -E '^\s+' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - # Check for the base scheme name - if echo "$schemes" | grep -q "^${SAMPLE}Example$"; then - SCHEME="${SAMPLE}Example" # Check for the OS-suffixed scheme name - elif echo "$schemes" | grep -q "^${SAMPLE}Example (${OS})$"; then + if echo "$schemes" | grep -q "^${SAMPLE}Example (${OS})$"; then SCHEME="${SAMPLE}Example (${OS})" + # Check for the base scheme name + elif echo "$schemes" | grep -q "^${SAMPLE}Example$"; then + SCHEME="${SAMPLE}Example" else echo "Error: Could not find a suitable scheme for ${SAMPLE}Example in ${OS}." echo "Available schemes:" From e937932417d221a5157e94b3e5e2fe11d189df86 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 19:42:43 -0400 Subject: [PATCH 49/56] script updates --- scripts/test.sh | 106 ++++++++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 43 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index e5483c508..04201a40b 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -37,10 +37,10 @@ fi if [[ -z "${SPM:-}" ]]; then SPM=false echo "Defaulting to SPM=$SPM" - if [[ -z "${LEGACY:-}" ]]; then - LEGACY=false - echo "Defaulting to LEGACY=$LEGACY" - fi +fi +if [[ -z "${LEGACY:-}" ]]; then + LEGACY=false + echo "Defaulting to LEGACY=$LEGACY" fi if [[ -z "${OS:-}" ]]; then OS=iOS @@ -56,49 +56,29 @@ fi # Set have_secrets to true or false. source scripts/check_secrets.sh -# Initialize flags -flags=() - -# Set project / workspace -if [[ "$SPM" == true ]];then - flags+=( -project "${DIR}/${SAMPLE}Example.xcodeproj" ) -else - if [[ "$LEGACY" == true ]]; then - WORKSPACE="${SAMPLE}/Legacy${SAMPLE}Quickstart/${SAMPLE}Example.xcworkspace" +# Determine Project Path and OS based on LEGACY flag. +if [[ "$LEGACY" == true ]]; then + echo "Configuring for LEGACY build." + if [[ "$SPM" == true ]]; then + PROJECT_PATH="${SAMPLE}/Legacy${SAMPLE}Quickstart/${SAMPLE}Example.xcodeproj" else - WORKSPACE="${SAMPLE}/${SAMPLE}Example.xcworkspace" + WORKSPACE_PATH="${SAMPLE}/Legacy${SAMPLE}Quickstart/${SAMPLE}Example.xcworkspace" fi - flags+=( -workspace "$WORKSPACE" ) -fi - -# Set scheme -if [[ -z "${SCHEME:-}" ]]; then - if [[ "$SPM" == true ]];then - # Get the list of schemes - schemes=$(xcodebuild -list -project "${DIR}/${SAMPLE}Example.xcodeproj" | - grep -E '^\s+' | - sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - - # Check for the OS-suffixed scheme name - if echo "$schemes" | grep -q "^${SAMPLE}Example (${OS})$"; then - SCHEME="${SAMPLE}Example (${OS})" - # Check for the base scheme name - elif echo "$schemes" | grep -q "^${SAMPLE}Example$"; then - SCHEME="${SAMPLE}Example" - else - echo "Error: Could not find a suitable scheme for ${SAMPLE}Example in ${OS}." - echo "Available schemes:" - echo "$schemes" - exit 1 - fi +else + echo "Configuring for NON-LEGACY build." + if [[ "$SPM" == true ]]; then + # For non-legacy, DIR is passed from the workflow and is the product name. + # This is the same as SAMPLE. + PROJECT_PATH="${DIR}/${SAMPLE}Example.xcodeproj" else - SCHEME="${SAMPLE}Example${SWIFT_SUFFIX:-}" + WORKSPACE_PATH="${SAMPLE}/${SAMPLE}Example.xcworkspace" fi fi -flags+=( -scheme "$SCHEME" ) +# Initialize flags +flags=() -# Set destination +# Set destination (now uses the potentially overridden OS variable) if [[ "$OS" == iOS ]]; then DESTINATION="platform=iOS Simulator,name=${DEVICE}" flags+=( -destination "$DESTINATION" ) @@ -116,7 +96,6 @@ else fi # Add extra flags - if [[ "$SAMPLE" == Config ]];then flags+=( -configuration Debug ) fi @@ -148,11 +127,52 @@ else fi function xcb() { - echo xcodebuild "$@" + echo "xcodebuild $@" xcodebuild "$@" | xcpretty } # Run xcodebuild sudo xcode-select -s "/Applications/Xcode_${xcode_version}.app/Contents/Developer" -xcb "${flags[@]}" + +if [[ "$SPM" == true ]]; then + if [ ! -d "$PROJECT_PATH" ]; then + echo "Project path does not exist: $PROJECT_PATH" + exit 1 + fi + # Get all schemes from the project, excluding test bundles. + all_schemes=$(xcodebuild -list -project "$PROJECT_PATH" | + grep -E '^\s+' | + sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' | + grep -v "Tests") + + # Filter for schemes that are relevant to the current OS. + # This includes schemes with the OS in their name (e.g., "VisionProExample (visionOS)") + # and generic schemes that don't specify any OS. + filtered_schemes=$(echo "$all_schemes" | grep -E "(\(${OS}\)$)|(^((?!iOS|tvOS|macOS|watchOS|catalyst|visionOS).)*$)") + + if [ -z "$filtered_schemes" ]; then + echo "Error: Could not find any suitable schemes for ${SAMPLE}Example in ${OS}." + echo "Available schemes:" + echo "$all_schemes" + exit 1 + fi + + echo "Found schemes to build for OS ${OS}: $filtered_schemes" + for scheme in $filtered_schemes; do + echo "Building scheme: $scheme" + # Create a temporary flags array for this build + local_flags=("${flags[@]}") + local_flags+=( -project "$PROJECT_PATH" ) + local_flags+=( -scheme "$scheme" ) + xcb "${local_flags[@]}" + done +else + # Legacy workspace logic + SCHEME="${SAMPLE}Example${SWIFT_SUFFIX:-}" + local_flags=("${flags[@]}") + local_flags+=( -workspace "$WORKSPACE_PATH" ) + local_flags+=( -scheme "$SCHEME" ) + xcb "${local_flags[@]}" +fi + echo "$message" From e99536301e8709966b751126f53d3c23b0506762 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 19:52:25 -0400 Subject: [PATCH 50/56] Revert "script updates" This reverts commit e937932417d221a5157e94b3e5e2fe11d189df86. --- scripts/test.sh | 106 ++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 63 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index 04201a40b..e5483c508 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -37,10 +37,10 @@ fi if [[ -z "${SPM:-}" ]]; then SPM=false echo "Defaulting to SPM=$SPM" -fi -if [[ -z "${LEGACY:-}" ]]; then - LEGACY=false - echo "Defaulting to LEGACY=$LEGACY" + if [[ -z "${LEGACY:-}" ]]; then + LEGACY=false + echo "Defaulting to LEGACY=$LEGACY" + fi fi if [[ -z "${OS:-}" ]]; then OS=iOS @@ -56,29 +56,49 @@ fi # Set have_secrets to true or false. source scripts/check_secrets.sh -# Determine Project Path and OS based on LEGACY flag. -if [[ "$LEGACY" == true ]]; then - echo "Configuring for LEGACY build." - if [[ "$SPM" == true ]]; then - PROJECT_PATH="${SAMPLE}/Legacy${SAMPLE}Quickstart/${SAMPLE}Example.xcodeproj" +# Initialize flags +flags=() + +# Set project / workspace +if [[ "$SPM" == true ]];then + flags+=( -project "${DIR}/${SAMPLE}Example.xcodeproj" ) +else + if [[ "$LEGACY" == true ]]; then + WORKSPACE="${SAMPLE}/Legacy${SAMPLE}Quickstart/${SAMPLE}Example.xcworkspace" else - WORKSPACE_PATH="${SAMPLE}/Legacy${SAMPLE}Quickstart/${SAMPLE}Example.xcworkspace" + WORKSPACE="${SAMPLE}/${SAMPLE}Example.xcworkspace" fi -else - echo "Configuring for NON-LEGACY build." - if [[ "$SPM" == true ]]; then - # For non-legacy, DIR is passed from the workflow and is the product name. - # This is the same as SAMPLE. - PROJECT_PATH="${DIR}/${SAMPLE}Example.xcodeproj" + flags+=( -workspace "$WORKSPACE" ) +fi + +# Set scheme +if [[ -z "${SCHEME:-}" ]]; then + if [[ "$SPM" == true ]];then + # Get the list of schemes + schemes=$(xcodebuild -list -project "${DIR}/${SAMPLE}Example.xcodeproj" | + grep -E '^\s+' | + sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + + # Check for the OS-suffixed scheme name + if echo "$schemes" | grep -q "^${SAMPLE}Example (${OS})$"; then + SCHEME="${SAMPLE}Example (${OS})" + # Check for the base scheme name + elif echo "$schemes" | grep -q "^${SAMPLE}Example$"; then + SCHEME="${SAMPLE}Example" + else + echo "Error: Could not find a suitable scheme for ${SAMPLE}Example in ${OS}." + echo "Available schemes:" + echo "$schemes" + exit 1 + fi else - WORKSPACE_PATH="${SAMPLE}/${SAMPLE}Example.xcworkspace" + SCHEME="${SAMPLE}Example${SWIFT_SUFFIX:-}" fi fi -# Initialize flags -flags=() +flags+=( -scheme "$SCHEME" ) -# Set destination (now uses the potentially overridden OS variable) +# Set destination if [[ "$OS" == iOS ]]; then DESTINATION="platform=iOS Simulator,name=${DEVICE}" flags+=( -destination "$DESTINATION" ) @@ -96,6 +116,7 @@ else fi # Add extra flags + if [[ "$SAMPLE" == Config ]];then flags+=( -configuration Debug ) fi @@ -127,52 +148,11 @@ else fi function xcb() { - echo "xcodebuild $@" + echo xcodebuild "$@" xcodebuild "$@" | xcpretty } # Run xcodebuild sudo xcode-select -s "/Applications/Xcode_${xcode_version}.app/Contents/Developer" - -if [[ "$SPM" == true ]]; then - if [ ! -d "$PROJECT_PATH" ]; then - echo "Project path does not exist: $PROJECT_PATH" - exit 1 - fi - # Get all schemes from the project, excluding test bundles. - all_schemes=$(xcodebuild -list -project "$PROJECT_PATH" | - grep -E '^\s+' | - sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' | - grep -v "Tests") - - # Filter for schemes that are relevant to the current OS. - # This includes schemes with the OS in their name (e.g., "VisionProExample (visionOS)") - # and generic schemes that don't specify any OS. - filtered_schemes=$(echo "$all_schemes" | grep -E "(\(${OS}\)$)|(^((?!iOS|tvOS|macOS|watchOS|catalyst|visionOS).)*$)") - - if [ -z "$filtered_schemes" ]; then - echo "Error: Could not find any suitable schemes for ${SAMPLE}Example in ${OS}." - echo "Available schemes:" - echo "$all_schemes" - exit 1 - fi - - echo "Found schemes to build for OS ${OS}: $filtered_schemes" - for scheme in $filtered_schemes; do - echo "Building scheme: $scheme" - # Create a temporary flags array for this build - local_flags=("${flags[@]}") - local_flags+=( -project "$PROJECT_PATH" ) - local_flags+=( -scheme "$scheme" ) - xcb "${local_flags[@]}" - done -else - # Legacy workspace logic - SCHEME="${SAMPLE}Example${SWIFT_SUFFIX:-}" - local_flags=("${flags[@]}") - local_flags+=( -workspace "$WORKSPACE_PATH" ) - local_flags+=( -scheme "$SCHEME" ) - xcb "${local_flags[@]}" -fi - +xcb "${flags[@]}" echo "$message" From 87968d19121695fbfd6ad561cc07596ae0af5dae Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 20:46:26 -0400 Subject: [PATCH 51/56] test swift-suffixed scheme --- scripts/test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/test.sh b/scripts/test.sh index e5483c508..e7f5fcae0 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -82,6 +82,9 @@ if [[ -z "${SCHEME:-}" ]]; then # Check for the OS-suffixed scheme name if echo "$schemes" | grep -q "^${SAMPLE}Example (${OS})$"; then SCHEME="${SAMPLE}Example (${OS})" + # Check for the Swift-suffixed scheme + elif echo "$schemes" | grep -q "^${SAMPLE}ExampleSwift$"; then + SCHEME="${SAMPLE}ExampleSwift" # Check for the base scheme name elif echo "$schemes" | grep -q "^${SAMPLE}Example$"; then SCHEME="${SAMPLE}Example" From fc8acf5cd215ea82aa2838a09e8b5b3c0065248f Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 18 Sep 2025 21:24:15 -0400 Subject: [PATCH 52/56] xcode --- .github/workflows/abtesting.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml index e746f2288..edf9b6367 100644 --- a/.github/workflows/abtesting.yml +++ b/.github/workflows/abtesting.yml @@ -43,6 +43,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@master + - name: Xcode + run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup run: | cd abtesting/LegacyABTestingQuickstart From 1d1b3facf51e515ab9258310b72439ce933d140f Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Fri, 19 Sep 2025 11:17:25 -0400 Subject: [PATCH 53/56] minor name fixes --- .github/workflows/abtesting.yml | 1 - .github/workflows/analytics.yml | 2 -- .github/workflows/authentication.yml | 3 +-- .github/workflows/config.yml | 1 - .github/workflows/crashlytics.yml | 1 - .github/workflows/firestore.yml | 1 - .github/workflows/inappmessaging.yml | 1 - .github/workflows/installations.yml | 1 - .github/workflows/messaging.yml | 1 - .github/workflows/performance.yml | 2 +- .github/workflows/storage.yml | 1 - 11 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml index edf9b6367..06056e882 100644 --- a/.github/workflows/abtesting.yml +++ b/.github/workflows/abtesting.yml @@ -35,7 +35,6 @@ env: jobs: cocoapods: - name: cocoapods runs-on: macOS-15 env: SPM: false diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml index b5d39ddde..8021eef4d 100644 --- a/.github/workflows/analytics.yml +++ b/.github/workflows/analytics.yml @@ -77,5 +77,3 @@ jobs: run: ./scripts/test.sh env: TEST: ${{ matrix.test }} - - #TODO: Add `spm` job. diff --git a/.github/workflows/authentication.yml b/.github/workflows/authentication.yml index df794b6df..81d9da0c7 100644 --- a/.github/workflows/authentication.yml +++ b/.github/workflows/authentication.yml @@ -30,8 +30,7 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - cocoapods: - name: spm + spm: runs-on: macOS-15 env: OS: iOS diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 9a0fa9640..1699b1a4d 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -31,7 +31,6 @@ env: jobs: spm: - name: spm runs-on: macOS-15 env: OS: iOS diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml index 90d4770a4..07e5ba5bd 100644 --- a/.github/workflows/crashlytics.yml +++ b/.github/workflows/crashlytics.yml @@ -31,7 +31,6 @@ env: jobs: cocoapods: - name: cocoapods runs-on: macOS-15 env: SPM: false diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index bed1a3103..5cad010f3 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -31,7 +31,6 @@ env: jobs: spm: - name: cocoapods runs-on: macOS-15 env: SPM: true diff --git a/.github/workflows/inappmessaging.yml b/.github/workflows/inappmessaging.yml index 707758a2e..175b41e37 100644 --- a/.github/workflows/inappmessaging.yml +++ b/.github/workflows/inappmessaging.yml @@ -31,7 +31,6 @@ env: jobs: spm: - name: spm runs-on: macOS-15 env: SPM: true diff --git a/.github/workflows/installations.yml b/.github/workflows/installations.yml index d70fbad62..6db55e68f 100644 --- a/.github/workflows/installations.yml +++ b/.github/workflows/installations.yml @@ -31,7 +31,6 @@ env: jobs: spm: - name: spm runs-on: macOS-15 env: SPM: true diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml index aef809d49..3de213404 100644 --- a/.github/workflows/messaging.yml +++ b/.github/workflows/messaging.yml @@ -31,7 +31,6 @@ env: jobs: spm: - name: spm runs-on: macOS-15 env: SPM: true diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 49d565a44..a64ec11b5 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -34,7 +34,7 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - spm: + spm-buildonly: name: spm runs-on: macOS-15 env: diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 5ae79d28d..d9c52ac16 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -31,7 +31,6 @@ env: jobs: cocoapods: - name: cocoapods runs-on: macOS-15 env: SPM: false From 0150020c643b0144969d1a476bb474e63f37a085 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Fri, 19 Sep 2025 11:26:17 -0400 Subject: [PATCH 54/56] workflow consolidation --- .github/workflows/database.yml | 56 +++++++++++++------------------ .github/workflows/performance.yml | 50 +++++++++++---------------- 2 files changed, 44 insertions(+), 62 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 6b50705cd..c999aeb08 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -30,52 +30,44 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - spm-buildonly: - name: spm (non-SwiftUI) - runs-on: macOS-15 - env: - OS: iOS - SPM: true - LEGACY: false - DIR: database - DEVICE: iPhone 16 - TEST: false - SCHEME: DatabaseExampleSwift - steps: - - name: Checkout - uses: actions/checkout@master - - name: Setup - run: | - gem install xcpretty - cd database - ../scripts/install_prereqs/database.sh - - name: Build Swift - run: ./scripts/test.sh - spm: - name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }}) + name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.name }}) runs-on: macOS-15 strategy: matrix: xcode: ["16.4"] - os: [iOS, tvOS, macOS] include: - - os: iOS - device: iPhone 16 + - name: "non-SwiftUI" + os: iOS + device: "iPhone 16" + test: false + dir: "database" + scheme: "DatabaseExampleSwift" + legacy: false + - name: "iOS" + os: iOS + device: "iPhone 16" test: false - - os: tvOS - device: Apple TV 4K (3rd generation) (at 1080p) + dir: "database/DatabaseExampleSwiftUI/DatabaseExample" + - name: "tvOS" + os: tvOS + device: "Apple TV 4K (3rd generation) (at 1080p)" test: true - - os: macOS - device: localhost + dir: "database/DatabaseExampleSwiftUI/DatabaseExample" + - name: "macOS" + os: macOS + device: "localhost" test: false # flaky macOS UITest: UITests.testStaticSignUpView() sometimes fails + dir: "database/DatabaseExampleSwiftUI/DatabaseExample" env: SETUP: database SPM: true - DIR: database/DatabaseExampleSwiftUI/DatabaseExample + DIR: ${{ matrix.dir }} OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: ${{ matrix.test }} + SCHEME: ${{ matrix.scheme }} + LEGACY: ${{ matrix.legacy }} steps: - name: Checkout uses: actions/checkout@master @@ -84,5 +76,5 @@ jobs: gem install xcpretty cd $SETUP ../scripts/install_prereqs/${SETUP}.sh - - name: Build and Test SwiftUI (${{ matrix.os }}) + - name: Build and Test run: ./scripts/test.sh diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index a64ec11b5..7073f6e11 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -34,49 +34,39 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: - spm-buildonly: - name: spm - runs-on: macOS-15 - env: - SPM: true - LEGACY: false - OS: iOS - DEVICE: iPhone 16 - TEST: true - DIR: performance - SCHEME: PerformanceExampleSwift - steps: - - name: Checkout - uses: actions/checkout@master - - name: Setup - run: | - cd performance - gem install xcpretty - ../scripts/install_prereqs/performance.sh - - name: Build Swift - run: ./scripts/test.sh - spm: - name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }}) + name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.name }}) runs-on: macOS-15 strategy: matrix: xcode: ["16.4"] - os: [iOS, tvOS] include: - - os: iOS - device: iPhone 16 + - name: "non-SwiftUI" + os: iOS + device: "iPhone 16" + test: true + dir: "performance" + scheme: "PerformanceExampleSwift" + legacy: false + - name: "iOS" + os: iOS + device: "iPhone 16" test: false - - os: tvOS - device: Apple TV 4K (3rd generation) (at 1080p) + dir: "performance/SwiftUIPerformanceQuickstart/PerformanceExample" + - name: "tvOS" + os: tvOS + device: "Apple TV 4K (3rd generation) (at 1080p)" test: false + dir: "performance/SwiftUIPerformanceQuickstart/PerformanceExample" env: SETUP: performance SPM: true - DIR: performance/SwiftUIPerformanceQuickstart/PerformanceExample + DIR: ${{ matrix.dir }} OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: ${{ matrix.test }} + SCHEME: ${{ matrix.scheme }} + LEGACY: ${{ matrix.legacy }} steps: - name: Checkout uses: actions/checkout@master @@ -85,5 +75,5 @@ jobs: gem install xcpretty cd $SETUP ../scripts/install_prereqs/${SETUP}.sh - - name: Build and Test SwiftUI (${{ matrix.os }}) + - name: Build and Test run: ./scripts/test.sh From e9f9d929af64d6a065a45402a958aa40b63bf350 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Fri, 19 Sep 2025 11:33:35 -0400 Subject: [PATCH 55/56] Revert "workflow consolidation" This reverts commit 0150020c643b0144969d1a476bb474e63f37a085. --- .github/workflows/database.yml | 56 ++++++++++++++++++------------- .github/workflows/performance.yml | 50 ++++++++++++++++----------- 2 files changed, 62 insertions(+), 44 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index c999aeb08..6b50705cd 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -30,44 +30,52 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: + spm-buildonly: + name: spm (non-SwiftUI) + runs-on: macOS-15 + env: + OS: iOS + SPM: true + LEGACY: false + DIR: database + DEVICE: iPhone 16 + TEST: false + SCHEME: DatabaseExampleSwift + steps: + - name: Checkout + uses: actions/checkout@master + - name: Setup + run: | + gem install xcpretty + cd database + ../scripts/install_prereqs/database.sh + - name: Build Swift + run: ./scripts/test.sh + spm: - name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.name }}) + name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }}) runs-on: macOS-15 strategy: matrix: xcode: ["16.4"] + os: [iOS, tvOS, macOS] include: - - name: "non-SwiftUI" - os: iOS - device: "iPhone 16" - test: false - dir: "database" - scheme: "DatabaseExampleSwift" - legacy: false - - name: "iOS" - os: iOS - device: "iPhone 16" + - os: iOS + device: iPhone 16 test: false - dir: "database/DatabaseExampleSwiftUI/DatabaseExample" - - name: "tvOS" - os: tvOS - device: "Apple TV 4K (3rd generation) (at 1080p)" + - os: tvOS + device: Apple TV 4K (3rd generation) (at 1080p) test: true - dir: "database/DatabaseExampleSwiftUI/DatabaseExample" - - name: "macOS" - os: macOS - device: "localhost" + - os: macOS + device: localhost test: false # flaky macOS UITest: UITests.testStaticSignUpView() sometimes fails - dir: "database/DatabaseExampleSwiftUI/DatabaseExample" env: SETUP: database SPM: true - DIR: ${{ matrix.dir }} + DIR: database/DatabaseExampleSwiftUI/DatabaseExample OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: ${{ matrix.test }} - SCHEME: ${{ matrix.scheme }} - LEGACY: ${{ matrix.legacy }} steps: - name: Checkout uses: actions/checkout@master @@ -76,5 +84,5 @@ jobs: gem install xcpretty cd $SETUP ../scripts/install_prereqs/${SETUP}.sh - - name: Build and Test + - name: Build and Test SwiftUI (${{ matrix.os }}) run: ./scripts/test.sh diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 7073f6e11..a64ec11b5 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -34,39 +34,49 @@ env: secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }} jobs: + spm-buildonly: + name: spm + runs-on: macOS-15 + env: + SPM: true + LEGACY: false + OS: iOS + DEVICE: iPhone 16 + TEST: true + DIR: performance + SCHEME: PerformanceExampleSwift + steps: + - name: Checkout + uses: actions/checkout@master + - name: Setup + run: | + cd performance + gem install xcpretty + ../scripts/install_prereqs/performance.sh + - name: Build Swift + run: ./scripts/test.sh + spm: - name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.name }}) + name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }}) runs-on: macOS-15 strategy: matrix: xcode: ["16.4"] + os: [iOS, tvOS] include: - - name: "non-SwiftUI" - os: iOS - device: "iPhone 16" - test: true - dir: "performance" - scheme: "PerformanceExampleSwift" - legacy: false - - name: "iOS" - os: iOS - device: "iPhone 16" + - os: iOS + device: iPhone 16 test: false - dir: "performance/SwiftUIPerformanceQuickstart/PerformanceExample" - - name: "tvOS" - os: tvOS - device: "Apple TV 4K (3rd generation) (at 1080p)" + - os: tvOS + device: Apple TV 4K (3rd generation) (at 1080p) test: false - dir: "performance/SwiftUIPerformanceQuickstart/PerformanceExample" env: SETUP: performance SPM: true - DIR: ${{ matrix.dir }} + DIR: performance/SwiftUIPerformanceQuickstart/PerformanceExample OS: ${{ matrix.os }} DEVICE: ${{ matrix.device }} TEST: ${{ matrix.test }} - SCHEME: ${{ matrix.scheme }} - LEGACY: ${{ matrix.legacy }} steps: - name: Checkout uses: actions/checkout@master @@ -75,5 +85,5 @@ jobs: gem install xcpretty cd $SETUP ../scripts/install_prereqs/${SETUP}.sh - - name: Build and Test + - name: Build and Test SwiftUI (${{ matrix.os }}) run: ./scripts/test.sh From 5ae1f992b81c2a93353be855fe9a0658a33ef39c Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Fri, 19 Sep 2025 11:41:15 -0400 Subject: [PATCH 56/56] xcode --- .github/workflows/storage.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index d9c52ac16..65ca01bb5 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -41,6 +41,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@master + - name: Xcode + run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup run: | cd storage/LegacyStorageQuickstart