Skip to content

Commit 42fd9f7

Browse files
jonsimantovjonsimantov
authored
Update to Firebase iOS SDK 10.17.0 (#1485)
* Update Podfiles to use SpecsStaging repo. * Update iOS pods to 10.17.0 (from SpecsStaging) * Remove workaround for iOS SDK 10.16.0 * Include swift headers from 10.17.0. * Added new Swift headers. * Update Firestore include.. * Fix Firebase internal header paths. * Put workaround back in. * Remove staging server. * Add FirebaseAppCheckInterop/FirebaseAppCheck/Interop path. * Disable a warning that breaks in recent Firestore iOS SDK. * Add internal pod path. * Add more internal paths. * Update readme.
1 parent 91efa2a commit 42fd9f7

File tree

41 files changed

+4433
-256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+4433
-256
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ endif()
158158

159159
if(DESKTOP AND NOT MSVC AND NOT APPLE)
160160
# Linux-specific option.
161+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-maybe-uninitialized")
162+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
161163
if (FIREBASE_LINUX_USE_CXX11_ABI)
162164
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
163165
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1")

‎analytics/integration_test/Podfile

Lines changed: 2 additions & 2 deletions
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, '11.0'
8-
pod 'Firebase/Analytics', '10.16.0'
8+
pod 'Firebase/Analytics', '10.17.0'
99
end
1010

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

1616
post_install do |installer|

‎app/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -532,10 +532,10 @@ if (IOS)
532532
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/transaction.h
533533
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/transaction_options.h
534534
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/write_batch.h
535-
${FIREBASE_POD_DIR}/Pods/FirebaseFirestore/Firestore/core/include/firebase/firestore/firestore_errors.h
536-
${FIREBASE_POD_DIR}/Pods/FirebaseFirestore/Firestore/core/include/firebase/firestore/firestore_version.h
537-
${FIREBASE_POD_DIR}/Pods/FirebaseFirestore/Firestore/core/include/firebase/firestore/geo_point.h
538-
${FIREBASE_POD_DIR}/Pods/FirebaseFirestore/Firestore/core/include/firebase/firestore/timestamp.h)
535+
${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/firestore_errors.h
536+
${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/firestore_version.h
537+
${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/geo_point.h
538+
${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/timestamp.h)
539539
set(functions_HDRS
540540
${FIREBASE_SOURCE_DIR}/functions/src/include/firebase/functions.h
541541
${FIREBASE_SOURCE_DIR}/functions/src/include/firebase/functions/callable_reference.h

‎app/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '11.0'
44
use_frameworks! :linkage => :static
55

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

1010
post_install do |installer|

‎app_check/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ elseif(IOS)
182182
POD_NAMES
183183
FirebaseCore
184184
FirebaseAppCheck
185-
FirebaseAppCheckInterop
185+
FirebaseAppCheckInterop/FirebaseAppCheck/Interop
186186
INCLUDE_PRIVATE_HEADERS
187187
)
188188

‎app_check/integration_test/Podfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ use_frameworks! :linkage => :static
44

55
target 'integration_test' do
66
platform :ios, '11.0'
7-
pod 'Firebase/AppCheck', '10.16.0'
8-
pod 'Firebase/Database', '10.16.0'
9-
pod 'Firebase/Auth', '10.16.0'
10-
pod 'Firebase/Storage', '10.16.0'
11-
pod 'Firebase/Functions', '10.16.0'
7+
pod 'Firebase/AppCheck', '10.17.0'
8+
pod 'Firebase/Database', '10.17.0'
9+
pod 'Firebase/Auth', '10.17.0'
10+
pod 'Firebase/Storage', '10.17.0'
11+
pod 'Firebase/Functions', '10.17.0'
1212
end
1313

1414
target 'integration_test_tvos' do
1515
platform :tvos, '12.0'
16-
pod 'Firebase/AppCheck', '10.16.0'
17-
pod 'Firebase/Database', '10.16.0'
18-
pod 'Firebase/Auth', '10.16.0'
19-
pod 'Firebase/Storage', '10.16.0'
20-
pod 'Firebase/Functions', '10.16.0'
16+
pod 'Firebase/AppCheck', '10.17.0'
17+
pod 'Firebase/Database', '10.17.0'
18+
pod 'Firebase/Auth', '10.17.0'
19+
pod 'Firebase/Storage', '10.17.0'
20+
pod 'Firebase/Functions', '10.17.0'
2121
end
2222

2323
post_install do |installer|

‎auth/integration_test/Podfile

Lines changed: 2 additions & 2 deletions
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, '11.0'
7-
pod 'Firebase/Auth', '10.16.0'
7+
pod 'Firebase/Auth', '10.17.0'
88
end
99

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

1515
post_install do |installer|

‎cmake/external/firestore.cmake

Lines changed: 1 addition & 1 deletion
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-10.16.0)
23+
set(version CocoaPods-10.17.0)
2424

2525
function(GetReleasedDep)
2626
message("Getting released firebase-ios-sdk @ ${version}")

‎database/integration_test/Podfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
44

55
target 'integration_test' do
66
platform :ios, '11.0'
7-
pod 'Firebase/Database', '10.16.0'
8-
pod 'Firebase/Auth', '10.16.0'
7+
pod 'Firebase/Database', '10.17.0'
8+
pod 'Firebase/Auth', '10.17.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '12.0'
13-
pod 'Firebase/Database', '10.16.0'
14-
pod 'Firebase/Auth', '10.16.0'
13+
pod 'Firebase/Database', '10.17.0'
14+
pod 'Firebase/Auth', '10.17.0'
1515
end
1616

1717
post_install do |installer|

‎dynamic_links/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '11.0'
44
use_frameworks! :linkage => :static
55

66
target 'integration_test' do
7-
pod 'Firebase/DynamicLinks', '10.16.0'
7+
pod 'Firebase/DynamicLinks', '10.17.0'
88
end
99

1010
post_install do |installer|

0 commit comments

Comments
 (0)