From 2a24411c81c3e0cd8255d92d30da365640ed2490 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 17 Dec 2024 18:29:07 -0500 Subject: [PATCH 1/3] [Auth] Add RecaptchaEnterprise dependency --- .../project.pbxproj | 22 ++++++++++++++++--- scripts/build.sh | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj index feb55512ba4..fa933825f25 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj @@ -33,7 +33,7 @@ DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; }; DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; - DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */; }; + DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 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 */; }; @@ -48,6 +48,7 @@ EA217895248979E200736757 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA217894248979E200736757 /* LaunchScreen.storyboard */; }; EA527CAA24A0766D00ADB9A2 /* OtherAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA527CA924A0766D00ADB9A2 /* OtherAuthViewController.swift */; }; EA527CAC24A0EE9600ADB9A2 /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA527CAB24A0EE9600ADB9A2 /* LoginView.swift */; }; + EA68BA562D1232AA00B05409 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = EA68BA552D1232AA00B05409 /* RecaptchaEnterprise */; }; EAB3A1792494433500385291 /* DataSourceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB3A1782494433500385291 /* DataSourceProvider.swift */; }; EAB3A17C2494628200385291 /* UserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB3A17B2494628200385291 /* UserViewController.swift */; }; EAD8BD402CE535C400E23E30 /* MFALoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAD8BD3F2CE535C400E23E30 /* MFALoginView.swift */; }; @@ -159,11 +160,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */, + DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */, DE8B63772BEC302200607B82 /* FacebookLogin in Frameworks */, DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */, DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */, DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */, + EA68BA562D1232AA00B05409 /* RecaptchaEnterprise in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -393,7 +395,7 @@ DE8B63712BEC2FB900607B82 /* GoogleSignIn */, DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */, DE8B63762BEC302200607B82 /* FacebookLogin */, - DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */, + EA68BA552D1232AA00B05409 /* RecaptchaEnterprise */, ); productName = "Swifty Auth"; productReference = EAE4CBC124855E3A00245E92 /* AuthenticationExample.app */; @@ -481,6 +483,7 @@ DE8B63702BEC2FB900607B82 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, DE8B63752BEC302200607B82 /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */, DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */, + EA68BA542D1232AA00B05409 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */, ); productRefGroup = EAE4CBC224855E3A00245E92 /* Products */; projectDirPath = ""; @@ -1002,6 +1005,14 @@ minimumVersion = 3.4.1; }; }; + EA68BA542D1232AA00B05409 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 18.6.0; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -1034,6 +1045,11 @@ package = DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */; productName = GTMSessionFetcher; }; + EA68BA552D1232AA00B05409 /* RecaptchaEnterprise */ = { + isa = XCSwiftPackageProductDependency; + package = EA68BA542D1232AA00B05409 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */; + productName = RecaptchaEnterprise; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = EAE4CBB924855E3A00245E92 /* Project object */; diff --git a/scripts/build.sh b/scripts/build.sh index 15019bd184c..b35b16fbc9f 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -163,7 +163,7 @@ if [[ "$xcode_major" -lt 15 ]]; then elif [[ "$xcode_major" -lt 16 ]]; then ios_flags=( -sdk 'iphonesimulator' - -destination 'platform=iOS Simulator,name=iPhone 15' + -destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=17.2' ) watchos_flags=( -sdk 'watchsimulator' From 32bca219c03d23b1d491fa6c8d0f00ae402412e4 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Wed, 18 Dec 2024 10:46:31 -0500 Subject: [PATCH 2/3] Revert "[Auth] Add RecaptchaEnterprise dependency" This reverts commit 2a24411c81c3e0cd8255d92d30da365640ed2490. --- .../project.pbxproj | 22 +++---------------- scripts/build.sh | 2 +- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj index fa933825f25..feb55512ba4 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj @@ -33,7 +33,7 @@ DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; }; DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; - DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */; }; 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 */; }; @@ -48,7 +48,6 @@ EA217895248979E200736757 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA217894248979E200736757 /* LaunchScreen.storyboard */; }; EA527CAA24A0766D00ADB9A2 /* OtherAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA527CA924A0766D00ADB9A2 /* OtherAuthViewController.swift */; }; EA527CAC24A0EE9600ADB9A2 /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA527CAB24A0EE9600ADB9A2 /* LoginView.swift */; }; - EA68BA562D1232AA00B05409 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = EA68BA552D1232AA00B05409 /* RecaptchaEnterprise */; }; EAB3A1792494433500385291 /* DataSourceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB3A1782494433500385291 /* DataSourceProvider.swift */; }; EAB3A17C2494628200385291 /* UserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB3A17B2494628200385291 /* UserViewController.swift */; }; EAD8BD402CE535C400E23E30 /* MFALoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAD8BD3F2CE535C400E23E30 /* MFALoginView.swift */; }; @@ -160,12 +159,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */, + DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */, DE8B63772BEC302200607B82 /* FacebookLogin in Frameworks */, DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */, DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */, DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */, - EA68BA562D1232AA00B05409 /* RecaptchaEnterprise in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -395,7 +393,7 @@ DE8B63712BEC2FB900607B82 /* GoogleSignIn */, DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */, DE8B63762BEC302200607B82 /* FacebookLogin */, - EA68BA552D1232AA00B05409 /* RecaptchaEnterprise */, + DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */, ); productName = "Swifty Auth"; productReference = EAE4CBC124855E3A00245E92 /* AuthenticationExample.app */; @@ -483,7 +481,6 @@ DE8B63702BEC2FB900607B82 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, DE8B63752BEC302200607B82 /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */, DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */, - EA68BA542D1232AA00B05409 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */, ); productRefGroup = EAE4CBC224855E3A00245E92 /* Products */; projectDirPath = ""; @@ -1005,14 +1002,6 @@ minimumVersion = 3.4.1; }; }; - EA68BA542D1232AA00B05409 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 18.6.0; - }; - }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -1045,11 +1034,6 @@ package = DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */; productName = GTMSessionFetcher; }; - EA68BA552D1232AA00B05409 /* RecaptchaEnterprise */ = { - isa = XCSwiftPackageProductDependency; - package = EA68BA542D1232AA00B05409 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */; - productName = RecaptchaEnterprise; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = EAE4CBB924855E3A00245E92 /* Project object */; diff --git a/scripts/build.sh b/scripts/build.sh index b35b16fbc9f..15019bd184c 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -163,7 +163,7 @@ if [[ "$xcode_major" -lt 15 ]]; then elif [[ "$xcode_major" -lt 16 ]]; then ios_flags=( -sdk 'iphonesimulator' - -destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=17.2' + -destination 'platform=iOS Simulator,name=iPhone 15' ) watchos_flags=( -sdk 'watchsimulator' From 8ee46b5e75111558d567ef688bb6892e3b25f42b Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Wed, 18 Dec 2024 10:48:10 -0500 Subject: [PATCH 3/3] Add analytics dependency --- .../AuthenticationExample.xcodeproj/project.pbxproj | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj index feb55512ba4..a839660a8b1 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj @@ -33,7 +33,7 @@ DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; }; DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; - DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */; }; + DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 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 */; }; @@ -48,6 +48,7 @@ EA217895248979E200736757 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA217894248979E200736757 /* LaunchScreen.storyboard */; }; EA527CAA24A0766D00ADB9A2 /* OtherAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA527CA924A0766D00ADB9A2 /* OtherAuthViewController.swift */; }; EA527CAC24A0EE9600ADB9A2 /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA527CAB24A0EE9600ADB9A2 /* LoginView.swift */; }; + EA9ADF2A2D13260E00C42E35 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = EA9ADF292D13260E00C42E35 /* FirebaseAnalytics */; }; EAB3A1792494433500385291 /* DataSourceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB3A1782494433500385291 /* DataSourceProvider.swift */; }; EAB3A17C2494628200385291 /* UserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB3A17B2494628200385291 /* UserViewController.swift */; }; EAD8BD402CE535C400E23E30 /* MFALoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAD8BD3F2CE535C400E23E30 /* MFALoginView.swift */; }; @@ -159,8 +160,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */, + DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */, DE8B63772BEC302200607B82 /* FacebookLogin in Frameworks */, + EA9ADF2A2D13260E00C42E35 /* FirebaseAnalytics in Frameworks */, DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */, DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */, DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */, @@ -393,7 +395,7 @@ DE8B63712BEC2FB900607B82 /* GoogleSignIn */, DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */, DE8B63762BEC302200607B82 /* FacebookLogin */, - DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */, + EA9ADF292D13260E00C42E35 /* FirebaseAnalytics */, ); productName = "Swifty Auth"; productReference = EAE4CBC124855E3A00245E92 /* AuthenticationExample.app */; @@ -1034,6 +1036,11 @@ package = DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */; productName = GTMSessionFetcher; }; + EA9ADF292D13260E00C42E35 /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = DE8B636D2BEC2DC300607B82 /* XCLocalSwiftPackageReference "../../../../firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = EAE4CBB924855E3A00245E92 /* Project object */;