Skip to content

Commit dc13f63

Browse files
firebase-workflow-trigger[bot]firebase-workflow-trigger-botdconeybe
authored
Update iOS dependencies - Wed Jun 22 2022 (#1003)
* Update iOS dependencies - Wed Jun 22 2022 ### iOS - Firebase/Analytics → 9.2.0 - Firebase/Auth → 9.2.0 - Firebase/Core → 9.2.0 - Firebase/Crashlytics → 9.2.0 - Firebase/Database → 9.2.0 - Firebase/DynamicLinks → 9.2.0 - Firebase/Firestore → 9.2.0 - Firebase/Functions → 9.2.0 - Firebase/Installations → 9.2.0 - Firebase/Messaging → 9.2.0 - Firebase/RemoteConfig → 9.2.0 - Firebase/Storage → 9.2.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/2544841237). * Merge in #932 (Snappy patch revert) Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: Denver Coneybeare <[email protected]>
1 parent 25c0f6a commit dc13f63

File tree

33 files changed

+120
-776
lines changed

33 files changed

+120
-776
lines changed

‎admob/integration_test/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '10.0'
44
use_frameworks! :linkage => :static
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '9.1.0'
7+
pod 'Firebase/Analytics', '9.2.0'
88
pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2'
99
end
1010

‎analytics/integration_test/Podfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static
55

66
target 'integration_test' do
77
platform :ios, '10.0'
8-
pod 'Firebase/Analytics', '9.1.0'
8+
pod 'Firebase/Analytics', '9.2.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '12.0'
13-
pod 'Firebase/Analytics', '9.1.0'
13+
pod 'Firebase/Analytics', '9.2.0'
1414
end
1515

1616
post_install do |installer|

‎analytics/ios_headers/FIREventNames.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2022 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 9.1.0.
3+
// Copied from Firebase Analytics iOS SDK 9.2.0.
44

55
/// @file FIREventNames.h
66
///

‎analytics/ios_headers/FIRParameterNames.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2022 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 9.1.0.
3+
// Copied from Firebase Analytics iOS SDK 9.2.0.
44

55
/// @file FIRParameterNames.h
66
///

‎analytics/ios_headers/FIRUserPropertyNames.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2022 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 9.1.0.
3+
// Copied from Firebase Analytics iOS SDK 9.2.0.
44

55
/// @file FIRUserPropertyNames.h
66
///

‎app/integration_test/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '10.0'
44
use_frameworks! :linkage => :static
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '9.1.0'
7+
pod 'Firebase/Analytics', '9.2.0'
88
end
99

1010
post_install do |installer|

‎auth/integration_test/Podfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use_frameworks! :linkage => :static
44

55
target 'integration_test' do
66
platform :ios, '10.0'
7-
pod 'Firebase/Auth', '9.1.0'
7+
pod 'Firebase/Auth', '9.2.0'
88
end
99

1010
target 'integration_test_tvos' do
1111
platform :tvos, '12.0'
12-
pod 'Firebase/Auth', '9.1.0'
12+
pod 'Firebase/Auth', '9.2.0'
1313
end
1414

1515
post_install do |installer|

‎cmake/external/firestore.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ endif()
2020

2121
# If the format of the line below changes, then be sure to update
2222
# https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81
23-
set(version CocoaPods-9.1.0)
23+
set(version CocoaPods-9.2.0)
2424

2525
function(GetReleasedDep)
2626
message("Getting released firebase-ios-sdk @ ${version}")
@@ -36,7 +36,7 @@ function(GetReleasedDep)
3636
BUILD_COMMAND ""
3737
INSTALL_COMMAND ""
3838
TEST_COMMAND ""
39-
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore_snappy.patch.txt
39+
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore.patch.txt
4040
HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
4141
)
4242
endfunction()
@@ -57,7 +57,7 @@ function(GetTag t)
5757
BUILD_COMMAND ""
5858
INSTALL_COMMAND ""
5959
TEST_COMMAND ""
60-
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore_snappy.patch.txt
60+
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore.patch.txt
6161
HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
6262
)
6363
endfunction()

‎cmake/external/firestore.patch.txt

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
2+
index 920bf2928..c5c9cc7ee 100644
3+
--- a/cmake/external/leveldb.cmake
4+
+++ b/cmake/external/leveldb.cmake
5+
@@ -24,7 +24,10 @@ if(TARGET leveldb)
6+
return()
7+
endif()
8+
9+
-set(version 1.22)
10+
+# This version must be kept in sync with cmake/external/leveldb.cmake
11+
+# in the firebase-cpp-sdk. If this version ever changes then make sure
12+
+# to update leveldb.cmake in the firebase-cpp-sdk accordingly.
13+
+set(version 1.23)
14+
15+
ExternalProject_Get_property(snappy SOURCE_DIR)
16+
set(snappy_source_dir "${SOURCE_DIR}")
17+
@@ -39,7 +42,7 @@ ExternalProject_Add(
18+
DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
19+
DOWNLOAD_NAME leveldb-${version}.tar.gz
20+
URL https://github.com/google/leveldb/archive/${version}.tar.gz
21+
- URL_HASH SHA256=55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2
22+
+ URL_HASH SHA256=9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76
23+
24+
PREFIX ${PROJECT_BINARY_DIR}
25+

0 commit comments

Comments
 (0)