From dd646b23d94f70d54055def3b126c074d8214ab8 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 12 Feb 2024 14:23:17 -0800 Subject: [PATCH 01/44] Update GMA SDK to 11.0.1. --- gma/integration_test/Podfile | 2 +- ios_pod/Podfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gma/integration_test/Podfile b/gma/integration_test/Podfile index 8f11cc2447..c707d40892 100644 --- a/gma/integration_test/Podfile +++ b/gma/integration_test/Podfile @@ -5,7 +5,7 @@ use_frameworks! :linkage => :static target 'integration_test' do pod 'Firebase/CoreOnly', '10.20.0' - pod 'Google-Mobile-Ads-SDK', '10.14.0' + pod 'Google-Mobile-Ads-SDK', '11.0.1' pod 'GoogleUserMessagingPlatform', '2.1.0' end diff --git a/ios_pod/Podfile b/ios_pod/Podfile index f5b627712e..f062535d13 100644 --- a/ios_pod/Podfile +++ b/ios_pod/Podfile @@ -5,7 +5,7 @@ use_frameworks! target 'GetPods' do pod 'Firebase/Core', '10.20.0' - pod 'Google-Mobile-Ads-SDK', '10.14.0' + pod 'Google-Mobile-Ads-SDK', '11.0.1' pod 'GoogleUserMessagingPlatform', '2.1.0' pod 'Firebase/Analytics', '10.20.0' pod 'Firebase/AppCheck', '10.20.0' From 5df44f4c6eaf0b8e2d48654e314c6f153af4ee9d Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 12 Feb 2024 14:11:24 -0800 Subject: [PATCH 02/44] Change property names to match v11 GMA properties. --- gma/src/ios/gma_ios.mm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gma/src/ios/gma_ios.mm b/gma/src/ios/gma_ios.mm index 7f0cad9d2d..ac8842cc9f 100644 --- a/gma/src/ios/gma_ios.mm +++ b/gma/src/ios/gma_ios.mm @@ -164,10 +164,10 @@ void SetRequestConfiguration(const RequestConfiguration& request_configuration) switch (request_configuration.tag_for_child_directed_treatment) { case RequestConfiguration::kChildDirectedTreatmentFalse: - [GADMobileAds.sharedInstance.requestConfiguration tagForChildDirectedTreatment:NO]; + GADMobileAds.sharedInstance.requestConfiguration.tagForChildDirectedTreatment = NO; break; case RequestConfiguration::kChildDirectedTreatmentTrue: - [GADMobileAds.sharedInstance.requestConfiguration tagForChildDirectedTreatment:YES]; + GADMobileAds.sharedInstance.requestConfiguration tagForChildDirectedTreatment = YES; break; default: case RequestConfiguration::kChildDirectedTreatmentUnspecified: @@ -177,10 +177,10 @@ void SetRequestConfiguration(const RequestConfiguration& request_configuration) switch (request_configuration.tag_for_under_age_of_consent) { case RequestConfiguration::kUnderAgeOfConsentFalse: - [GADMobileAds.sharedInstance.requestConfiguration tagForUnderAgeOfConsent:NO]; + GADMobileAds.sharedInstance.requestConfiguration.tagForUnderAgeOfConsent = NO; break; case RequestConfiguration::kUnderAgeOfConsentTrue: - [GADMobileAds.sharedInstance.requestConfiguration tagForUnderAgeOfConsent:YES]; + GADMobileAds.sharedInstance.requestConfiguration.tagForUnderAgeOfConsent = YES; break; default: case RequestConfiguration::kUnderAgeOfConsentUnspecified: @@ -244,9 +244,9 @@ void OpenAdInspector(AdParent ad_parent, AdInspectorClosedListener* listener) { void SetIsSameAppKeyEnabled(bool is_enabled) { dispatch_async(dispatch_get_main_queue(), ^{ if (is_enabled) { - [GADMobileAds.sharedInstance.requestConfiguration setSameAppKeyEnabled:YES]; + [GADMobileAds.sharedInstance.requestConfiguration setPublisherFirstPartyIDEnabled:YES]; } else { - [GADMobileAds.sharedInstance.requestConfiguration setSameAppKeyEnabled:NO]; + [GADMobileAds.sharedInstance.requestConfiguration setPublisherFirstPartyIDEnabled:NO]; } }); } From 5d20ab93c11179a839ef1e9c51f9212464d8e2dc Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 12 Feb 2024 14:40:45 -0800 Subject: [PATCH 03/44] Increase deployment target to iOS 12. --- dynamic_links/integration_test/Podfile | 2 +- firestore/integration_test/Podfile | 2 +- firestore/integration_test_internal/Podfile | 2 +- functions/integration_test/Podfile | 2 +- gma/integration_test/Podfile | 2 +- installations/integration_test/Podfile | 2 +- ios_pod/Podfile | 2 +- messaging/integration_test/Podfile | 2 +- remote_config/integration_test/Podfile | 2 +- storage/integration_test/Podfile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile index 89ae81dab7..90707ffd29 100644 --- a/dynamic_links/integration_test/Podfile +++ b/dynamic_links/integration_test/Podfile @@ -1,5 +1,5 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '11.0' +platform :ios, '12.0' # Firebase Dynamic Links test application. use_frameworks! :linkage => :static diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile index fe5cc48bae..1e5b6ea2c2 100644 --- a/firestore/integration_test/Podfile +++ b/firestore/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '11.0' + platform :ios, '12.0' pod 'Firebase/Firestore', '10.20.0' pod 'Firebase/Auth', '10.20.0' end diff --git a/firestore/integration_test_internal/Podfile b/firestore/integration_test_internal/Podfile index ce8fb50265..74858551f4 100644 --- a/firestore/integration_test_internal/Podfile +++ b/firestore/integration_test_internal/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '11.0' + platform :ios, '12.0' pod 'Firebase/Firestore', '10.20.0' pod 'Firebase/Auth', '10.20.0' end diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile index 3db8a3a6dc..f27373a0d2 100644 --- a/functions/integration_test/Podfile +++ b/functions/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '11.0' + platform :ios, '12.0' pod 'Firebase/Functions', '10.20.0' pod 'Firebase/Auth', '10.20.0' end diff --git a/gma/integration_test/Podfile b/gma/integration_test/Podfile index c707d40892..418c72f11d 100644 --- a/gma/integration_test/Podfile +++ b/gma/integration_test/Podfile @@ -1,5 +1,5 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '11.0' +platform :ios, '12.0' # Firebase GMA test application. use_frameworks! :linkage => :static diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile index ba359b1d14..786402b53d 100644 --- a/installations/integration_test/Podfile +++ b/installations/integration_test/Podfile @@ -1,5 +1,5 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '11.0' +platform :ios, '12.0' # Firebase Installations test application. use_frameworks! :linkage => :static diff --git a/ios_pod/Podfile b/ios_pod/Podfile index f062535d13..5cfc9ff2e7 100644 --- a/ios_pod/Podfile +++ b/ios_pod/Podfile @@ -1,5 +1,5 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '11.0' +platform :ios, '12.0' use_frameworks! target 'GetPods' do diff --git a/messaging/integration_test/Podfile b/messaging/integration_test/Podfile index f09801ab21..249a7c700e 100644 --- a/messaging/integration_test/Podfile +++ b/messaging/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '11.0' + platform :ios, '12.0' pod 'Firebase/Messaging', '10.20.0' end diff --git a/remote_config/integration_test/Podfile b/remote_config/integration_test/Podfile index d44f806ac8..10c569349e 100644 --- a/remote_config/integration_test/Podfile +++ b/remote_config/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '11.0' + platform :ios, '12.0' pod 'Firebase/RemoteConfig', '10.20.0' end diff --git a/storage/integration_test/Podfile b/storage/integration_test/Podfile index 9f2e951cda..e1116621c7 100644 --- a/storage/integration_test/Podfile +++ b/storage/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '11.0' + platform :ios, '12.0' pod 'Firebase/Storage', '10.20.0' pod 'Firebase/Auth', '10.20.0' end From 3d87b5bacabea2f2265d3283a5ba888ddc9647b5 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 12 Feb 2024 14:56:35 -0800 Subject: [PATCH 04/44] Fix bools. --- gma/src/ios/gma_ios.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gma/src/ios/gma_ios.mm b/gma/src/ios/gma_ios.mm index ac8842cc9f..c2dfe105ee 100644 --- a/gma/src/ios/gma_ios.mm +++ b/gma/src/ios/gma_ios.mm @@ -164,10 +164,10 @@ void SetRequestConfiguration(const RequestConfiguration& request_configuration) switch (request_configuration.tag_for_child_directed_treatment) { case RequestConfiguration::kChildDirectedTreatmentFalse: - GADMobileAds.sharedInstance.requestConfiguration.tagForChildDirectedTreatment = NO; + GADMobileAds.sharedInstance.requestConfiguration.tagForChildDirectedTreatment = false; break; case RequestConfiguration::kChildDirectedTreatmentTrue: - GADMobileAds.sharedInstance.requestConfiguration tagForChildDirectedTreatment = YES; + GADMobileAds.sharedInstance.requestConfiguration.tagForChildDirectedTreatment = true; break; default: case RequestConfiguration::kChildDirectedTreatmentUnspecified: @@ -177,10 +177,10 @@ void SetRequestConfiguration(const RequestConfiguration& request_configuration) switch (request_configuration.tag_for_under_age_of_consent) { case RequestConfiguration::kUnderAgeOfConsentFalse: - GADMobileAds.sharedInstance.requestConfiguration.tagForUnderAgeOfConsent = NO; + GADMobileAds.sharedInstance.requestConfiguration.tagForUnderAgeOfConsent = false; break; case RequestConfiguration::kUnderAgeOfConsentTrue: - GADMobileAds.sharedInstance.requestConfiguration.tagForUnderAgeOfConsent = YES; + GADMobileAds.sharedInstance.requestConfiguration.tagForUnderAgeOfConsent = true; break; default: case RequestConfiguration::kUnderAgeOfConsentUnspecified: From 03feb33cae3193be9a5fac15422ddb78fdd76d3a Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 12 Feb 2024 15:44:23 -0800 Subject: [PATCH 05/44] Properly use NSNumber. --- gma/src/ios/gma_ios.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gma/src/ios/gma_ios.mm b/gma/src/ios/gma_ios.mm index c2dfe105ee..b47eee884a 100644 --- a/gma/src/ios/gma_ios.mm +++ b/gma/src/ios/gma_ios.mm @@ -164,10 +164,10 @@ void SetRequestConfiguration(const RequestConfiguration& request_configuration) switch (request_configuration.tag_for_child_directed_treatment) { case RequestConfiguration::kChildDirectedTreatmentFalse: - GADMobileAds.sharedInstance.requestConfiguration.tagForChildDirectedTreatment = false; + GADMobileAds.sharedInstance.requestConfiguration.tagForChildDirectedTreatment = [NSNumber numberWithBool:NO]; break; case RequestConfiguration::kChildDirectedTreatmentTrue: - GADMobileAds.sharedInstance.requestConfiguration.tagForChildDirectedTreatment = true; + GADMobileAds.sharedInstance.requestConfiguration.tagForChildDirectedTreatment = [NSNumber numberWithBool:YES]; break; default: case RequestConfiguration::kChildDirectedTreatmentUnspecified: @@ -177,10 +177,10 @@ void SetRequestConfiguration(const RequestConfiguration& request_configuration) switch (request_configuration.tag_for_under_age_of_consent) { case RequestConfiguration::kUnderAgeOfConsentFalse: - GADMobileAds.sharedInstance.requestConfiguration.tagForUnderAgeOfConsent = false; + GADMobileAds.sharedInstance.requestConfiguration.tagForUnderAgeOfConsent = [NSNumber numberWithBool:NO]; break; case RequestConfiguration::kUnderAgeOfConsentTrue: - GADMobileAds.sharedInstance.requestConfiguration.tagForUnderAgeOfConsent = true; + GADMobileAds.sharedInstance.requestConfiguration.tagForUnderAgeOfConsent = [NSNumber numberWithBool:YES]; break; default: case RequestConfiguration::kUnderAgeOfConsentUnspecified: From 65fa9a2d7a271c3f5d0422d23d41a109b51774d3 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 12 Feb 2024 16:00:06 -0800 Subject: [PATCH 06/44] Change adNetworkClassName to be referenced from the loadedAdNetworkResponseInfo. --- gma/src/ios/response_info_ios.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gma/src/ios/response_info_ios.mm b/gma/src/ios/response_info_ios.mm index 0acedf43fa..230a794048 100644 --- a/gma/src/ios/response_info_ios.mm +++ b/gma/src/ios/response_info_ios.mm @@ -41,7 +41,7 @@ util::NSStringToString(response_info_internal.gad_response_info.responseIdentifier); mediation_adapter_class_name_ = - util::NSStringToString(response_info_internal.gad_response_info.adNetworkClassName); + util::NSStringToString(response_info_internal.gad_response_info.loadedAdNetworkResponseInfo.adNetworkClassName); NSEnumerator* enumerator = [response_info_internal.gad_response_info.adNetworkInfoArray objectEnumerator]; @@ -58,7 +58,7 @@ "response_id: %@, mediation_adapter_classname : %@, " "adapter_response_info: %@", response_info_internal.gad_response_info.responseIdentifier, - response_info_internal.gad_response_info.adNetworkClassName, + response_info_internal.gad_response_info.loadedAdNetworkResponseInfo.adNetworkClassName, response_info_internal.gad_response_info.adNetworkInfoArray]; to_string_ = util::NSStringToString(to_string); } From d9036fc4ee56abc02283c524ed773101b94108cb Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 12 Feb 2024 16:21:07 -0800 Subject: [PATCH 07/44] Change iphone deployment target to 12. --- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../gameloop_apple/gameloop.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj index 7dbeda497b..e57d3182b3 100644 --- a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj @@ -407,7 +407,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -444,7 +444,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/app/integration_test/integration_test.xcodeproj/project.pbxproj b/app/integration_test/integration_test.xcodeproj/project.pbxproj index 82593ef7f4..c27e51ecb5 100644 --- a/app/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/app/integration_test/integration_test.xcodeproj/project.pbxproj @@ -242,7 +242,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -279,7 +279,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj index 16cbe44041..9959b7ee81 100644 --- a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -391,7 +391,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/auth/integration_test/integration_test.xcodeproj/project.pbxproj b/auth/integration_test/integration_test.xcodeproj/project.pbxproj index 9503d69287..212a9ea152 100644 --- a/auth/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/auth/integration_test/integration_test.xcodeproj/project.pbxproj @@ -430,7 +430,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -467,7 +467,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/database/integration_test/integration_test.xcodeproj/project.pbxproj b/database/integration_test/integration_test.xcodeproj/project.pbxproj index 8a2ef30286..6d8760efed 100644 --- a/database/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/database/integration_test/integration_test.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -391,7 +391,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj b/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj index bf61e2a445..8888eaa544 100644 --- a/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj @@ -242,7 +242,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -279,7 +279,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj index 6f53ba0b95..8aca1977d1 100644 --- a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj @@ -450,7 +450,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -487,7 +487,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj index acc596b31b..9b6092f649 100644 --- a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj @@ -735,7 +735,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -772,7 +772,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/functions/integration_test/integration_test.xcodeproj/project.pbxproj b/functions/integration_test/integration_test.xcodeproj/project.pbxproj index c142aa743c..b0bec61b8c 100644 --- a/functions/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/functions/integration_test/integration_test.xcodeproj/project.pbxproj @@ -433,7 +433,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -470,7 +470,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/gma/integration_test/integration_test.xcodeproj/project.pbxproj b/gma/integration_test/integration_test.xcodeproj/project.pbxproj index 35b4a36051..c545d55f83 100644 --- a/gma/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/gma/integration_test/integration_test.xcodeproj/project.pbxproj @@ -246,7 +246,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -283,7 +283,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/installations/integration_test/integration_test.xcodeproj/project.pbxproj b/installations/integration_test/integration_test.xcodeproj/project.pbxproj index ba76407391..6306757b2b 100644 --- a/installations/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/installations/integration_test/integration_test.xcodeproj/project.pbxproj @@ -242,7 +242,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -279,7 +279,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj index 50397c4fc1..d7b79e0022 100644 --- a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj @@ -431,7 +431,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -468,7 +468,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj index 9d7e4a4d38..b591803f77 100644 --- a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj @@ -407,7 +407,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -444,7 +444,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj index 498027e55f..871825746d 100644 --- a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj +++ b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj @@ -532,7 +532,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -587,7 +587,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -603,7 +603,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = gameloop/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -622,7 +622,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = gameloop/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/storage/integration_test/integration_test.xcodeproj/project.pbxproj b/storage/integration_test/integration_test.xcodeproj/project.pbxproj index 764c0c9a16..38be440fac 100644 --- a/storage/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/storage/integration_test/integration_test.xcodeproj/project.pbxproj @@ -418,7 +418,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -455,7 +455,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; From 9f1c99eb421ba3c0c96b6a94717f7e7010e21fdf Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 14 Feb 2024 16:04:30 -0800 Subject: [PATCH 08/44] Update Xcode version to 15.1. --- .github/workflows/cpp-packaging.yml | 4 ++-- .github/workflows/integration_tests.yml | 2 +- scripts/gha/print_matrix_configuration.py | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 94224b94f1..8e8c86f645 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -32,9 +32,9 @@ env: demumbleVer: "df938e45c2b0e064fb5323d88b692d03b451d271" # Use SHA256 for hashing files. hashCommand: "sha256sum" - # Xcode version 14.1 is the version we build the SDK with. + # Xcode version 15.1 is the version we build the SDK with. # Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app - xcodeVersion: "14.1" + xcodeVersion: "15.1" # LLVM version with ARM MachO support has no version number yet. llvmVer: "5f187f0afaad33013ba03454c4749d99b1362534" GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index e1ab1d8cda..6d98adfafd 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ env: triggerLabelFull: "tests-requested: full" triggerLabelQuick: "tests-requested: quick" pythonVersion: '3.8' - xcodeVersion: '14.1' + xcodeVersion: '15.1' artifactRetentionDays: 2 GITHUB_TOKEN: ${{ github.token }} # All self-hosted ARM Mac runners should have this label. Due to how diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 066cc85d80..4d0c9f4079 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -77,12 +77,12 @@ "build_type": ["Release", "Debug"], "architecture": ["x64", "x86", "arm64"], "msvc_runtime": ["static","dynamic"], - "xcode_version": ["14.1"], + "xcode_version": ["15.1"], "python_version": ["3.7"], EXPANDED_KEY: { "os": ["ubuntu-20.04", "macos-12", "windows-latest"], - "xcode_version": ["14.1"], + "xcode_version": ["15.1"], } } }, @@ -113,7 +113,7 @@ "msvc_runtime": ["dynamic"], "cpp_compiler_windows": ["VisualStudio2019"], "cpp_compiler_linux": ["clang-11.0"], - "xcode_version": ["14.1"], # only the first one is used + "xcode_version": ["15.1"], # only the first one is used "ndk_version": ["r22b"], "platform_version": ["28"], "build_tools_version": ["28.0.3"], @@ -141,10 +141,10 @@ "ios": { "matrix": { - "xcode_version": ["14.1"], + "xcode_version": ["15.1"], EXPANDED_KEY: { - "xcode_version": ["14.1"] + "xcode_version": ["15.1"] } } }, From a9d0f298c31c365f17d694ace1e00ff062b37496 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 14 Feb 2024 16:52:41 -0800 Subject: [PATCH 09/44] Use MacOS 13 runner for Xcode 15.1. --- .github/workflows/cpp-packaging.yml | 20 ++++++------- .github/workflows/desktop.yml | 4 +-- .github/workflows/integration_tests.yml | 34 +++++++++++------------ .github/workflows/ios.yml | 2 +- .github/workflows/update-dependencies.yml | 2 +- scripts/gha/print_matrix_configuration.py | 10 +++---- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 8e8c86f645..041ef50bb2 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -79,13 +79,13 @@ jobs: if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }} strategy: matrix: - os: [ubuntu-20.04, macos-12] + os: [ubuntu-20.04, macos-13] include: - os: ubuntu-20.04 tools_platform: linux # Binutils 2.35.1 released Sep 19, 2020 binutils_version: "2.35.1" - - os: macos-12 + - os: macos-13 tools_platform: darwin # Binutils 2.35.1 released Sep 19, 2020 binutils_version: "2.35.1" @@ -185,7 +185,7 @@ jobs: build_and_package_ios_tvos: name: build-and-package-ios-tvos - runs-on: macos-12 + runs-on: macos-13 if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }} steps: - name: Store git credentials for all git commands @@ -305,7 +305,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest, ubuntu-20.04, macos-12] + os: [windows-latest, ubuntu-20.04, macos-13] build_type: ["Release", "Debug"] architecture: ["x64", "x86", "arm64"] msvc_runtime: ["static", "dynamic"] @@ -325,7 +325,7 @@ jobs: vcpkg_triplet_suffix: "linux" additional_build_flags: "" sdk_platform: "linux" - - os: macos-12 + - os: macos-13 vcpkg_triplet_suffix: "osx" additional_build_flags: "--target_format libraries" sdk_platform: "darwin" @@ -333,13 +333,13 @@ jobs: exclude: - os: windows-latest linux_abi: "c++11" - - os: macos-12 + - os: macos-13 architecture: "x86" - - os: macos-12 + - os: macos-13 msvc_runtime: "dynamic" - - os: macos-12 + - os: macos-13 linux_abi: "c++11" - - os: macos-12 + - os: macos-13 build_type: "Debug" - os: ubuntu-20.04 msvc_runtime: "dynamic" @@ -492,7 +492,7 @@ jobs: suffix: '-x64-Debug-dynamic' runs_on_platform: ubuntu-20.04 - sdk_platform: darwin - runs_on_platform: macos-12 + runs_on_platform: macos-13 exclude: - sdk_platform: windows suffix: '' diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 9b057088fa..04562eb635 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -72,10 +72,10 @@ jobs: # msvc_runtime excludes - os: ubuntu-20.04 msvc_runtime: "dynamic" - - os: macos-12 + - os: macos-13 msvc_runtime: "dynamic" # architecture excluees - - os: macos-12 + - os: macos-13 architecture: "x86" # Xcode excludes -- allow only one on osx and linux - os: ubuntu-20.04 diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 6d98adfafd..73265a247d 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -21,7 +21,7 @@ on: required: true operating_systems: description: 'CSV of VMs to run on' - default: 'ubuntu-20.04,windows-latest,macos-12' + default: 'ubuntu-20.04,windows-latest,macos-13' required: true desktop_ssl_variants: description: 'CSV of desktop SSL variants to use' @@ -204,7 +204,7 @@ jobs: # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo echo "::warning ::Running against Firestore tip-of-tree" matrix_platform="Desktop" - matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-20.04,macos-12") + matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-20.04,macos-13") else matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "${{github.event.inputs.platforms}}" --apis ${apis} ) matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "${{github.event.inputs.operating_systems}}") @@ -271,7 +271,7 @@ jobs: - os: ubuntu-20.04 arch: arm64 # Do not attempt to use x86 on Mac. - - os: macos-12 + - os: macos-13 arch: x86 # Until we support building openssl from source, we can't use the # system's openssl when cross-compiling, except on Linux. Builds all @@ -280,7 +280,7 @@ jobs: - os: windows-latest ssl_variant: openssl arch: x86 - - os: macos-12 + - os: macos-13 ssl_variant: openssl arch: arm64 steps: @@ -522,7 +522,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12] + os: [macos-13] steps: - uses: actions/checkout@v3 with: @@ -621,7 +621,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12] + os: [macos-13] steps: - uses: actions/checkout@v3 with: @@ -732,7 +732,7 @@ jobs: - os: ubuntu-20.04 arch: arm64 # Do not attempt to use x86 on Mac. - - os: macos-12 + - os: macos-13 arch: x86 # Until we support building openssl from source, we can't use the # system's openssl when cross-compiling, except on Linux. Builds all @@ -744,7 +744,7 @@ jobs: # Custom for this matrix: MacOS GitHub-hosted runner cannot test arm64 # code. Exclude that scenario from running here; it will run in # test_desktop_custom_runners. - - os: macos-12 + - os: macos-13 arch: arm64 steps: - uses: actions/checkout@v3 @@ -843,7 +843,7 @@ jobs: name: test-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}-custom-runner needs: [check_and_prepare, build_desktop] runs-on: [self-hosted, firebase-cpp, '${{ matrix.runner_label }}'] - if: contains(needs.check_and_prepare.outputs.matrix_platform, 'Desktop') && contains(needs.check_and_prepare.outputs.matrix_arch_combined, 'arm64') && contains(needs.check_and_prepare.outputs.matrix_os, 'macos-12') && needs.check_and_prepare.outputs.apis != '' && !cancelled() + if: contains(needs.check_and_prepare.outputs.matrix_platform, 'Desktop') && contains(needs.check_and_prepare.outputs.matrix_arch_combined, 'arm64') && contains(needs.check_and_prepare.outputs.matrix_os, 'macos-13') && needs.check_and_prepare.outputs.apis != '' && !cancelled() strategy: fail-fast: false matrix: @@ -858,15 +858,15 @@ jobs: - os: windows-latest runner_label: ${{ needs.check_and_prepare.outputs.runner_label_macos_arm64 }} # Don't run x86 tests on any Mac runner. - - os: macos-12 + - os: macos-13 arch: x86 # Don't run x64 tests on the Mac arm64 runner. - - os: macos-12 + - os: macos-13 arch: x64 runner_label: ${{ needs.check_and_prepare.outputs.runner_label_macos_arm64 }} # Until we support building openssl from source, we can't link to system # openssl when cross-compiling, so exclude openssl from mac arm64 testing. - - os: macos-12 + - os: macos-13 arch: arm64 ssl_variant: openssl steps: @@ -911,7 +911,7 @@ jobs: ${{ secrets.TEST_SECRET }} EOF - name: Run Desktop integration tests on M1 Mac - if: ${{ matrix.os == 'macos-12' && matrix.arch == 'arm64' && matrix.runner_label == needs.check_and_prepare.outputs.runner_label_macos_arm64 }} + if: ${{ matrix.os == 'macos-13' && matrix.arch == 'arm64' && matrix.runner_label == needs.check_and_prepare.outputs.runner_label_macos_arm64 }} shell: bash run: | # This is an M1 Mac GitHub self-hosted runner. @@ -1120,7 +1120,7 @@ jobs: test_ios: name: test-ios-${{ matrix.build_os }}-${{ matrix.ios_device }}-${{ matrix.test_type }} needs: [check_and_prepare, build_ios] - runs-on: macos-12 + runs-on: macos-13 if: contains(needs.check_and_prepare.outputs.matrix_platform, 'iOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled() strategy: fail-fast: false @@ -1134,7 +1134,7 @@ jobs: test_type: "uitest" - ios_device: "ios_latest" test_type: "uitest" - build_os: [macos-12] + build_os: [macos-13] steps: - uses: actions/checkout@v3 with: @@ -1264,13 +1264,13 @@ jobs: test_tvos: name: test-tvos-${{ matrix.build_os }}-${{ matrix.tvos_device }} needs: [check_and_prepare, build_tvos] - runs-on: macos-12 + runs-on: macos-13 if: contains(needs.check_and_prepare.outputs.matrix_platform, 'tvOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled() strategy: fail-fast: false matrix: tvos_device: ${{ fromJson(needs.check_and_prepare.outputs.tvos_device) }} - build_os: [macos-12] + build_os: [macos-13] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 63cade37e6..ce025f1adb 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -41,7 +41,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ 'macos-12' ] + os: [ 'macos-13' ] xcode_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }} steps: - name: Store git credentials for all git commands diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index e285d77bdd..c898e87fa9 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -25,7 +25,7 @@ env: jobs: update_dependencies: name: update-deps - runs-on: macos-12 + runs-on: macos-13 steps: - name: Get token for firebase-workflow-trigger uses: tibdex/github-app-token@v1 diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 4d0c9f4079..54d6f8db8c 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -73,7 +73,7 @@ PARAMETERS = { "desktop": { "matrix": { - "os": ["ubuntu-20.04", "macos-12"], + "os": ["ubuntu-20.04", "macos-13"], "build_type": ["Release", "Debug"], "architecture": ["x64", "x86", "arm64"], "msvc_runtime": ["static","dynamic"], @@ -81,7 +81,7 @@ "python_version": ["3.7"], EXPANDED_KEY: { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"], + "os": ["ubuntu-20.04", "macos-13", "windows-latest"], "xcode_version": ["15.1"], } } @@ -89,19 +89,19 @@ "android": { "matrix": { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"], + "os": ["ubuntu-20.04", "macos-13", "windows-latest"], "architecture": ["x64"], "python_version": ["3.7"], EXPANDED_KEY: { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"] + "os": ["ubuntu-20.04", "macos-13", "windows-latest"] } } }, "integration_tests": { "matrix": { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"], + "os": ["ubuntu-20.04", "macos-13", "windows-latest"], "platform": ["Desktop", "Android", "iOS", "tvOS"], "ssl_lib": ["openssl"], "android_device": ["android_target", "emulator_ftl_target"], From 724f8539252be1cd4c52a14bffd87f39d395de73 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 14 Feb 2024 16:52:41 -0800 Subject: [PATCH 10/44] Use MacOS 13 runner for Xcode 15.1. --- .github/workflows/cpp-packaging.yml | 20 ++++++------- .github/workflows/desktop.yml | 4 +-- .github/workflows/integration_tests.yml | 34 +++++++++++------------ .github/workflows/ios.yml | 2 +- .github/workflows/update-dependencies.yml | 2 +- scripts/gha/print_matrix_configuration.py | 12 ++++---- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 94224b94f1..bb0b52a1f5 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -79,13 +79,13 @@ jobs: if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }} strategy: matrix: - os: [ubuntu-20.04, macos-12] + os: [ubuntu-20.04, macos-13] include: - os: ubuntu-20.04 tools_platform: linux # Binutils 2.35.1 released Sep 19, 2020 binutils_version: "2.35.1" - - os: macos-12 + - os: macos-13 tools_platform: darwin # Binutils 2.35.1 released Sep 19, 2020 binutils_version: "2.35.1" @@ -185,7 +185,7 @@ jobs: build_and_package_ios_tvos: name: build-and-package-ios-tvos - runs-on: macos-12 + runs-on: macos-13 if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }} steps: - name: Store git credentials for all git commands @@ -305,7 +305,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest, ubuntu-20.04, macos-12] + os: [windows-latest, ubuntu-20.04, macos-13] build_type: ["Release", "Debug"] architecture: ["x64", "x86", "arm64"] msvc_runtime: ["static", "dynamic"] @@ -325,7 +325,7 @@ jobs: vcpkg_triplet_suffix: "linux" additional_build_flags: "" sdk_platform: "linux" - - os: macos-12 + - os: macos-13 vcpkg_triplet_suffix: "osx" additional_build_flags: "--target_format libraries" sdk_platform: "darwin" @@ -333,13 +333,13 @@ jobs: exclude: - os: windows-latest linux_abi: "c++11" - - os: macos-12 + - os: macos-13 architecture: "x86" - - os: macos-12 + - os: macos-13 msvc_runtime: "dynamic" - - os: macos-12 + - os: macos-13 linux_abi: "c++11" - - os: macos-12 + - os: macos-13 build_type: "Debug" - os: ubuntu-20.04 msvc_runtime: "dynamic" @@ -492,7 +492,7 @@ jobs: suffix: '-x64-Debug-dynamic' runs_on_platform: ubuntu-20.04 - sdk_platform: darwin - runs_on_platform: macos-12 + runs_on_platform: macos-13 exclude: - sdk_platform: windows suffix: '' diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 9b057088fa..04562eb635 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -72,10 +72,10 @@ jobs: # msvc_runtime excludes - os: ubuntu-20.04 msvc_runtime: "dynamic" - - os: macos-12 + - os: macos-13 msvc_runtime: "dynamic" # architecture excluees - - os: macos-12 + - os: macos-13 architecture: "x86" # Xcode excludes -- allow only one on osx and linux - os: ubuntu-20.04 diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index e1ab1d8cda..def5bd66e0 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -21,7 +21,7 @@ on: required: true operating_systems: description: 'CSV of VMs to run on' - default: 'ubuntu-20.04,windows-latest,macos-12' + default: 'ubuntu-20.04,windows-latest,macos-13' required: true desktop_ssl_variants: description: 'CSV of desktop SSL variants to use' @@ -204,7 +204,7 @@ jobs: # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo echo "::warning ::Running against Firestore tip-of-tree" matrix_platform="Desktop" - matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-20.04,macos-12") + matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-20.04,macos-13") else matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "${{github.event.inputs.platforms}}" --apis ${apis} ) matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "${{github.event.inputs.operating_systems}}") @@ -271,7 +271,7 @@ jobs: - os: ubuntu-20.04 arch: arm64 # Do not attempt to use x86 on Mac. - - os: macos-12 + - os: macos-13 arch: x86 # Until we support building openssl from source, we can't use the # system's openssl when cross-compiling, except on Linux. Builds all @@ -280,7 +280,7 @@ jobs: - os: windows-latest ssl_variant: openssl arch: x86 - - os: macos-12 + - os: macos-13 ssl_variant: openssl arch: arm64 steps: @@ -522,7 +522,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12] + os: [macos-13] steps: - uses: actions/checkout@v3 with: @@ -621,7 +621,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12] + os: [macos-13] steps: - uses: actions/checkout@v3 with: @@ -732,7 +732,7 @@ jobs: - os: ubuntu-20.04 arch: arm64 # Do not attempt to use x86 on Mac. - - os: macos-12 + - os: macos-13 arch: x86 # Until we support building openssl from source, we can't use the # system's openssl when cross-compiling, except on Linux. Builds all @@ -744,7 +744,7 @@ jobs: # Custom for this matrix: MacOS GitHub-hosted runner cannot test arm64 # code. Exclude that scenario from running here; it will run in # test_desktop_custom_runners. - - os: macos-12 + - os: macos-13 arch: arm64 steps: - uses: actions/checkout@v3 @@ -843,7 +843,7 @@ jobs: name: test-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}-custom-runner needs: [check_and_prepare, build_desktop] runs-on: [self-hosted, firebase-cpp, '${{ matrix.runner_label }}'] - if: contains(needs.check_and_prepare.outputs.matrix_platform, 'Desktop') && contains(needs.check_and_prepare.outputs.matrix_arch_combined, 'arm64') && contains(needs.check_and_prepare.outputs.matrix_os, 'macos-12') && needs.check_and_prepare.outputs.apis != '' && !cancelled() + if: contains(needs.check_and_prepare.outputs.matrix_platform, 'Desktop') && contains(needs.check_and_prepare.outputs.matrix_arch_combined, 'arm64') && contains(needs.check_and_prepare.outputs.matrix_os, 'macos-13') && needs.check_and_prepare.outputs.apis != '' && !cancelled() strategy: fail-fast: false matrix: @@ -858,15 +858,15 @@ jobs: - os: windows-latest runner_label: ${{ needs.check_and_prepare.outputs.runner_label_macos_arm64 }} # Don't run x86 tests on any Mac runner. - - os: macos-12 + - os: macos-13 arch: x86 # Don't run x64 tests on the Mac arm64 runner. - - os: macos-12 + - os: macos-13 arch: x64 runner_label: ${{ needs.check_and_prepare.outputs.runner_label_macos_arm64 }} # Until we support building openssl from source, we can't link to system # openssl when cross-compiling, so exclude openssl from mac arm64 testing. - - os: macos-12 + - os: macos-13 arch: arm64 ssl_variant: openssl steps: @@ -911,7 +911,7 @@ jobs: ${{ secrets.TEST_SECRET }} EOF - name: Run Desktop integration tests on M1 Mac - if: ${{ matrix.os == 'macos-12' && matrix.arch == 'arm64' && matrix.runner_label == needs.check_and_prepare.outputs.runner_label_macos_arm64 }} + if: ${{ matrix.os == 'macos-13' && matrix.arch == 'arm64' && matrix.runner_label == needs.check_and_prepare.outputs.runner_label_macos_arm64 }} shell: bash run: | # This is an M1 Mac GitHub self-hosted runner. @@ -1120,7 +1120,7 @@ jobs: test_ios: name: test-ios-${{ matrix.build_os }}-${{ matrix.ios_device }}-${{ matrix.test_type }} needs: [check_and_prepare, build_ios] - runs-on: macos-12 + runs-on: macos-13 if: contains(needs.check_and_prepare.outputs.matrix_platform, 'iOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled() strategy: fail-fast: false @@ -1134,7 +1134,7 @@ jobs: test_type: "uitest" - ios_device: "ios_latest" test_type: "uitest" - build_os: [macos-12] + build_os: [macos-13] steps: - uses: actions/checkout@v3 with: @@ -1264,13 +1264,13 @@ jobs: test_tvos: name: test-tvos-${{ matrix.build_os }}-${{ matrix.tvos_device }} needs: [check_and_prepare, build_tvos] - runs-on: macos-12 + runs-on: macos-13 if: contains(needs.check_and_prepare.outputs.matrix_platform, 'tvOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled() strategy: fail-fast: false matrix: tvos_device: ${{ fromJson(needs.check_and_prepare.outputs.tvos_device) }} - build_os: [macos-12] + build_os: [macos-13] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 63cade37e6..ce025f1adb 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -41,7 +41,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ 'macos-12' ] + os: [ 'macos-13' ] xcode_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }} steps: - name: Store git credentials for all git commands diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index e285d77bdd..c898e87fa9 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -25,7 +25,7 @@ env: jobs: update_dependencies: name: update-deps - runs-on: macos-12 + runs-on: macos-13 steps: - name: Get token for firebase-workflow-trigger uses: tibdex/github-app-token@v1 diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 066cc85d80..67c2d34bb2 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -73,7 +73,7 @@ PARAMETERS = { "desktop": { "matrix": { - "os": ["ubuntu-20.04", "macos-12"], + "os": ["ubuntu-20.04", "macos-13"], "build_type": ["Release", "Debug"], "architecture": ["x64", "x86", "arm64"], "msvc_runtime": ["static","dynamic"], @@ -81,27 +81,27 @@ "python_version": ["3.7"], EXPANDED_KEY: { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"], - "xcode_version": ["14.1"], + "os": ["ubuntu-20.04", "macos-13", "windows-latest"], + "xcode_version": ["15.1"], } } }, "android": { "matrix": { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"], + "os": ["ubuntu-20.04", "macos-13", "windows-latest"], "architecture": ["x64"], "python_version": ["3.7"], EXPANDED_KEY: { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"] + "os": ["ubuntu-20.04", "macos-13", "windows-latest"] } } }, "integration_tests": { "matrix": { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"], + "os": ["ubuntu-20.04", "macos-13", "windows-latest"], "platform": ["Desktop", "Android", "iOS", "tvOS"], "ssl_lib": ["openssl"], "android_device": ["android_target", "emulator_ftl_target"], From 87e6680b0f16978e593152ff34092afbd4a6277f Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 14 Feb 2024 17:14:14 -0800 Subject: [PATCH 11/44] Force Android build to use Java 8. --- .github/workflows/integration_tests.yml | 4 ++++ scripts/gha/print_matrix_configuration.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index def5bd66e0..6a887cf6c0 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -420,6 +420,10 @@ jobs: with: ref: ${{needs.check_and_prepare.outputs.github_ref}} submodules: true + - name: Force Java 8 (macOS) + if: startsWith(matrix.os, 'macos') + shell: bash + run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV - name: Add msbuild to PATH (Windows) if: startsWith(matrix.os, 'windows') uses: microsoft/setup-msbuild@v1.1 diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 67c2d34bb2..41d2db2d4b 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -82,7 +82,7 @@ EXPANDED_KEY: { "os": ["ubuntu-20.04", "macos-13", "windows-latest"], - "xcode_version": ["15.1"], + "xcode_version": ["14.1"], } } }, From a7f057b14eae5cc627c0ff8c1bd9d4bc091570be Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 14 Feb 2024 17:14:53 -0800 Subject: [PATCH 12/44] Remove trailing whitespace and add to Android workflow. --- .github/workflows/android.yml | 5 +++++ .github/workflows/integration_tests.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index df6493cab5..43f8de427e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -55,6 +55,11 @@ jobs: if: runner.os == 'macOS' run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + - name: Force Java 8 (macOS) + if: startsWith(matrix.os, 'macos') + shell: bash + run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV + - name: Store git credentials for all git commands # Forces all git commands to use authenticated https, to prevent throttling. shell: bash diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 6a887cf6c0..40641f9aa9 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -423,7 +423,7 @@ jobs: - name: Force Java 8 (macOS) if: startsWith(matrix.os, 'macos') shell: bash - run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV + run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV - name: Add msbuild to PATH (Windows) if: startsWith(matrix.os, 'windows') uses: microsoft/setup-msbuild@v1.1 From c3f8c12d640dcb26fa0eb9b7ce8c49d9a399248d Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 14 Feb 2024 17:18:01 -0800 Subject: [PATCH 13/44] Add quotes. --- .github/workflows/android.yml | 4 +--- .github/workflows/integration_tests.yml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 43f8de427e..2b4520e51d 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -54,12 +54,10 @@ jobs: - name: setup Xcode version (macos) if: runner.os == 'macOS' run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer - - name: Force Java 8 (macOS) if: startsWith(matrix.os, 'macos') shell: bash - run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV - + run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV - name: Store git credentials for all git commands # Forces all git commands to use authenticated https, to prevent throttling. shell: bash diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 40641f9aa9..282132a812 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -423,7 +423,7 @@ jobs: - name: Force Java 8 (macOS) if: startsWith(matrix.os, 'macos') shell: bash - run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV + run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV - name: Add msbuild to PATH (Windows) if: startsWith(matrix.os, 'windows') uses: microsoft/setup-msbuild@v1.1 From c5208d0798616d5992faf59e38edd7e50cced931 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 15 Feb 2024 10:11:08 -0800 Subject: [PATCH 14/44] Update simulator devices to xcode 15.1 compatible. --- scripts/gha/print_matrix_configuration.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 41d2db2d4b..6fcdb58c17 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -223,9 +223,9 @@ {"type": "ftl", "device": "model=iphone8,version=16.6"}, {"type": "ftl", "device": "model=ipad10,version=16.6"}, ], - "simulator_min": [ {"type": "virtual", "name":"iPhone 8", "version":"15.2"} ], - "simulator_target": [ {"type": "virtual", "name":"iPhone 8", "version":"16.1"} ], - "simulator_latest": [ {"type": "virtual", "name":"iPhone 11", "version":"16.1"} ], + "simulator_min": [ {"type": "virtual", "name":"iPhone SE (3rd generation)", "version":"16.1"} ], + "simulator_target": [ {"type": "virtual", "name":"iPhone 14", "version":"17.0.1"} ], + "simulator_latest": [ {"type": "virtual", "name":"iPhone 14 Pro Max", "version":"17.2"} ], "tvos_simulator": [ {"type": "virtual", "name":"Apple TV", "version":"16.1"} ], } From 77397491d27ebe19c6679d0b05c7c5520fe7da98 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 15 Feb 2024 14:08:07 -0800 Subject: [PATCH 15/44] Increase Android test timeout. --- .github/workflows/integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 282132a812..f231f8867b 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -1040,7 +1040,7 @@ jobs: distribution: 'temurin' java-version: '8' - name: Run Android integration tests on Emulator locally - timeout-minutes: 150 + timeout-minutes: 180 if: steps.device-info.outputs.device_type == 'virtual' run: | python scripts/gha/test_simulator.py --testapp_dir testapps \ @@ -1051,7 +1051,7 @@ jobs: - id: ftl_test if: steps.device-info.outputs.device_type == 'ftl' uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4 - timeout-minutes: 120 + timeout-minutes: 180 with: credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }} testapp_dir: testapps From 3fb44bccf593de0a64ee866f80ca05b9329d3041 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 20 Feb 2024 12:56:05 -0800 Subject: [PATCH 16/44] Increase timeouts. --- .github/workflows/integration_tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index f231f8867b..d8210327e4 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -1051,7 +1051,7 @@ jobs: - id: ftl_test if: steps.device-info.outputs.device_type == 'ftl' uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4 - timeout-minutes: 180 + timeout-minutes: 240 with: credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }} testapp_dir: testapps @@ -1191,7 +1191,7 @@ jobs: run: | firebase emulators:start --only firestore --project demo-example & - name: Run iOS integration tests on Simulator locally - timeout-minutes: 150 + timeout-minutes: 180 if: steps.device-info.outputs.device_type == 'virtual' run: | python scripts/gha/test_simulator.py --testapp_dir testapps \ @@ -1202,7 +1202,7 @@ jobs: - id: ftl_test if: steps.device-info.outputs.device_type == 'ftl' uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4 - timeout-minutes: 90 + timeout-minutes: 120 with: credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }} testapp_dir: testapps @@ -1318,7 +1318,7 @@ jobs: run: | firebase emulators:start --only firestore --project demo-example & - name: Run tvOS integration tests on Simulator locally - timeout-minutes: 90 + timeout-minutes: 120 run: | python scripts/gha/test_simulator.py --testapp_dir testapps \ --tvos_device "${{ matrix.tvos_device }}" \ From 7aae7dc02cddd06abb565f776673976876296c29 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 6 Mar 2024 11:57:45 -0800 Subject: [PATCH 17/44] Remove bad device from Android list. --- scripts/gha/print_matrix_configuration.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 6fcdb58c17..6462fffdf8 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -174,7 +174,6 @@ TEST_DEVICES = { "android_target": [ {"type": "ftl", "device": "model=blueline,version=28"}, # Pixel 3 - {"type": "ftl", "device": "model=dreamlte,version=28"}, # Galaxy S8 {"type": "ftl", "device": "model=gts3lltevzw,version=28"}, # Galaxy Tab S3 {"type": "ftl", "device": "model=SH-01L,version=28"}, # AQUOS sense2 SH-01L ], From d78922a4eefd071c261e539101e6d41a63ce9bc2 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Wed, 6 Mar 2024 14:53:34 -0800 Subject: [PATCH 18/44] Update the integration tests SWIFT_VERSION --- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../gameloop.xcodeproj/project.pbxproj | 16 ++++++++-------- .../project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- 16 files changed, 60 insertions(+), 60 deletions(-) diff --git a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj index 7dbeda497b..4511cf76bf 100644 --- a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj @@ -479,7 +479,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -510,7 +510,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -563,7 +563,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -614,7 +614,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.ios.analytics.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/app/integration_test/integration_test.xcodeproj/project.pbxproj b/app/integration_test/integration_test.xcodeproj/project.pbxproj index 82593ef7f4..c2f33244b9 100644 --- a/app/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/app/integration_test/integration_test.xcodeproj/project.pbxproj @@ -314,7 +314,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -345,7 +345,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj index 16cbe44041..df7fe0c798 100644 --- a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj @@ -427,7 +427,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -459,7 +459,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.appcheck.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -512,7 +512,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -563,7 +563,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.appcheck.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/auth/integration_test/integration_test.xcodeproj/project.pbxproj b/auth/integration_test/integration_test.xcodeproj/project.pbxproj index bdbceb97fc..482db9e51f 100644 --- a/auth/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/auth/integration_test/integration_test.xcodeproj/project.pbxproj @@ -505,7 +505,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -537,7 +537,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.FirebaseCppAuthTestApp.dev; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -590,7 +590,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -641,7 +641,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.FirebaseCppAuthTestApp.dev; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/database/integration_test/integration_test.xcodeproj/project.pbxproj b/database/integration_test/integration_test.xcodeproj/project.pbxproj index 8a2ef30286..4d293c57dc 100644 --- a/database/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/database/integration_test/integration_test.xcodeproj/project.pbxproj @@ -427,7 +427,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -459,7 +459,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.database.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -512,7 +512,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -563,7 +563,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.database.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj b/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj index bf61e2a445..4036c8938a 100644 --- a/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj @@ -314,7 +314,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -345,7 +345,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj index 6f53ba0b95..fe60d59095 100644 --- a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj @@ -523,7 +523,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -555,7 +555,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.firestore.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -611,7 +611,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -665,7 +665,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj index acc596b31b..311b446faf 100644 --- a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj @@ -825,7 +825,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -874,7 +874,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.firestore.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -946,7 +946,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -1016,7 +1016,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/functions/integration_test/integration_test.xcodeproj/project.pbxproj b/functions/integration_test/integration_test.xcodeproj/project.pbxproj index c142aa743c..7f4a8aac6b 100644 --- a/functions/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/functions/integration_test/integration_test.xcodeproj/project.pbxproj @@ -507,7 +507,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -540,7 +540,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.functions.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -597,7 +597,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -652,7 +652,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/gma/integration_test/integration_test.xcodeproj/project.pbxproj b/gma/integration_test/integration_test.xcodeproj/project.pbxproj index 35b4a36051..ed14afbb01 100644 --- a/gma/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/gma/integration_test/integration_test.xcodeproj/project.pbxproj @@ -319,7 +319,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -351,7 +351,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/installations/integration_test/integration_test.xcodeproj/project.pbxproj b/installations/integration_test/integration_test.xcodeproj/project.pbxproj index ba76407391..52c31320be 100644 --- a/installations/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/installations/integration_test/integration_test.xcodeproj/project.pbxproj @@ -314,7 +314,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -345,7 +345,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj index 50397c4fc1..3326d85de3 100644 --- a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj @@ -504,7 +504,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -536,7 +536,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -590,7 +590,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -642,7 +642,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.google.FirebaseCppMessagingTestApp.dev.integration-test-tvos"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj index 9d7e4a4d38..03a180adc4 100644 --- a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj @@ -479,7 +479,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -510,7 +510,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -563,7 +563,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -614,7 +614,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.ios.remoteconfig.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj index 498027e55f..a774bdb83b 100644 --- a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj +++ b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj @@ -402,7 +402,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -429,7 +429,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -451,7 +451,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TEST_TARGET_NAME = gameloop_tvos; TVOS_DEPLOYMENT_TARGET = 10.1; @@ -474,7 +474,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TEST_TARGET_NAME = gameloop_tvos; TVOS_DEPLOYMENT_TARGET = 10.1; @@ -610,7 +610,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.gameloop; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 14.5; }; @@ -629,7 +629,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.gameloop; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 14.5; }; @@ -647,7 +647,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.gameloopUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = gameloop; }; @@ -665,7 +665,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.gameloopUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = gameloop; }; diff --git a/scripts/gha/ui_testing/uitest_apple/FirebaseCppUITestApp.xcodeproj/project.pbxproj b/scripts/gha/ui_testing/uitest_apple/FirebaseCppUITestApp.xcodeproj/project.pbxproj index c364a51247..2389a01b57 100644 --- a/scripts/gha/ui_testing/uitest_apple/FirebaseCppUITestApp.xcodeproj/project.pbxproj +++ b/scripts/gha/ui_testing/uitest_apple/FirebaseCppUITestApp.xcodeproj/project.pbxproj @@ -366,7 +366,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.uitestapp.dev; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Google Development"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -385,7 +385,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.uitestapp.dev; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Google Development"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -405,7 +405,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.FirebaseCppUITestAppUITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Google Development"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = FirebaseCppUITestApp; }; @@ -426,7 +426,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.FirebaseCppUITestAppUITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Google Development"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = FirebaseCppUITestApp; }; diff --git a/storage/integration_test/integration_test.xcodeproj/project.pbxproj b/storage/integration_test/integration_test.xcodeproj/project.pbxproj index 764c0c9a16..22c9abcf4f 100644 --- a/storage/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/storage/integration_test/integration_test.xcodeproj/project.pbxproj @@ -491,7 +491,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -523,7 +523,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.storage.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -579,7 +579,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -633,7 +633,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; From f634c7ded3f1b979919cc7f3491c56b194909e09 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 6 Mar 2024 16:15:04 -0800 Subject: [PATCH 19/44] Fix tvOS deployment target in Xcode projects. --- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj index 4511cf76bf..61b2f0a179 100644 --- a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj @@ -565,7 +565,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -616,7 +616,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj index df7fe0c798..f44ee13bf7 100644 --- a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj @@ -514,7 +514,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -565,7 +565,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/auth/integration_test/integration_test.xcodeproj/project.pbxproj b/auth/integration_test/integration_test.xcodeproj/project.pbxproj index 482db9e51f..fafa4a688f 100644 --- a/auth/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/auth/integration_test/integration_test.xcodeproj/project.pbxproj @@ -592,7 +592,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -643,7 +643,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/database/integration_test/integration_test.xcodeproj/project.pbxproj b/database/integration_test/integration_test.xcodeproj/project.pbxproj index 4d293c57dc..563e7d44e9 100644 --- a/database/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/database/integration_test/integration_test.xcodeproj/project.pbxproj @@ -514,7 +514,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -565,7 +565,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj index fe60d59095..9a813b3d6b 100644 --- a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj @@ -613,7 +613,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -667,7 +667,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj index 311b446faf..82e38ef226 100644 --- a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj @@ -948,7 +948,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -1018,7 +1018,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/functions/integration_test/integration_test.xcodeproj/project.pbxproj b/functions/integration_test/integration_test.xcodeproj/project.pbxproj index 7f4a8aac6b..ce3d4ecadb 100644 --- a/functions/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/functions/integration_test/integration_test.xcodeproj/project.pbxproj @@ -599,7 +599,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -654,7 +654,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj index 3326d85de3..3f6535e8b8 100644 --- a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj @@ -592,7 +592,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -644,7 +644,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj index 03a180adc4..5d5250a7df 100644 --- a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj @@ -565,7 +565,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -616,7 +616,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/storage/integration_test/integration_test.xcodeproj/project.pbxproj b/storage/integration_test/integration_test.xcodeproj/project.pbxproj index 22c9abcf4f..35f1e2759b 100644 --- a/storage/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/storage/integration_test/integration_test.xcodeproj/project.pbxproj @@ -581,7 +581,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -635,7 +635,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; From ec93457fce5534c78403c987d9307d55129bb814 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 7 Mar 2024 12:12:27 -0800 Subject: [PATCH 20/44] Set up default Xcode version. --- .github/workflows/integration_tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index bbd9927f31..901266bc1c 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -292,6 +292,9 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ env.pythonVersion }} + - name: setup default Xcode version (macos) + if: runner.os == 'macOS' + run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer - name: Install Desktop SDK & integration tests prerequisites uses: nick-invision/retry@v2 with: From 0c4d18943d93667fa68aa13dc0935a341669a01f Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 7 Mar 2024 12:35:14 -0800 Subject: [PATCH 21/44] Tweak simulator versions. --- scripts/gha/print_matrix_configuration.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 560eefae9e..2a46e80e1e 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -222,9 +222,9 @@ {"type": "ftl", "device": "model=iphone8,version=16.6"}, {"type": "ftl", "device": "model=ipad10,version=16.6"}, ], - "simulator_min": [ {"type": "virtual", "name":"iPhone SE (3rd generation)", "version":"16.1"} ], - "simulator_target": [ {"type": "virtual", "name":"iPhone 14", "version":"17.0.1"} ], - "simulator_latest": [ {"type": "virtual", "name":"iPhone 14 Pro Max", "version":"17.2"} ], + "simulator_min": [ {"type": "virtual", "name":"iPhone SE (3rd generation)", "version":"17.0"} ], + "simulator_target": [ {"type": "virtual", "name":"iPhone 14", "version":"17.0"} ], + "simulator_latest": [ {"type": "virtual", "name":"iPhone 15 Pro Max", "version":"17.2"} ], "tvos_simulator": [ {"type": "virtual", "name":"Apple TV", "version":"16.1"} ], } From 4413caa4a34328b8111e76ddef5b1509875708c7 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 7 Mar 2024 12:51:08 -0800 Subject: [PATCH 22/44] Only disable the warning on Mac. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7e9dfac59..1ba77f0a6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,8 +156,8 @@ if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-nullability-completeness") endif() -if(DESKTOP) - # For desktop, disable deprecated builtins warnings, as absl-cpp uses them. +if(DESKTOP AND APPLE) + # For macOS, disable deprecated builtins warnings, as absl-cpp uses them. set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-builtins") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-builtins") endif() From 364a2f37d1d87c56bd4b013eb9ad9486f4dfea9c Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 10:09:30 -0800 Subject: [PATCH 23/44] Temporarily use branch for Firestore. --- cmake/external/firestore.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake index 56604a5183..9524749def 100644 --- a/cmake/external/firestore.cmake +++ b/cmake/external/firestore.cmake @@ -20,7 +20,8 @@ endif() # If the format of the line below changes, then be sure to update # https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81 -set(version CocoaPods-10.22.0) +#set(version CocoaPods-10.22.0) +set(version js-patch-absl) function(GetReleasedDep) message("Getting released firebase-ios-sdk @ ${version}") From fd443bb32f4fbfd207ffe2109dba9eb640b7183b Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 10:25:26 -0800 Subject: [PATCH 24/44] Use xcode-select to set Xcode version for iOS/tvOS as well. --- .github/workflows/integration_tests.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 901266bc1c..ddcdf6ab7c 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -293,7 +293,7 @@ jobs: with: python-version: ${{ env.pythonVersion }} - name: setup default Xcode version (macos) - if: runner.os == 'macOS' + if: ${{ runner.os == 'macOS' }} run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer - name: Install Desktop SDK & integration tests prerequisites uses: nick-invision/retry@v2 @@ -539,6 +539,9 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ env.pythonVersion }} + - name: setup default Xcode version (macos) + if: ${{ runner.os == 'macOS' }} + run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer - name: Install iOS SDK & integration tests prerequisites uses: nick-invision/retry@v2 with: @@ -638,6 +641,9 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ env.pythonVersion }} + - name: setup default Xcode version (macos) + if: ${{ runner.os == 'macOS' }} + run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer - name: Install tvOS SDK & integration tests prerequisites uses: nick-invision/retry@v2 with: From d8b2d63f402835952709752b0e33468c65671579 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 10:31:01 -0800 Subject: [PATCH 25/44] Also setup xcode version for test runners, in case needed for simulators. --- .github/workflows/integration_tests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index ddcdf6ab7c..d1a515edeb 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -772,6 +772,9 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ env.pythonVersion }} + - name: setup default Xcode version (macos) + if: ${{ runner.os == 'macOS' }} + run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer - name: Install prerequisites for testing uses: nick-invision/retry@v2 with: @@ -1161,6 +1164,9 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ env.pythonVersion }} + - name: setup default Xcode version (macos) + if: ${{ runner.os == 'macOS' }} + run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer - name: Install prerequisites for testing uses: nick-invision/retry@v2 with: @@ -1297,6 +1303,9 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ env.pythonVersion }} + - name: setup default Xcode version (macos) + if: ${{ runner.os == 'macOS' }} + run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer - name: Install prerequisites for testing uses: nick-invision/retry@v2 with: From 6996666462d5cffeb9a2f6e09eec5dfe2c661c6f Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 11:06:16 -0800 Subject: [PATCH 26/44] Remove warning flag no longer needed. --- CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ba77f0a6a..194618cd77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,12 +156,6 @@ if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-nullability-completeness") endif() -if(DESKTOP AND APPLE) - # For macOS, disable deprecated builtins warnings, as absl-cpp uses them. - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-builtins") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-builtins") -endif() - if(DESKTOP AND NOT MSVC AND NOT APPLE) # Linux-specific option. set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-maybe-uninitialized") From 467d0abccdcc3386c27bb862e40d0f1aa2bd3335 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 12:06:56 -0800 Subject: [PATCH 27/44] Remove default Xcode on GitHub runner to avoid SDK conflicts. --- .github/workflows/integration_tests.yml | 30 ++++++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index d1a515edeb..0259b8f67c 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -294,7 +294,10 @@ jobs: python-version: ${{ env.pythonVersion }} - name: setup default Xcode version (macos) if: ${{ runner.os == 'macOS' }} - run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + run: | + sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + # Remove default Xcode version to prevent the wrong SDK from being used. + rm -rf /Applications/Xcode.app - name: Install Desktop SDK & integration tests prerequisites uses: nick-invision/retry@v2 with: @@ -541,7 +544,10 @@ jobs: python-version: ${{ env.pythonVersion }} - name: setup default Xcode version (macos) if: ${{ runner.os == 'macOS' }} - run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + run: | + sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + # Remove default Xcode version to prevent the wrong SDK from being used. + rm -rf /Applications/Xcode.app - name: Install iOS SDK & integration tests prerequisites uses: nick-invision/retry@v2 with: @@ -643,7 +649,10 @@ jobs: python-version: ${{ env.pythonVersion }} - name: setup default Xcode version (macos) if: ${{ runner.os == 'macOS' }} - run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + run: | + sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + # Remove default Xcode version to prevent the wrong SDK from being used. + rm -rf /Applications/Xcode.app - name: Install tvOS SDK & integration tests prerequisites uses: nick-invision/retry@v2 with: @@ -774,7 +783,10 @@ jobs: python-version: ${{ env.pythonVersion }} - name: setup default Xcode version (macos) if: ${{ runner.os == 'macOS' }} - run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + run: | + sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + # Remove default Xcode version to prevent the wrong SDK from being used. + rm -rf /Applications/Xcode.app - name: Install prerequisites for testing uses: nick-invision/retry@v2 with: @@ -1166,7 +1178,10 @@ jobs: python-version: ${{ env.pythonVersion }} - name: setup default Xcode version (macos) if: ${{ runner.os == 'macOS' }} - run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + run: | + sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + # Remove default Xcode version to prevent the wrong SDK from being used. + rm -rf /Applications/Xcode.app - name: Install prerequisites for testing uses: nick-invision/retry@v2 with: @@ -1305,7 +1320,10 @@ jobs: python-version: ${{ env.pythonVersion }} - name: setup default Xcode version (macos) if: ${{ runner.os == 'macOS' }} - run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + run: | + sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + # Remove default Xcode version to prevent the wrong SDK from being used. + rm -rf /Applications/Xcode.app - name: Install prerequisites for testing uses: nick-invision/retry@v2 with: From d7831b851116366865595f0b25e2aaca4ed349b0 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 13:59:28 -0800 Subject: [PATCH 28/44] Use a commit hash rather than a branch for Firestore inclusion. --- cmake/external/firestore.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake index 9524749def..2beb1865f0 100644 --- a/cmake/external/firestore.cmake +++ b/cmake/external/firestore.cmake @@ -20,8 +20,7 @@ endif() # If the format of the line below changes, then be sure to update # https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81 -#set(version CocoaPods-10.22.0) -set(version js-patch-absl) +set(version 346f225d09ba30ca8ae01e068a8256c49a17252f) function(GetReleasedDep) message("Getting released firebase-ios-sdk @ ${version}") From 95307712b0c15f1c848b6f4e1048581e55a881c0 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 14:06:17 -0800 Subject: [PATCH 29/44] Add quotes around version since it starts with a digit. --- cmake/external/firestore.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake index 2beb1865f0..4771efb049 100644 --- a/cmake/external/firestore.cmake +++ b/cmake/external/firestore.cmake @@ -20,7 +20,7 @@ endif() # If the format of the line below changes, then be sure to update # https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81 -set(version 346f225d09ba30ca8ae01e068a8256c49a17252f) +set(version "346f225d09ba30ca8ae01e068a8256c49a17252f") function(GetReleasedDep) message("Getting released firebase-ios-sdk @ ${version}") From 586111841e5408cb78b06cff3aeb8f915af3d315 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 14:19:21 -0800 Subject: [PATCH 30/44] Set gameloop project to manual code sign mode. --- .../gameloop.xcodeproj/project.pbxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj index a1de73c846..18c48714e0 100644 --- a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj +++ b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj @@ -386,7 +386,7 @@ buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = gameloop/Info.plist; @@ -413,7 +413,7 @@ buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = gameloop/Info.plist; @@ -438,7 +438,7 @@ 6AB9DDB12681918800DA2B7E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = ( @@ -461,7 +461,7 @@ 6AB9DDB22681918800DA2B7E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = ( @@ -601,7 +601,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; INFOPLIST_FILE = gameloop/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -620,7 +620,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; INFOPLIST_FILE = gameloop/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -638,7 +638,7 @@ 6ABE26BE260DDA4300675C6B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; INFOPLIST_FILE = gameloopUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -656,7 +656,7 @@ 6ABE26BF260DDA4300675C6B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; INFOPLIST_FILE = gameloopUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", From 4c220040103f0d67f79220d224803d40c061c6c5 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 14:45:59 -0800 Subject: [PATCH 31/44] Turn off code signing for simulator builds as well. --- scripts/gha/integration_testing/xcodebuild.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/gha/integration_testing/xcodebuild.py b/scripts/gha/integration_testing/xcodebuild.py index b60c70dc60..7783d56213 100644 --- a/scripts/gha/integration_testing/xcodebuild.py +++ b/scripts/gha/integration_testing/xcodebuild.py @@ -62,11 +62,10 @@ def get_args_for_build( "BUILD_DIR=" + output_dir ] - if apple_sdk == "real": - args.extend(['CODE_SIGN_IDENTITY=""', - "CODE_SIGNING_REQUIRED=NO", - "CODE_SIGNING_ALLOWED=NO"]) - elif apple_sdk == "virtual" and apple_platfrom == "tvOS": + args.extend(['CODE_SIGN_IDENTITY=""', + "CODE_SIGNING_REQUIRED=NO", + "CODE_SIGNING_ALLOWED=NO"]) + if apple_sdk == "virtual" and apple_platfrom == "tvOS": args.extend(['-arch', "x86_64"]) if not path: From 47f003fd7f4b8d5e40086c3e9561d87980993aa2 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 14:46:37 -0800 Subject: [PATCH 32/44] Revert "Set gameloop project to manual code sign mode." This reverts commit 586111841e5408cb78b06cff3aeb8f915af3d315. --- .../gameloop.xcodeproj/project.pbxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj index 18c48714e0..a1de73c846 100644 --- a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj +++ b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj @@ -386,7 +386,7 @@ buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = gameloop/Info.plist; @@ -413,7 +413,7 @@ buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = gameloop/Info.plist; @@ -438,7 +438,7 @@ 6AB9DDB12681918800DA2B7E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = ( @@ -461,7 +461,7 @@ 6AB9DDB22681918800DA2B7E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = ( @@ -601,7 +601,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = gameloop/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -620,7 +620,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = gameloop/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -638,7 +638,7 @@ 6ABE26BE260DDA4300675C6B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = gameloopUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -656,7 +656,7 @@ 6ABE26BF260DDA4300675C6B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = gameloopUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", From 3962fa7430ba411a24fdd32f2725b28a6e4a481e Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 15:16:27 -0800 Subject: [PATCH 33/44] Change simulator IDs to match the output of xcrun xctrace list devices. (Format seems to have changed slightly in xcode 15) --- scripts/gha/print_matrix_configuration.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 2a46e80e1e..3af6ecd6fe 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -222,10 +222,10 @@ {"type": "ftl", "device": "model=iphone8,version=16.6"}, {"type": "ftl", "device": "model=ipad10,version=16.6"}, ], - "simulator_min": [ {"type": "virtual", "name":"iPhone SE (3rd generation)", "version":"17.0"} ], - "simulator_target": [ {"type": "virtual", "name":"iPhone 14", "version":"17.0"} ], - "simulator_latest": [ {"type": "virtual", "name":"iPhone 15 Pro Max", "version":"17.2"} ], - "tvos_simulator": [ {"type": "virtual", "name":"Apple TV", "version":"16.1"} ], + "simulator_min": [ {"type": "virtual", "name":"iPhone SE (3rd generation) Simulator", "version":"17.0"} ], + "simulator_target": [ {"type": "virtual", "name":"iPhone 15 Simulator", "version":"17.2"} ], + "simulator_latest": [ {"type": "virtual", "name":"iPad Pro (12.9-inch) (6th generation) Simulator", "version":"17.4"} ], + "tvos_simulator": [ {"type": "virtual", "name":"Apple TV Simulator", "version":"16.1"} ], } # Easy accesssor for getting a TEST_DEVICES entry. Note that once a device model From 1a0f2dbf04d21385d51f61a897ac8a911c174c28 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 15:18:58 -0800 Subject: [PATCH 34/44] Move "Simulator" text to test_simulator script. --- scripts/gha/print_matrix_configuration.py | 6 +++--- scripts/gha/test_simulator.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 3af6ecd6fe..6c97dc3b2c 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -222,9 +222,9 @@ {"type": "ftl", "device": "model=iphone8,version=16.6"}, {"type": "ftl", "device": "model=ipad10,version=16.6"}, ], - "simulator_min": [ {"type": "virtual", "name":"iPhone SE (3rd generation) Simulator", "version":"17.0"} ], - "simulator_target": [ {"type": "virtual", "name":"iPhone 15 Simulator", "version":"17.2"} ], - "simulator_latest": [ {"type": "virtual", "name":"iPad Pro (12.9-inch) (6th generation) Simulator", "version":"17.4"} ], + "simulator_min": [ {"type": "virtual", "name":"iPhone SE (3rd generation)", "version":"17.0"} ], + "simulator_target": [ {"type": "virtual", "name":"iPhone 15", "version":"17.2"} ], + "simulator_latest": [ {"type": "virtual", "name":"iPad Pro (12.9-inch) (6th generation)", "version":"17.4"} ], "tvos_simulator": [ {"type": "virtual", "name":"Apple TV Simulator", "version":"16.1"} ], } diff --git a/scripts/gha/test_simulator.py b/scripts/gha/test_simulator.py index 5814f9a1c5..b2a261e681 100644 --- a/scripts/gha/test_simulator.py +++ b/scripts/gha/test_simulator.py @@ -493,7 +493,7 @@ def _shutdown_simulator(): def _create_and_boot_simulator(apple_platform, device_name, device_os): """Create a simulator locally. Will wait until this simulator booted.""" _shutdown_simulator() - command = "xcrun xctrace list devices 2>&1 | grep \"%s (%s)\" | awk -F'[()]' '{print $4}'" % (device_name, device_os) + command = "xcrun xctrace list devices 2>&1 | grep \"%s Simulator (%s)\" | awk -F'[()]' '{print $4}'" % (device_name, device_os) logging.info("Get test simulator: %s", command) result = subprocess.Popen(command, universal_newlines=True, shell=True, stdout=subprocess.PIPE) device_id = result.stdout.read().strip() From 83cc51e12de695d5b6b9c22018f54b37a59495da Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 15:27:12 -0800 Subject: [PATCH 35/44] Fix iOS version for minimum simulator. --- scripts/gha/print_matrix_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 6c97dc3b2c..db38717b88 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -222,7 +222,7 @@ {"type": "ftl", "device": "model=iphone8,version=16.6"}, {"type": "ftl", "device": "model=ipad10,version=16.6"}, ], - "simulator_min": [ {"type": "virtual", "name":"iPhone SE (3rd generation)", "version":"17.0"} ], + "simulator_min": [ {"type": "virtual", "name":"iPhone SE (3rd generation)", "version":"17.0.1"} ], "simulator_target": [ {"type": "virtual", "name":"iPhone 15", "version":"17.2"} ], "simulator_latest": [ {"type": "virtual", "name":"iPad Pro (12.9-inch) (6th generation)", "version":"17.4"} ], "tvos_simulator": [ {"type": "virtual", "name":"Apple TV Simulator", "version":"16.1"} ], From 5fa3ac82050d0ebfdfb191d9262376161f5e46f5 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 16:13:44 -0800 Subject: [PATCH 36/44] Only use the first line of the simulator getter command output. --- scripts/gha/test_simulator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gha/test_simulator.py b/scripts/gha/test_simulator.py index b2a261e681..b587858df8 100644 --- a/scripts/gha/test_simulator.py +++ b/scripts/gha/test_simulator.py @@ -496,7 +496,7 @@ def _create_and_boot_simulator(apple_platform, device_name, device_os): command = "xcrun xctrace list devices 2>&1 | grep \"%s Simulator (%s)\" | awk -F'[()]' '{print $4}'" % (device_name, device_os) logging.info("Get test simulator: %s", command) result = subprocess.Popen(command, universal_newlines=True, shell=True, stdout=subprocess.PIPE) - device_id = result.stdout.read().strip() + device_id = result.stdout.readline().strip() if not device_id: # download and create device From 948754e574687632355afe33d16905da48265caa Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 16:58:10 -0800 Subject: [PATCH 37/44] Include code sign options in simulator test script as well. --- scripts/gha/test_simulator.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/gha/test_simulator.py b/scripts/gha/test_simulator.py index b587858df8..029925d374 100644 --- a/scripts/gha/test_simulator.py +++ b/scripts/gha/test_simulator.py @@ -357,7 +357,10 @@ def _build_ios_helper(helper_project, device_name, device_os): "-scheme", CONSTANTS[FLAGS.test_type]["apple_scheme"], "build-for-testing", "-destination", "platform=iOS Simulator,name=%s,OS=%s" % (device_name, device_os), - "SYMROOT=%s" % output_path] + "SYMROOT=%s" % output_path, + 'CODE_SIGN_IDENTITY=""', + "CODE_SIGNING_REQUIRED=NO", + "CODE_SIGNING_ALLOWED=NO"] logging.info("Building game-loop test: %s", " ".join(args)) subprocess.run(args=args, check=True) @@ -380,7 +383,10 @@ def _build_tvos_helper(helper_project, device_name, device_os): "-scheme", "%s_tvos" % CONSTANTS[FLAGS.test_type]["apple_scheme"], "build-for-testing", "-destination", "platform=tvOS Simulator,name=%s,OS=%s" % (device_name, device_os), - "SYMROOT=%s" % output_path] + "SYMROOT=%s" % output_path, + 'CODE_SIGN_IDENTITY=""', + "CODE_SIGNING_REQUIRED=NO", + "CODE_SIGNING_ALLOWED=NO"] logging.info("Building game-loop test: %s", " ".join(args)) subprocess.run(args=args, check=True) From c1b0986d2634f69159e73f52609328487f1f2ca7 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 8 Mar 2024 17:48:58 -0800 Subject: [PATCH 38/44] Fix extraneous "Simulator" word. --- scripts/gha/print_matrix_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index db38717b88..d47374f95c 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -225,7 +225,7 @@ "simulator_min": [ {"type": "virtual", "name":"iPhone SE (3rd generation)", "version":"17.0.1"} ], "simulator_target": [ {"type": "virtual", "name":"iPhone 15", "version":"17.2"} ], "simulator_latest": [ {"type": "virtual", "name":"iPad Pro (12.9-inch) (6th generation)", "version":"17.4"} ], - "tvos_simulator": [ {"type": "virtual", "name":"Apple TV Simulator", "version":"16.1"} ], + "tvos_simulator": [ {"type": "virtual", "name":"Apple TV", "version":"16.1"} ], } # Easy accesssor for getting a TEST_DEVICES entry. Note that once a device model From 581000fb17d92148fa659348b19be315b8906363 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 11 Mar 2024 11:53:21 -0700 Subject: [PATCH 39/44] Add test keychain for iOS simulator builds. --- .github/workflows/integration_tests.yml | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 0259b8f67c..fa9ae5c37f 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -1220,6 +1220,25 @@ jobs: if: steps.device-info.outputs.device_type == 'virtual' && contains(needs.check_and_prepare.outputs.apis, 'firestore') run: | firebase emulators:start --only firestore --project demo-example & + - name: Create keychain (macOS Simulator) + if: ${{ runner.os == 'macOS' && steps.device-info.outputs.device_type == 'virtual'}} + shell: bash + run: | + echo "Creating temporary keychain" + # Create a local keychain on Mac: + # Clean up previous temp keychain, if any. + security delete-keychain tmp-keychain 2> /dev/null || true + # Create temp keychain file and unlock it. + # (Avoid passing in -p on command line by using interactive mode.) + # Also set it to default settings so there is no unlock timeout. + security -i < "testapps/test-results-ios-${{ matrix.build_os }}-${{ matrix.ios_device }}-${{ matrix.test_type }}.log.json" fi + - name: Delete keychain (macOS Simulator) + if: ${{ always() && runner.os == 'macOS' && steps.device-info.outputs.device_type == 'virtual' }} + shell: bash + run: | + # Remove the local keychain on Mac: + # Set back to the default login keychain. + security list-keychains -d user -s login.keychain + # Delete the temp keychain, if it exists. + security delete-keychain tmp-keychain || true - name: Upload iOS test results artifact if: ${{ !cancelled() }} uses: actions/upload-artifact@v3 @@ -1353,6 +1381,25 @@ jobs: if: contains(needs.check_and_prepare.outputs.apis, 'firestore') run: | firebase emulators:start --only firestore --project demo-example & + - name: Create keychain (macOS Simulator) + if: ${{ runner.os == 'macOS' && steps.device-info.outputs.device_type == 'virtual'}} + shell: bash + run: | + echo "Creating temporary keychain" + # Create a local keychain on Mac: + # Clean up previous temp keychain, if any. + security delete-keychain tmp-keychain 2> /dev/null || true + # Create temp keychain file and unlock it. + # (Avoid passing in -p on command line by using interactive mode.) + # Also set it to default settings so there is no unlock timeout. + security -i < "testapps/test-results-tvos-${{ matrix.build_os }}-${{ matrix.tvos_device }}.log.json" fi + - name: Delete keychain (macOS Simulator) + if: ${{ always() && runner.os == 'macOS' && steps.device-info.outputs.device_type == 'virtual' }} + shell: bash + run: | + # Remove the local keychain on Mac: + # Set back to the default login keychain. + security list-keychains -d user -s login.keychain + # Delete the temp keychain, if it exists. + security delete-keychain tmp-keychain || true - name: Upload tvOS test results artifact if: ${{ !cancelled() }} uses: actions/upload-artifact@v3 From b067597651ce7a5147ae2b9024e269c41dc838e8 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 11 Mar 2024 13:51:29 -0700 Subject: [PATCH 40/44] Add code signing back in for simulator builds. --- scripts/gha/integration_testing/xcodebuild.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/gha/integration_testing/xcodebuild.py b/scripts/gha/integration_testing/xcodebuild.py index 7783d56213..cb40469a13 100644 --- a/scripts/gha/integration_testing/xcodebuild.py +++ b/scripts/gha/integration_testing/xcodebuild.py @@ -62,9 +62,10 @@ def get_args_for_build( "BUILD_DIR=" + output_dir ] - args.extend(['CODE_SIGN_IDENTITY=""', - "CODE_SIGNING_REQUIRED=NO", - "CODE_SIGNING_ALLOWED=NO"]) + if apple_sdk == "real": + args.extend(['CODE_SIGN_IDENTITY=""', + "CODE_SIGNING_REQUIRED=NO", + "CODE_SIGNING_ALLOWED=NO"]) if apple_sdk == "virtual" and apple_platfrom == "tvOS": args.extend(['-arch', "x86_64"]) From f58e4e643df00d028c449a32aa0144d9e9ce0654 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 11 Mar 2024 13:52:54 -0700 Subject: [PATCH 41/44] Add expanded error printing for additional Auth iOS callbacks. --- auth/src/ios/auth_ios.mm | 54 ++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/auth/src/ios/auth_ios.mm b/auth/src/ios/auth_ios.mm index 4b77c1ae9b..228b239c4d 100644 --- a/auth/src/ios/auth_ios.mm +++ b/auth/src/ios/auth_ios.mm @@ -379,9 +379,17 @@ void AuthResultCallback(FIRAuthDataResult *_Nullable fir_auth_result, NSError *_ } } + // If there is a NSLocalizedFailureReasonErrorKey in the userInfo, append that to the + // error message. + std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) : ""); + if (error != nullptr && error.userInfo != nullptr && + error.userInfo[NSLocalizedFailureReasonErrorKey] != nullptr) { + error_string += ": "; + error_string += util::NSStringToString(error.userInfo[NSLocalizedFailureReasonErrorKey]); + } + ReferenceCountedFutureImpl &futures = auth_data->future_impl; - futures.CompleteWithResult(handle, AuthErrorFromNSError(error), - util::NSStringToString(error.localizedDescription).c_str(), result); + futures.CompleteWithResult(handle, AuthErrorFromNSError(error), error_string.c_str(), result); } void AuthResultCallback(FIRUser *_Nullable user, NSError *_Nullable error, @@ -399,9 +407,17 @@ void AuthResultCallback(FIRUser *_Nullable user, NSError *_Nullable error, } } + // If there is a NSLocalizedFailureReasonErrorKey in the userInfo, append that to the + // error message. + std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) : ""); + if (error != nullptr && error.userInfo != nullptr && + error.userInfo[NSLocalizedFailureReasonErrorKey] != nullptr) { + error_string += ": "; + error_string += util::NSStringToString(error.userInfo[NSLocalizedFailureReasonErrorKey]); + } ReferenceCountedFutureImpl &futures = auth_data->future_impl; futures.CompleteWithResult(handle, AuthErrorFromNSError(error), - util::NSStringToString(error.localizedDescription).c_str(), + error_string.c_str(), auth_result); } @@ -410,9 +426,17 @@ void AuthResultCallback(FIRUser *_Nullable user, NSError *_Nullable error, User *current_user = AssignUser(user, auth_data); User user_result; if (current_user != nullptr) user_result = *current_user; + // If there is a NSLocalizedFailureReasonErrorKey in the userInfo, append that to the + // error message. + std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) : ""); + if (error != nullptr && error.userInfo != nullptr && + error.userInfo[NSLocalizedFailureReasonErrorKey] != nullptr) { + error_string += ": "; + error_string += util::NSStringToString(error.userInfo[NSLocalizedFailureReasonErrorKey]); + } ReferenceCountedFutureImpl &futures = auth_data->future_impl; futures.CompleteWithResult(handle, AuthErrorFromNSError(error), - util::NSStringToString(error.localizedDescription).c_str(), + error_string.c_str(), user_result); } @@ -430,10 +454,17 @@ void SignInCallback(FIRUser *_Nullable user, NSError *_Nullable error, SafeFutureHandle handle, AuthData *auth_data) { User *result = AssignUser(user, auth_data); + // If there is a NSLocalizedFailureReasonErrorKey in the userInfo, append that to the + // error message. + std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) : ""); + if (error != nullptr && error.userInfo != nullptr && + error.userInfo[NSLocalizedFailureReasonErrorKey] != nullptr) { + error_string += ": "; + error_string += util::NSStringToString(error.userInfo[NSLocalizedFailureReasonErrorKey]); + } // Finish off the asynchronous call so that the caller can read it. ReferenceCountedFutureImpl &futures = auth_data->future_impl; - futures.CompleteWithResult(handle, AuthErrorFromNSError(error), - util::NSStringToString(error.localizedDescription).c_str(), result); + futures.CompleteWithResult(handle, AuthErrorFromNSError(error), error_string.c_str(), result); } void SignInResultWithProviderCallback( @@ -467,9 +498,16 @@ void SignInResultCallback(FIRAuthDataResult *_Nullable auth_result, NSError *_Nu } } + // If there is a NSLocalizedFailureReasonErrorKey in the userInfo, append that to the + // error message. + std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) : ""); + if (error != nullptr && error.userInfo != nullptr && + error.userInfo[NSLocalizedFailureReasonErrorKey] != nullptr) { + error_string += ": "; + error_string += util::NSStringToString(error.userInfo[NSLocalizedFailureReasonErrorKey]); + } ReferenceCountedFutureImpl &futures = auth_data->future_impl; - futures.CompleteWithResult(handle, AuthErrorFromNSError(error), - util::NSStringToString(error.localizedDescription).c_str(), result); + futures.CompleteWithResult(handle, AuthErrorFromNSError(error), error_string.c_str(), result); } Future Auth::SignInWithCustomToken(const char *token) { From f132e977b4171bb6c10ef51cab72f0df673458ff Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 12 Mar 2024 11:54:15 -0700 Subject: [PATCH 42/44] Revert changes to xcodebuild.py. --- scripts/gha/integration_testing/xcodebuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gha/integration_testing/xcodebuild.py b/scripts/gha/integration_testing/xcodebuild.py index cb40469a13..b60c70dc60 100644 --- a/scripts/gha/integration_testing/xcodebuild.py +++ b/scripts/gha/integration_testing/xcodebuild.py @@ -66,7 +66,7 @@ def get_args_for_build( args.extend(['CODE_SIGN_IDENTITY=""', "CODE_SIGNING_REQUIRED=NO", "CODE_SIGNING_ALLOWED=NO"]) - if apple_sdk == "virtual" and apple_platfrom == "tvOS": + elif apple_sdk == "virtual" and apple_platfrom == "tvOS": args.extend(['-arch', "x86_64"]) if not path: From ef2ea06826cadb347d73a889b512867fb778818a Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 12 Mar 2024 11:54:38 -0700 Subject: [PATCH 43/44] Format code. --- auth/src/ios/auth_ios.mm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/auth/src/ios/auth_ios.mm b/auth/src/ios/auth_ios.mm index 228b239c4d..8180d6e1a9 100644 --- a/auth/src/ios/auth_ios.mm +++ b/auth/src/ios/auth_ios.mm @@ -381,7 +381,8 @@ void AuthResultCallback(FIRAuthDataResult *_Nullable fir_auth_result, NSError *_ // If there is a NSLocalizedFailureReasonErrorKey in the userInfo, append that to the // error message. - std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) : ""); + std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) + : ""); if (error != nullptr && error.userInfo != nullptr && error.userInfo[NSLocalizedFailureReasonErrorKey] != nullptr) { error_string += ": "; @@ -409,15 +410,15 @@ void AuthResultCallback(FIRUser *_Nullable user, NSError *_Nullable error, // If there is a NSLocalizedFailureReasonErrorKey in the userInfo, append that to the // error message. - std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) : ""); + std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) + : ""); if (error != nullptr && error.userInfo != nullptr && error.userInfo[NSLocalizedFailureReasonErrorKey] != nullptr) { error_string += ": "; error_string += util::NSStringToString(error.userInfo[NSLocalizedFailureReasonErrorKey]); } ReferenceCountedFutureImpl &futures = auth_data->future_impl; - futures.CompleteWithResult(handle, AuthErrorFromNSError(error), - error_string.c_str(), + futures.CompleteWithResult(handle, AuthErrorFromNSError(error), error_string.c_str(), auth_result); } @@ -428,15 +429,15 @@ void AuthResultCallback(FIRUser *_Nullable user, NSError *_Nullable error, if (current_user != nullptr) user_result = *current_user; // If there is a NSLocalizedFailureReasonErrorKey in the userInfo, append that to the // error message. - std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) : ""); + std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) + : ""); if (error != nullptr && error.userInfo != nullptr && error.userInfo[NSLocalizedFailureReasonErrorKey] != nullptr) { error_string += ": "; error_string += util::NSStringToString(error.userInfo[NSLocalizedFailureReasonErrorKey]); } ReferenceCountedFutureImpl &futures = auth_data->future_impl; - futures.CompleteWithResult(handle, AuthErrorFromNSError(error), - error_string.c_str(), + futures.CompleteWithResult(handle, AuthErrorFromNSError(error), error_string.c_str(), user_result); } @@ -456,7 +457,8 @@ void SignInCallback(FIRUser *_Nullable user, NSError *_Nullable error, // If there is a NSLocalizedFailureReasonErrorKey in the userInfo, append that to the // error message. - std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) : ""); + std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) + : ""); if (error != nullptr && error.userInfo != nullptr && error.userInfo[NSLocalizedFailureReasonErrorKey] != nullptr) { error_string += ": "; @@ -500,7 +502,8 @@ void SignInResultCallback(FIRAuthDataResult *_Nullable auth_result, NSError *_Nu // If there is a NSLocalizedFailureReasonErrorKey in the userInfo, append that to the // error message. - std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) : ""); + std::string error_string(error != nullptr ? util::NSStringToString(error.localizedDescription) + : ""); if (error != nullptr && error.userInfo != nullptr && error.userInfo[NSLocalizedFailureReasonErrorKey] != nullptr) { error_string += ": "; From 039c8badcb022cde555531354d7fa6902cb32da3 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 12 Mar 2024 12:50:42 -0700 Subject: [PATCH 44/44] Add release note for GMA major release. --- release_build_files/readme.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 35baa6767a..1470703f03 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -631,6 +631,12 @@ workflow use only during the development of your app, not for publicly shipping code. ## Release Notes +### Upcoming Release +- Changes + - General (iOS, tvOS, Desktop): iOS, tvOS, and macOS SDKs are now built + using Xcode 15.1. + - GMA (iOS): Updated dependency to Google-Mobile-Ads-SDK version 11.0.1. + ### 11.9.0 - Changes - General (Android): Update to Firebase Android BoM version 32.7.3.