Skip to content

Update iOS dependencies - Wed Jun 22 2022 #1003

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.

Sign up for GitHub

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 2 commits into from
Jun 23, 2022
Merged

Update iOS dependencies - Wed Jun 22 2022 #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68d3768
Update iOS dependencies - Wed Jun 22 2022
Jun 22, 2022
77f3e70
Merge in https://github.com/firebase/firebase-cpp-sdk/pull/932 (Snapp…
dconeybe Jun 22, 2022
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 admob/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '10.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/Analytics', '9.1.0'
pod 'Firebase/Analytics', '9.2.0'
pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2'
end

Expand Down
4 changes: 2 additions & 2 deletions analytics/integration_test/Podfile
View file
Open in desktop
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, '10.0'
pod 'Firebase/Analytics', '9.1.0'
pod 'Firebase/Analytics', '9.2.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Analytics', '9.1.0'
pod 'Firebase/Analytics', '9.2.0'
end

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

// Copied from Firebase Analytics iOS SDK 9.1.0.
// Copied from Firebase Analytics iOS SDK 9.2.0.

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

// Copied from Firebase Analytics iOS SDK 9.1.0.
// Copied from Firebase Analytics iOS SDK 9.2.0.

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

// Copied from Firebase Analytics iOS SDK 9.1.0.
// Copied from Firebase Analytics iOS SDK 9.2.0.

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

target 'integration_test' do
pod 'Firebase/Analytics', '9.1.0'
pod 'Firebase/Analytics', '9.2.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions auth/integration_test/Podfile
View file
Open in desktop
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, '10.0'
pod 'Firebase/Auth', '9.1.0'
pod 'Firebase/Auth', '9.2.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Auth', '9.1.0'
pod 'Firebase/Auth', '9.2.0'
end

post_install do |installer|
Expand Down
6 changes: 3 additions & 3 deletions cmake/external/firestore.cmake
View file
Open in desktop
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-9.1.0)
set(version CocoaPods-9.2.0)

function(GetReleasedDep)
message("Getting released firebase-ios-sdk @ ${version}")
Expand All @@ -36,7 +36,7 @@ function(GetReleasedDep)
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore_snappy.patch.txt
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore.patch.txt
HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
)
endfunction()
Expand All @@ -57,7 +57,7 @@ function(GetTag t)
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore_snappy.patch.txt
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore.patch.txt
HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
)
endfunction()
Expand Down
25 changes: 25 additions & 0 deletions cmake/external/firestore.patch.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
index 920bf2928..c5c9cc7ee 100644
--- a/cmake/external/leveldb.cmake
+++ b/cmake/external/leveldb.cmake
@@ -24,7 +24,10 @@ if(TARGET leveldb)
return()
endif()

-set(version 1.22)
+# This version must be kept in sync with cmake/external/leveldb.cmake
+# in the firebase-cpp-sdk. If this version ever changes then make sure
+# to update leveldb.cmake in the firebase-cpp-sdk accordingly.
+set(version 1.23)

ExternalProject_Get_property(snappy SOURCE_DIR)
set(snappy_source_dir "${SOURCE_DIR}")
@@ -39,7 +42,7 @@ ExternalProject_Add(
DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
DOWNLOAD_NAME leveldb-${version}.tar.gz
URL https://github.com/google/leveldb/archive/${version}.tar.gz
- URL_HASH SHA256=55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2
+ URL_HASH SHA256=9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76

PREFIX ${PROJECT_BINARY_DIR}

Loading