Skip to content

Update iOS dependencies - Wed Dec 13 2023 #1502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ env:
triggerLabelPrefix: "tests-requested: "
triggerLabelFull: "tests-requested: full"
triggerLabelQuick: "tests-requested: quick"
pythonVersion: '3.7'
pythonVersion: '3.8'
xcodeVersion: '14.1'
artifactRetentionDays: 2
GITHUB_TOKEN: ${{ github.token }}
Expand Down
4 changes: 2 additions & 2 deletions analytics/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '11.0'
pod 'Firebase/Analytics', '10.17.0'
pod 'Firebase/Analytics', '10.19.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Analytics', '10.17.0'
pod 'Firebase/Analytics', '10.19.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion analytics/ios_headers/FIREventNames.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2023 Google LLC

// Copied from Firebase Analytics iOS SDK 10.16.0.
// Copied from Firebase Analytics iOS SDK 10.19.0.

/// @file FIREventNames.h
///
Expand Down
2 changes: 1 addition & 1 deletion analytics/ios_headers/FIRParameterNames.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2023 Google LLC

// Copied from Firebase Analytics iOS SDK 10.16.0.
// Copied from Firebase Analytics iOS SDK 10.19.0.

/// @file FIRParameterNames.h
///
Expand Down
2 changes: 1 addition & 1 deletion analytics/ios_headers/FIRUserPropertyNames.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2023 Google LLC

// Copied from Firebase Analytics iOS SDK 10.16.0.
// Copied from Firebase Analytics iOS SDK 10.19.0.

/// @file FIRUserPropertyNames.h
///
Expand Down
2 changes: 1 addition & 1 deletion app/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '11.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/Analytics', '10.17.0'
pod 'Firebase/Analytics', '10.19.0'
end

post_install do |installer|
Expand Down
20 changes: 10 additions & 10 deletions app_check/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '11.0'
pod 'Firebase/AppCheck', '10.17.0'
pod 'Firebase/Database', '10.17.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Storage', '10.17.0'
pod 'Firebase/Functions', '10.17.0'
pod 'Firebase/AppCheck', '10.19.0'
pod 'Firebase/Database', '10.19.0'
pod 'Firebase/Auth', '10.19.0'
pod 'Firebase/Storage', '10.19.0'
pod 'Firebase/Functions', '10.19.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/AppCheck', '10.17.0'
pod 'Firebase/Database', '10.17.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Storage', '10.17.0'
pod 'Firebase/Functions', '10.17.0'
pod 'Firebase/AppCheck', '10.19.0'
pod 'Firebase/Database', '10.19.0'
pod 'Firebase/Auth', '10.19.0'
pod 'Firebase/Storage', '10.19.0'
pod 'Firebase/Functions', '10.19.0'
end

post_install do |installer|
Expand Down
5 changes: 4 additions & 1 deletion app_check/src/ios/debug_provider_ios.mm
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
namespace app_check {
namespace internal {

// The key used by the iOS SDK to get the debug token from.
// The keys used by the iOS SDK to get the debug token from.
static NSString* const kDebugTokenUserDefaultsKey = @"FIRAAppCheckDebugToken";
static NSString* const kGACDebugTokenUserDefaultsKey = @"GACAppCheckDebugToken";

class DebugAppCheckProvider : public AppCheckProvider {
public:
Expand Down Expand Up @@ -92,6 +93,8 @@ virtual void GetToken(
// Write to the same location that the iOS SDK will read from.
NSString* token_string = (!token.empty()) ? util::StringToNSString(token) : nullptr;
[[NSUserDefaults standardUserDefaults] setObject:token_string forKey:kDebugTokenUserDefaultsKey];
[[NSUserDefaults standardUserDefaults] setObject:token_string
forKey:kGACDebugTokenUserDefaultsKey];
}

} // namespace internal
Expand Down
4 changes: 2 additions & 2 deletions auth/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '11.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Auth', '10.19.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Auth', '10.19.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/firestore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 CocoaPods-10.17.0)
set(version CocoaPods-10.19.0)

function(GetReleasedDep)
message("Getting released firebase-ios-sdk @ ${version}")
Expand Down
6 changes: 3 additions & 3 deletions cpp_sdk_version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"released": "11.6.0",
"stable": "11.6.0",
"head": "11.6.0"
"released": "11.7.0",
"stable": "11.7.0",
"head": "11.7.0"
}
8 changes: 4 additions & 4 deletions database/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '11.0'
pod 'Firebase/Database', '10.17.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Database', '10.19.0'
pod 'Firebase/Auth', '10.19.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Database', '10.17.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Database', '10.19.0'
pod 'Firebase/Auth', '10.19.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion dynamic_links/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '11.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/DynamicLinks', '10.17.0'
pod 'Firebase/DynamicLinks', '10.19.0'
end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 deletions firestore/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '11.0'
pod 'Firebase/Firestore', '10.17.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Firestore', '10.19.0'
pod 'Firebase/Auth', '10.19.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Firestore', '10.17.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Firestore', '10.19.0'
pod 'Firebase/Auth', '10.19.0'
end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 deletions firestore/integration_test_internal/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '11.0'
pod 'Firebase/Firestore', '10.17.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Firestore', '10.19.0'
pod 'Firebase/Auth', '10.19.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Firestore', '10.17.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Firestore', '10.19.0'
pod 'Firebase/Auth', '10.19.0'
end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 deletions functions/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '11.0'
pod 'Firebase/Functions', '10.17.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Functions', '10.19.0'
pod 'Firebase/Auth', '10.19.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Functions', '10.17.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Functions', '10.19.0'
pod 'Firebase/Auth', '10.19.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions gma/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ platform :ios, '11.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/CoreOnly', '10.17.0'
pod 'Google-Mobile-Ads-SDK', '10.12.0'
pod 'Firebase/CoreOnly', '10.19.0'
pod 'Google-Mobile-Ads-SDK', '10.14.0'
pod 'GoogleUserMessagingPlatform', '2.1.0'
end

Expand Down
4 changes: 2 additions & 2 deletions installations/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ platform :ios, '11.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/Analytics', '10.17.0'
pod 'Firebase/Installations', '10.17.0'
pod 'Firebase/Analytics', '10.19.0'
pod 'Firebase/Installations', '10.19.0'
end

post_install do |installer|
Expand Down
28 changes: 14 additions & 14 deletions ios_pod/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ platform :ios, '11.0'
use_frameworks!

target 'GetPods' do
pod 'Firebase/Core', '10.17.0'
pod 'Firebase/Core', '10.19.0'

pod 'Google-Mobile-Ads-SDK', '10.12.0'
pod 'Google-Mobile-Ads-SDK', '10.14.0'
pod 'GoogleUserMessagingPlatform', '2.1.0'
pod 'Firebase/Analytics', '10.17.0'
pod 'Firebase/AppCheck', '10.17.0'
pod 'Firebase/Auth', '10.17.0'
pod 'Firebase/Crashlytics', '10.17.0'
pod 'Firebase/Database', '10.17.0'
pod 'Firebase/DynamicLinks', '10.17.0'
pod 'Firebase/Firestore', '10.17.0'
pod 'Firebase/Functions', '10.17.0'
pod 'Firebase/Installations', '10.17.0'
pod 'Firebase/Messaging', '10.17.0'
pod 'Firebase/RemoteConfig', '10.17.0'
pod 'Firebase/Storage', '10.17.0'
pod 'Firebase/Analytics', '10.19.0'
pod 'Firebase/AppCheck', '10.19.0'
pod 'Firebase/Auth', '10.19.0'
pod 'Firebase/Crashlytics', '10.19.0'
pod 'Firebase/Database', '10.19.0'
pod 'Firebase/DynamicLinks', '10.19.0'
pod 'Firebase/Firestore', '10.19.0'
pod 'Firebase/Functions', '10.19.0'
pod 'Firebase/Installations', '10.19.0'
pod 'Firebase/Messaging', '10.19.0'
pod 'Firebase/RemoteConfig', '10.19.0'
pod 'Firebase/Storage', '10.19.0'

end

Expand Down
28 changes: 14 additions & 14 deletions ios_pod/swift_headers/FirebaseAnalytics-Swift.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#if 0
#elif defined(__arm64__) && __arm64__
// Copyright 2023 Google LLC
// Copied from Firebase iOS SDK 10.17.0.
// Copied from Firebase iOS SDK 10.19.0.

// Generated by Apple Swift version 5.7.1 (swiftlang-5.7.1.135.3
// clang-1400.0.29.51)
Expand Down Expand Up @@ -267,12 +267,12 @@ using UInt = size_t;
#if __has_attribute(external_source_symbol)
#pragma push_macro("any")
#undef any
#pragma clang attribute push( \
__attribute__((external_source_symbol( \
language = "Swift", defined_in = "FirebaseAnalytics", \
generated_declaration))), \
apply_to = any(function, enum, objc_interface, objc_category, \
objc_protocol))
#pragma clang attribute push( \
__attribute__((external_source_symbol(language = "Swift", \
defined_in = "FirebaseAnalytics", \
generated_declaration))), \
apply_to = \
any(function, enum, objc_interface, objc_category, objc_protocol))
#pragma pop_macro("any")
#endif

Expand All @@ -289,7 +289,7 @@ using UInt = size_t;

#elif defined(__x86_64__) && __x86_64__
// Copyright 2023 Google LLC
// Copied from Firebase iOS SDK 10.17.0.
// Copied from Firebase iOS SDK 10.19.0.

// Generated by Apple Swift version 5.7.1 (swiftlang-5.7.1.135.3
// clang-1400.0.29.51)
Expand Down Expand Up @@ -555,12 +555,12 @@ using UInt = size_t;
#if __has_attribute(external_source_symbol)
#pragma push_macro("any")
#undef any
#pragma clang attribute push( \
__attribute__((external_source_symbol( \
language = "Swift", defined_in = "FirebaseAnalytics", \
generated_declaration))), \
apply_to = any(function, enum, objc_interface, objc_category, \
objc_protocol))
#pragma clang attribute push( \
__attribute__((external_source_symbol(language = "Swift", \
defined_in = "FirebaseAnalytics", \
generated_declaration))), \
apply_to = \
any(function, enum, objc_interface, objc_category, objc_protocol))
#pragma pop_macro("any")
#endif

Expand Down
24 changes: 12 additions & 12 deletions ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,12 @@ using UInt = size_t;
#if __has_attribute(external_source_symbol)
#pragma push_macro("any")
#undef any
#pragma clang attribute push( \
__attribute__((external_source_symbol( \
language = "Swift", defined_in = "FirebaseAnalyticsSwift", \
generated_declaration))), \
apply_to = any(function, enum, objc_interface, objc_category, \
objc_protocol))
#pragma clang attribute push( \
__attribute__((external_source_symbol( \
language = "Swift", defined_in = "FirebaseAnalyticsSwift", \
generated_declaration))), \
apply_to = \
any(function, enum, objc_interface, objc_category, objc_protocol))
#pragma pop_macro("any")
#endif

Expand Down Expand Up @@ -554,12 +554,12 @@ using UInt = size_t;
#if __has_attribute(external_source_symbol)
#pragma push_macro("any")
#undef any
#pragma clang attribute push( \
__attribute__((external_source_symbol( \
language = "Swift", defined_in = "FirebaseAnalyticsSwift", \
generated_declaration))), \
apply_to = any(function, enum, objc_interface, objc_category, \
objc_protocol))
#pragma clang attribute push( \
__attribute__((external_source_symbol( \
language = "Swift", defined_in = "FirebaseAnalyticsSwift", \
generated_declaration))), \
apply_to = \
any(function, enum, objc_interface, objc_category, objc_protocol))
#pragma pop_macro("any")
#endif

Expand Down
Loading