From 6bee13be075f6f884dbb00ac0159b69a781d2b2a Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 26 Apr 2021 10:13:58 -0700 Subject: [PATCH 1/8] Update Cocoapods to 7.11.0. --- admob/integration_test/Podfile | 2 +- analytics/integration_test/Podfile | 2 +- app/integration_test/Podfile | 2 +- auth/integration_test/Podfile | 2 +- database/integration_test/Podfile | 4 +-- dynamic_links/integration_test/Podfile | 2 +- firestore/integration_test/Podfile | 4 +-- firestore/integration_test_internal/Podfile | 4 +-- functions/integration_test/Podfile | 4 +-- installations/integration_test/Podfile | 4 +-- instance_id/integration_test/Podfile | 4 +-- ios_pod/Podfile | 28 ++++++++++----------- messaging/integration_test/Podfile | 2 +- remote_config/integration_test/Podfile | 2 +- storage/integration_test/Podfile | 4 +-- 15 files changed, 35 insertions(+), 35 deletions(-) diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile index a75be53ab1..d661909eb4 100644 --- a/admob/integration_test/Podfile +++ b/admob/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' # Firebase AdMob test application. target 'integration_test' do - pod 'Firebase/AdMob', '7.10.0' + pod 'Firebase/AdMob', '7.11.0' end post_install do |installer| diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile index 9b434640a7..6bbe54f1cb 100644 --- a/analytics/integration_test/Podfile +++ b/analytics/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' # Firebase Analytics test application. target 'integration_test' do - pod 'Firebase/Analytics', '7.10.0' + pod 'Firebase/Analytics', '7.11.0' end post_install do |installer| diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile index 4184395390..ad2b6b8a1f 100644 --- a/app/integration_test/Podfile +++ b/app/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' # Firebase App test application. target 'integration_test' do - pod 'Firebase/Analytics', '7.10.0' + pod 'Firebase/Analytics', '7.11.0' end post_install do |installer| diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile index a186ec6491..c474c5c726 100644 --- a/auth/integration_test/Podfile +++ b/auth/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' # Firebase Auth test application. target 'integration_test' do - pod 'Firebase/Auth', '7.10.0' + pod 'Firebase/Auth', '7.11.0' end post_install do |installer| diff --git a/database/integration_test/Podfile b/database/integration_test/Podfile index ecbab64e3a..8d4d57e826 100644 --- a/database/integration_test/Podfile +++ b/database/integration_test/Podfile @@ -4,8 +4,8 @@ platform :ios, '10.0' # Firebase Realtime Database test application. target 'integration_test' do - pod 'Firebase/Database', '7.10.0' - pod 'Firebase/Auth', '7.10.0' + pod 'Firebase/Database', '7.11.0' + pod 'Firebase/Auth', '7.11.0' end post_install do |installer| diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile index d90dc621d3..b2baacf6f2 100644 --- a/dynamic_links/integration_test/Podfile +++ b/dynamic_links/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' # Firebase Dynamic Links test application. target 'integration_test' do - pod 'Firebase/DynamicLinks', '7.10.0' + pod 'Firebase/DynamicLinks', '7.11.0' end post_install do |installer| diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile index 6fc5be6942..ff7f019d18 100644 --- a/firestore/integration_test/Podfile +++ b/firestore/integration_test/Podfile @@ -4,8 +4,8 @@ platform :ios, '10.0' # Firebase Realtime Firestore test application. target 'integration_test' do - pod 'Firebase/Firestore', '7.10.0' - pod 'Firebase/Auth', '7.10.0' + pod 'Firebase/Firestore', '7.11.0' + pod 'Firebase/Auth', '7.11.0' end post_install do |installer| diff --git a/firestore/integration_test_internal/Podfile b/firestore/integration_test_internal/Podfile index aecf0a1cce..0c7b80046d 100644 --- a/firestore/integration_test_internal/Podfile +++ b/firestore/integration_test_internal/Podfile @@ -3,8 +3,8 @@ platform :ios, '10.0' # Cloud Firestore internal test application. target 'integration_test' do - pod 'Firebase/Firestore', '7.10.0' - pod 'Firebase/Auth', '7.10.0' + pod 'Firebase/Firestore', '7.11.0' + pod 'Firebase/Auth', '7.11.0' end post_install do |installer| diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile index 25d732fb96..27009ac5bc 100644 --- a/functions/integration_test/Podfile +++ b/functions/integration_test/Podfile @@ -4,8 +4,8 @@ platform :ios, '10.0' # Cloud Functions for Firebase test application. target 'integration_test' do - pod 'Firebase/Functions', '7.10.0' - pod 'Firebase/Auth', '7.10.0' + pod 'Firebase/Functions', '7.11.0' + pod 'Firebase/Auth', '7.11.0' end post_install do |installer| diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile index 3b8cc17b58..0e85840442 100644 --- a/installations/integration_test/Podfile +++ b/installations/integration_test/Podfile @@ -4,8 +4,8 @@ platform :ios, '10.0' # Firebase Installations test application. target 'integration_test' do - pod 'Firebase/Analytics', '7.10.0' - pod 'Firebase/Installations', '7.10.0' + pod 'Firebase/Analytics', '7.11.0' + pod 'Firebase/Installations', '7.11.0' end post_install do |installer| diff --git a/instance_id/integration_test/Podfile b/instance_id/integration_test/Podfile index d6ccb80bbb..69183112a3 100644 --- a/instance_id/integration_test/Podfile +++ b/instance_id/integration_test/Podfile @@ -4,8 +4,8 @@ platform :ios, '10.0' # Firebase Instance ID test application. target 'integration_test' do - pod 'Firebase/Analytics', '7.10.0' - pod 'FirebaseInstanceID', '7.10.0' + pod 'Firebase/Analytics', '7.11.0' + pod 'FirebaseInstanceID', '7.11.0' end post_install do |installer| diff --git a/ios_pod/Podfile b/ios_pod/Podfile index 2f9d8e61f0..becf1c24ff 100644 --- a/ios_pod/Podfile +++ b/ios_pod/Podfile @@ -2,20 +2,20 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '10.0' target 'GetPods' do - pod 'Firebase/Core', '7.10.0' + pod 'Firebase/Core', '7.11.0' - pod 'Firebase/AdMob', '7.10.0' - pod 'Firebase/Analytics', '7.10.0' - pod 'Firebase/Auth', '7.10.0' - pod 'Firebase/Crashlytics', '7.10.0' - pod 'Firebase/Database', '7.10.0' - pod 'Firebase/DynamicLinks', '7.10.0' - pod 'Firebase/Firestore', '7.10.0' - pod 'Firebase/Functions', '7.10.0' - pod 'Firebase/Installations', '7.10.0' - pod 'FirebaseInstanceID', '7.10.0' - pod 'Firebase/Messaging', '7.10.0' - pod 'Firebase/RemoteConfig', '7.10.0' - pod 'Firebase/Storage', '7.10.0' + pod 'Firebase/AdMob', '7.11.0' + pod 'Firebase/Analytics', '7.11.0' + pod 'Firebase/Auth', '7.11.0' + pod 'Firebase/Crashlytics', '7.11.0' + pod 'Firebase/Database', '7.11.0' + pod 'Firebase/DynamicLinks', '7.11.0' + pod 'Firebase/Firestore', '7.11.0' + pod 'Firebase/Functions', '7.11.0' + pod 'Firebase/Installations', '7.11.0' + pod 'FirebaseInstanceID', '7.11.0' + pod 'Firebase/Messaging', '7.11.0' + pod 'Firebase/RemoteConfig', '7.11.0' + pod 'Firebase/Storage', '7.11.0' end diff --git a/messaging/integration_test/Podfile b/messaging/integration_test/Podfile index d12878bd2a..7e3e51c8a1 100644 --- a/messaging/integration_test/Podfile +++ b/messaging/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' # Firebase Cloud Messaging test application. target 'integration_test' do - pod 'Firebase/Messaging', '7.10.0' + pod 'Firebase/Messaging', '7.11.0' end post_install do |installer| diff --git a/remote_config/integration_test/Podfile b/remote_config/integration_test/Podfile index fa8d0ede55..f8d30fe2b2 100644 --- a/remote_config/integration_test/Podfile +++ b/remote_config/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' # Firebase Remote Config test application. target 'integration_test' do - pod 'Firebase/RemoteConfig', '7.10.0' + pod 'Firebase/RemoteConfig', '7.11.0' end post_install do |installer| diff --git a/storage/integration_test/Podfile b/storage/integration_test/Podfile index 9f34d3f765..8f798cd272 100644 --- a/storage/integration_test/Podfile +++ b/storage/integration_test/Podfile @@ -4,8 +4,8 @@ platform :ios, '10.0' # Cloud Storage for Firebase test application. target 'integration_test' do - pod 'Firebase/Storage', '7.10.0' - pod 'Firebase/Auth', '7.10.0' + pod 'Firebase/Storage', '7.11.0' + pod 'Firebase/Auth', '7.11.0' end post_install do |installer| From f9e894015561d834474ece8beeea49c03479aa2c Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 26 Apr 2021 10:19:06 -0700 Subject: [PATCH 2/8] Update readme file. --- release_build_files/readme.md | 64 +++++++++++++++++------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index c158b18abd..b550330afa 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -184,48 +184,48 @@ Feature | Required Frameworks and Cocoapods -------------------------- | --------------------------------------- Firebase AdMob | firebase_admob.framework | firebase.framework - | Firebase/AdMob Cocoapod (7.10.0) + | Firebase/AdMob Cocoapod (7.11.0) Firebase Analytics | firebase_analytics.framework | firebase.framework - | Firebase/Analytics Cocoapod (7.10.0) + | Firebase/Analytics Cocoapod (7.11.0) Firebase Authentication | firebase_auth.framework | firebase.framework - | Firebase/Auth Cocoapod (7.10.0) + | Firebase/Auth Cocoapod (7.11.0) Firebase Dynamic Links | firebase_dynamic_links.framework | firebase.framework - | Firebase/DynamicLinks Cocoapod (7.10.0) + | Firebase/DynamicLinks Cocoapod (7.11.0) Cloud Firestore | firebase_firestore.framework | firebase_auth.framework | firebase.framework - | Firebase/Firestore Cocoapod (7.10.0) - | Firebase/Auth Cocoapod (7.10.0) + | Firebase/Firestore Cocoapod (7.11.0) + | Firebase/Auth Cocoapod (7.11.0) Firebase Functions | firebase_functions.framework | firebase_auth.framework (optional) | firebase.framework - | Firebase/Functions Cocoapod (7.10.0) - | Firebase/Auth Cocoapod (7.10.0) + | Firebase/Functions Cocoapod (7.11.0) + | Firebase/Auth Cocoapod (7.11.0) Firebase Installations | firebase_installations.framework | firebase.framework - | FirebaseInstallations Cocoapod (7.10.0) + | FirebaseInstallations Cocoapod (7.11.0) Firebase Instance ID | firebase_instance_id.framework | firebase.framework - | FirebaseInstanceID Cocoapod (7.10.0) + | FirebaseInstanceID Cocoapod (7.11.0) Firebase Cloud Messaging | firebase_messaging.framework | firebase.framework - | Firebase/Messaging Cocoapod (7.10.0) + | Firebase/Messaging Cocoapod (7.11.0) Firebase Realtime Database | firebase_database.framework | firebase_auth.framework | firebase.framework - | Firebase/Database Cocoapod (7.10.0) - | Firebase/Auth Cocoapod (7.10.0) + | Firebase/Database Cocoapod (7.11.0) + | Firebase/Auth Cocoapod (7.11.0) Firebase Remote Config | firebase_remote_config.framework | firebase.framework - | Firebase/RemoteConfig Cocoapod (7.10.0) + | Firebase/RemoteConfig Cocoapod (7.11.0) Firebase Storage | firebase_storage.framework | firebase_auth.framework | firebase.framework - | Firebase/Storage Cocoapod (7.10.0) - | Firebase/Auth Cocoapod (7.10.0) + | Firebase/Storage Cocoapod (7.11.0) + | Firebase/Auth Cocoapod (7.11.0) Important: Each version of the Firebase C++ SDK supports a specific version of the Firebase iOS SDK. Please ensure that you reference the Cocoapod versions @@ -241,48 +241,48 @@ Feature | Required Libraries and Cocoapods -------------------------- | ----------------------------------------- Firebase AdMob | libfirebase_admob.a | libfirebase_app.a - | Firebase/AdMob Cocoapod (7.10.0) + | Firebase/AdMob Cocoapod (7.11.0) Firebase Analytics | libfirebase_analytics.a | libfirebase_app.a - | Firebase/Analytics Cocoapod (7.10.0) + | Firebase/Analytics Cocoapod (7.11.0) Firebase Authentication | libfirebase_auth.a | libfirebase_app.a - | Firebase/Auth Cocoapod (7.10.0) + | Firebase/Auth Cocoapod (7.11.0) Firebase Dynamic Links | libfirebase_dynamic_links.a | libfirebase_app.a - | Firebase/DynamicLinks Cocoapod (7.10.0) + | Firebase/DynamicLinks Cocoapod (7.11.0) Cloud Firestore | libfirebase_firestore.a | libfirebase_app.a | libfirebase_auth.a - | Firebase/Firestore Cocoapod (7.10.0) - | Firebase/Auth Cocoapod (7.10.0) + | Firebase/Firestore Cocoapod (7.11.0) + | Firebase/Auth Cocoapod (7.11.0) Firebase Functions | libfirebase_functions.a | libfirebase_app.a | libfirebase_auth.a (optional) - | Firebase/Functions Cocoapod (7.10.0) - | Firebase/Auth Cocoapod (7.10.0) + | Firebase/Functions Cocoapod (7.11.0) + | Firebase/Auth Cocoapod (7.11.0) Firebase Installations | libfirebase_installations.a | libfirebase_app.a - | FirebaseInstallations Cocoapod (7.10.0) + | FirebaseInstallations Cocoapod (7.11.0) Firebase Instance ID | libfirebase_instance_id.a | libfirebase_app.a - | FirebaseInstanceID Cocoapod (7.10.0) + | FirebaseInstanceID Cocoapod (7.11.0) Firebase Cloud Messaging | libfirebase_messaging.a | libfirebase_app.a - | Firebase/CloudMessaging Cocoapod (7.10.0) + | Firebase/CloudMessaging Cocoapod (7.11.0) Firebase Realtime Database | libfirebase_database.a | libfirebase_app.a | libfirebase_auth.a - | Firebase/Database Cocoapod (7.10.0) - | Firebase/Auth Cocoapod (7.10.0) + | Firebase/Database Cocoapod (7.11.0) + | Firebase/Auth Cocoapod (7.11.0) Firebase Remote Config | libfirebase_remote_config.a | libfirebase_app.a - | Firebase/RemoteConfig Cocoapod (7.10.0) + | Firebase/RemoteConfig Cocoapod (7.11.0) Firebase Storage | libfirebase_storage.a | libfirebase_app.a | libfirebase_auth.a - | Firebase/Storage Cocoapod (7.10.0) - | Firebase/Auth Cocoapod (7.10.0) + | Firebase/Storage Cocoapod (7.11.0) + | Firebase/Auth Cocoapod (7.11.0) Important: Each version of the Firebase C++ SDK supports a specific version of the Firebase iOS SDK. Please ensure that you reference the Cocoapod versions From b424cf5575ce10e0cc1ce98e828b0eb9b0046239 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 26 Apr 2021 10:20:04 -0700 Subject: [PATCH 3/8] Update C++ SDK version to 7.3.0. --- cpp_sdk_version.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp_sdk_version.json b/cpp_sdk_version.json index f0806a600a..66e71d6819 100644 --- a/cpp_sdk_version.json +++ b/cpp_sdk_version.json @@ -1,5 +1,5 @@ { - "released": "7.2.0", - "stable": "7.2.0", - "head": "7.2.0" + "released": "7.3.0", + "stable": "7.3.0", + "head": "7.3.0" } From 308bf38306b00043da1385a0aec49fc70daaad52 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 26 Apr 2021 10:25:58 -0700 Subject: [PATCH 4/8] Add release notes to readme. --- release_build_files/readme.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index b550330afa..34ad049e93 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -571,6 +571,11 @@ code. ## Release Notes +### 7.3.0 +- Changes + - General (iOS): Update dependencies. + - General (Android): Fix a gradle error if ANDROID_NDK_HOME is not set. + ### 7.2.0 - Changes - General (Android): Firebase support for STLPort is deprecated and will From f45f1c4eb9471c8f2abf54804bd4518f9ec52f37 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 26 Apr 2021 10:27:10 -0700 Subject: [PATCH 5/8] Update Firestore source dependency to 7.11.0. --- 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 44192f8679..945e4513bf 100644 --- a/cmake/external/firestore.cmake +++ b/cmake/external/firestore.cmake @@ -18,7 +18,7 @@ if(TARGET firestore) return() endif() -set(version 9bae3613d885fb8cc7d74c612c90f821a0e1981f) +set(version CocoaPods-7.11.0) ExternalProject_Add( firestore From bddd04706b864303a88a2f0006d14e1b5d36f44d Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 26 Apr 2021 11:28:41 -0700 Subject: [PATCH 6/8] Fix a compiler warning in 32-bit mode. --- testing/sample_framework/src/ios/ios_app_framework.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/sample_framework/src/ios/ios_app_framework.mm b/testing/sample_framework/src/ios/ios_app_framework.mm index 2710c1f544..2be0a4c105 100755 --- a/testing/sample_framework/src/ios/ios_app_framework.mm +++ b/testing/sample_framework/src/ios/ios_app_framework.mm @@ -184,7 +184,7 @@ bool should_filter(const char *str) { int fd = reinterpret_cast(filedes_ptr)[0]; std::string buffer; char bufchar; - while (int n = read(fd, &bufchar, 1)) { + while (size_t n = read(fd, &bufchar, 1)) { if (bufchar == '\0') { break; } else if (bufchar == '\n') { From ddb5a4c04310005a7f9cd676007186926ad8a7e9 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 26 Apr 2021 11:28:50 -0700 Subject: [PATCH 7/8] Update iOS integration test OS deployment target to 10.0. --- .../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 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/admob/integration_test/integration_test.xcodeproj/project.pbxproj b/admob/integration_test/integration_test.xcodeproj/project.pbxproj index 57e3561511..4232b2e5fe 100644 --- a/admob/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/admob/integration_test/integration_test.xcodeproj/project.pbxproj @@ -279,7 +279,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -316,7 +316,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj index d1d6b852d1..ca08168ca8 100644 --- a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj @@ -236,7 +236,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.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 d1d6b852d1..ca08168ca8 100644 --- a/app/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/app/integration_test/integration_test.xcodeproj/project.pbxproj @@ -236,7 +236,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.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 a3901f2c6a..2ad693226d 100644 --- a/auth/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/auth/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 = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.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 = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.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 d1d6b852d1..ca08168ca8 100644 --- a/database/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/database/integration_test/integration_test.xcodeproj/project.pbxproj @@ -236,7 +236,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.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 d1d6b852d1..ca08168ca8 100644 --- a/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj @@ -236,7 +236,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.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 daabcc5412..31d9053a4e 100644 --- a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj @@ -244,7 +244,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -281,7 +281,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.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 70a863b429..32cdde8dc5 100644 --- a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj @@ -353,7 +353,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -390,7 +390,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.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 d1d6b852d1..ca08168ca8 100644 --- a/functions/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/functions/integration_test/integration_test.xcodeproj/project.pbxproj @@ -236,7 +236,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.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 d1d6b852d1..ca08168ca8 100644 --- a/installations/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/installations/integration_test/integration_test.xcodeproj/project.pbxproj @@ -236,7 +236,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/instance_id/integration_test/integration_test.xcodeproj/project.pbxproj b/instance_id/integration_test/integration_test.xcodeproj/project.pbxproj index d1d6b852d1..ca08168ca8 100644 --- a/instance_id/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/instance_id/integration_test/integration_test.xcodeproj/project.pbxproj @@ -236,7 +236,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.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 d1d6b852d1..ca08168ca8 100644 --- a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj @@ -236,7 +236,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.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 d1d6b852d1..ca08168ca8 100644 --- a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj @@ -236,7 +236,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/storage/integration_test/integration_test.xcodeproj/project.pbxproj b/storage/integration_test/integration_test.xcodeproj/project.pbxproj index d1d6b852d1..ca08168ca8 100644 --- a/storage/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/storage/integration_test/integration_test.xcodeproj/project.pbxproj @@ -236,7 +236,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; From 8759a97a8d9edf1398e9ad94a87ca551b522931d Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 26 Apr 2021 12:15:41 -0700 Subject: [PATCH 8/8] Pin googletest to release 1.10.0, as master is now broken on iOS. --- testing/test_framework/download_googletest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/test_framework/download_googletest.py b/testing/test_framework/download_googletest.py index 9f3bd9883c..e0ec2088ba 100755 --- a/testing/test_framework/download_googletest.py +++ b/testing/test_framework/download_googletest.py @@ -35,9 +35,9 @@ SRC_DIR = os.path.relpath(os.path.dirname(__file__)) TAG = os.path.basename(__file__) -GOOGLETEST_ZIP = 'https://github.com/google/googletest/archive/master.zip' +GOOGLETEST_ZIP = 'https://github.com/google/googletest/archive/refs/tags/release-1.10.0.zip' # Top-level directory inside the zip file to ignore. -GOOGLETEST_DIR = os.path.join('googletest-master') +GOOGLETEST_DIR = os.path.join('googletest-release-1.10.0') # The GoogleTest code is copied into this subdirectory. # This structure matches where the files are placed by CMake.