Skip to content

Commit

Permalink
Merge branch 'main' into workflow/auto-update-deps-247-20241205-172429
Browse files Browse the repository at this point in the history
jonsimantov authored Jan 15, 2025
2 parents 6051734 + 06f0b2d commit f8109ab
Showing 35 changed files with 500 additions and 375 deletions.
4 changes: 2 additions & 2 deletions analytics/integration_test/Podfile
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Analytics', '11.4.2'
pod 'Firebase/Analytics', '11.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '13.0'
pod 'Firebase/Analytics', '11.4.2'
pod 'Firebase/Analytics', '11.6.0'
end

post_install do |installer|
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 2024 Google LLC

// Copied from Firebase Analytics iOS SDK 11.4.2.
// Copied from Firebase Analytics iOS SDK 11.6.0.

/// @file FIREventNames.h
///
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 2024 Google LLC

// Copied from Firebase Analytics iOS SDK 11.4.2.
// Copied from Firebase Analytics iOS SDK 11.6.0.

/// @file FIRParameterNames.h
///
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 2024 Google LLC

// Copied from Firebase Analytics iOS SDK 11.4.2.
// Copied from Firebase Analytics iOS SDK 11.6.0.

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

target 'integration_test' do
pod 'Firebase/Analytics', '11.4.2'
pod 'Firebase/Analytics', '11.6.0'
end

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

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/AppCheck', '11.4.2'
pod 'Firebase/Database', '11.4.2'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Storage', '11.4.2'
pod 'Firebase/Functions', '11.4.2'
pod 'Firebase/AppCheck', '11.6.0'
pod 'Firebase/Database', '11.6.0'
pod 'Firebase/Auth', '11.6.0'
pod 'Firebase/Storage', '11.6.0'
pod 'Firebase/Functions', '11.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '13.0'
pod 'Firebase/AppCheck', '11.4.2'
pod 'Firebase/Database', '11.4.2'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Storage', '11.4.2'
pod 'Firebase/Functions', '11.4.2'
pod 'Firebase/AppCheck', '11.6.0'
pod 'Firebase/Database', '11.6.0'
pod 'Firebase/Auth', '11.6.0'
pod 'Firebase/Storage', '11.6.0'
pod 'Firebase/Functions', '11.6.0'
end

post_install do |installer|
4 changes: 2 additions & 2 deletions auth/integration_test/Podfile
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Auth', '11.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '13.0'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Auth', '11.6.0'
end

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

function(GetReleasedDep)
message("Getting released firebase-ios-sdk @ ${version}")
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": "12.4.0",
"stable": "12.4.0",
"head": "12.4.0"
"released": "12.5.0",
"stable": "12.5.0",
"head": "12.5.0"
}
8 changes: 4 additions & 4 deletions database/integration_test/Podfile
Original file line number Diff line number Diff line change
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Database', '11.4.2'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Database', '11.6.0'
pod 'Firebase/Auth', '11.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '13.0'
pod 'Firebase/Database', '11.4.2'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Database', '11.6.0'
pod 'Firebase/Auth', '11.6.0'
end

post_install do |installer|
2 changes: 1 addition & 1 deletion dynamic_links/integration_test/Podfile
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/DynamicLinks', '11.4.2'
pod 'Firebase/DynamicLinks', '11.6.0'
end

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

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Firestore', '11.4.2'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Firestore', '11.6.0'
pod 'Firebase/Auth', '11.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '13.0'
pod 'Firebase/Firestore', '11.4.2'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Firestore', '11.6.0'
pod 'Firebase/Auth', '11.6.0'
end

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

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Firestore', '11.4.2'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Firestore', '11.6.0'
pod 'Firebase/Auth', '11.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '13.0'
pod 'Firebase/Firestore', '11.4.2'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Firestore', '11.6.0'
pod 'Firebase/Auth', '11.6.0'
end

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

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Functions', '11.4.2'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Functions', '11.6.0'
pod 'Firebase/Auth', '11.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '13.0'
pod 'Firebase/Functions', '11.4.2'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Functions', '11.6.0'
pod 'Firebase/Auth', '11.6.0'
end

post_install do |installer|
2 changes: 1 addition & 1 deletion gma/integration_test/Podfile
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/CoreOnly', '11.4.2'
pod 'Firebase/CoreOnly', '11.6.0'
pod 'Google-Mobile-Ads-SDK', '11.2.0'
pod 'GoogleUserMessagingPlatform', '2.3.0'
end
4 changes: 2 additions & 2 deletions installations/integration_test/Podfile
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Analytics', '11.4.2'
pod 'Firebase/Installations', '11.4.2'
pod 'Firebase/Analytics', '11.6.0'
pod 'Firebase/Installations', '11.6.0'
end

post_install do |installer|
26 changes: 13 additions & 13 deletions ios_pod/Podfile
Original file line number Diff line number Diff line change
@@ -3,22 +3,22 @@ platform :ios, '13.0'
use_frameworks!

target 'GetPods' do
pod 'Firebase/Core', '11.4.2'
pod 'Firebase/Core', '11.6.0'

pod 'Google-Mobile-Ads-SDK', '11.2.0'
pod 'GoogleUserMessagingPlatform', '2.3.0'
pod 'Firebase/Analytics', '11.4.2'
pod 'Firebase/AppCheck', '11.4.2'
pod 'Firebase/Auth', '11.4.2'
pod 'Firebase/Crashlytics', '11.4.2'
pod 'Firebase/Database', '11.4.2'
pod 'Firebase/DynamicLinks', '11.4.2'
pod 'Firebase/Firestore', '11.4.2'
pod 'Firebase/Functions', '11.4.2'
pod 'Firebase/Installations', '11.4.2'
pod 'Firebase/Messaging', '11.4.2'
pod 'Firebase/RemoteConfig', '11.4.2'
pod 'Firebase/Storage', '11.4.2'
pod 'Firebase/Analytics', '11.6.0'
pod 'Firebase/AppCheck', '11.6.0'
pod 'Firebase/Auth', '11.6.0'
pod 'Firebase/Crashlytics', '11.6.0'
pod 'Firebase/Database', '11.6.0'
pod 'Firebase/DynamicLinks', '11.6.0'
pod 'Firebase/Firestore', '11.6.0'
pod 'Firebase/Functions', '11.6.0'
pod 'Firebase/Installations', '11.6.0'
pod 'Firebase/Messaging', '11.6.0'
pod 'Firebase/RemoteConfig', '11.6.0'
pod 'Firebase/Storage', '11.6.0'

end

4 changes: 2 additions & 2 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 2024 Google LLC
// Copied from Firebase iOS SDK 11.2.0.
// Copied from Firebase iOS SDK 11.6.0.

// Generated by Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56
// clang-1500.1.0.2.5)
@@ -338,7 +338,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));

#elif defined(__x86_64__) && __x86_64__
// Copyright 2024 Google LLC
// Copied from Firebase iOS SDK 11.2.0.
// Copied from Firebase iOS SDK 11.6.0.

// Generated by Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56
// clang-1500.1.0.2.5)
Loading

0 comments on commit f8109ab

Please sign in to comment.