Skip to content

Commit 3002ff4

Browse files
firebase-workflow-trigger[bot]firebase-workflow-trigger-botjonsimantovAlmostMatt
authored
Update mobile dependencies - Thu Aug 03 2023 (#1413)
* Update mobile dependencies - Thu Aug 03 2023 ### Android - com.google.firebase.firebase_bom → 32.2.2 ### iOS - Firebase/Analytics → 10.13.0 - Firebase/AppCheck → 10.13.0 - Firebase/Auth → 10.13.0 - Firebase/Core → 10.13.0 - Firebase/CoreOnly → 10.13.0 - Firebase/Crashlytics → 10.13.0 - Firebase/Database → 10.13.0 - Firebase/DynamicLinks → 10.13.0 - Firebase/Firestore → 10.13.0 - Firebase/Functions → 10.13.0 - Firebase/Installations → 10.13.0 - Firebase/Messaging → 10.13.0 - Firebase/RemoteConfig → 10.13.0 - Firebase/Storage → 10.13.0 - Google-Mobile-Ads-SDK → 10.9.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/5755777170). * Ensure using a Swift bridging header that supports both arm64 and x86_64. * Add release note about i386 no longer being supported. * Remove armv7 as well. --------- Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com> Co-authored-by: Jon Simantov <jsimantov@google.com> Co-authored-by: almostmatt@google.com <almostmatt@google.com>
1 parent 5df80a2 commit 3002ff4

File tree

53 files changed

+5770
-1786
lines changed

Some content is hidden

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

53 files changed

+5770
-1786
lines changed

‎.github/workflows/update-dependencies.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
cd -
143143
# Copy all *-Swift.h header files into ios_pod/swift_headers/
144144
echo "Copying headers..."
145-
find "${ziptmp}" -name '*-Swift.h' -print0 | xargs -0 -n 1 -J REPLACETEXT cp -f REPLACETEXT ios_pod/swift_headers/
145+
find "${ziptmp}" -name '*-Swift.h' -path '*ios*arm64*x86_64*simulator*' -print0 | xargs -0 -n 1 -J REPLACETEXT cp -f REPLACETEXT ios_pod/swift_headers/
146146
copyright_line="// Copyright $(date +%Y) Google LLC"
147147
# Add a note to each file about its source.
148148
for ios_header in ios_pod/swift_headers/*.h; do

‎Android/firebase_dependencies.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ project.afterEvaluate {
158158

159159
// Add the bill-of-materials
160160
project.dependencies {
161-
implementation platform('com.google.firebase:firebase-bom:32.2.0')
161+
implementation platform('com.google.firebase:firebase-bom:32.2.2')
162162
}
163163
for (Stringlib : firebaseCpp.dependencies.libSet) {
164164
// Generate and include the proguard file

‎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,'11.0'
8-
pod'Firebase/Analytics','10.12.0'
8+
pod'Firebase/Analytics','10.13.0'
99
end
1010

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

1616
post_installdo |installer|

‎analytics/ios_headers/FIREventNames.h

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

3-
// Copied from Firebase Analytics iOS SDK 10.12.0.
3+
// Copied from Firebase Analytics iOS SDK 10.13.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 2023 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 10.12.0.
3+
// Copied from Firebase Analytics iOS SDK 10.13.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 2023 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 10.12.0.
3+
// Copied from Firebase Analytics iOS SDK 10.13.0.
44

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

‎app/app_resources/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android {
5050
}
5151

5252
dependencies {
53-
implementation platform('com.google.firebase:firebase-bom:32.2.0')
53+
implementation platform('com.google.firebase:firebase-bom:32.2.2')
5454
implementation 'com.google.firebase:firebase-analytics'
5555
}
5656

‎app/google_api_resources/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ android {
5353
}
5454

5555
dependencies {
56-
implementation platform('com.google.firebase:firebase-bom:32.2.0')
56+
implementation platform('com.google.firebase:firebase-bom:32.2.2')
5757
implementation 'com.google.firebase:firebase-analytics'
5858
implementation 'com.google.android.gms:play-services-base:18.2.0'
5959
implementation project(':app:app_resources')

‎app/integration_test/Podfile

+1-1
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.12.0'
7+
pod'Firebase/Analytics','10.13.0'
88
end
99

1010
post_installdo |installer|

‎app/invites_resources/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation platform('com.google.firebase:firebase-bom:32.2.0')
52+
implementation platform('com.google.firebase:firebase-bom:32.2.2')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-dynamic-links'
5555
implementation project(':app:app_resources')

‎app/src/tests/runner/ios/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<string>Main</string>
3131
<key>UIRequiredDeviceCapabilities</key>
3232
<array>
33-
<string>armv7</string>
33+
<string>arm64</string>
3434
</array>
3535
<key>UISupportedInterfaceOrientations</key>
3636
<array>
@@ -46,4 +46,4 @@
4646
<string>UIInterfaceOrientationLandscapeRight</string>
4747
</array>
4848
</dict>
49-
</plist>
49+
</plist>

‎app_check/app_check_resources/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation platform('com.google.firebase:firebase-bom:32.2.0')
52+
implementation platform('com.google.firebase:firebase-bom:32.2.2')
5353
implementation 'com.google.firebase:firebase-appcheck'
5454
}
5555

‎app_check/integration_test/Podfile

+10-10
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.12.0'
8-
pod'Firebase/Database','10.12.0'
9-
pod'Firebase/Auth','10.12.0'
10-
pod'Firebase/Storage','10.12.0'
11-
pod'Firebase/Functions','10.12.0'
7+
pod'Firebase/AppCheck','10.13.0'
8+
pod'Firebase/Database','10.13.0'
9+
pod'Firebase/Auth','10.13.0'
10+
pod'Firebase/Storage','10.13.0'
11+
pod'Firebase/Functions','10.13.0'
1212
end
1313

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

2323
post_installdo |installer|

‎auth/auth_resources/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation platform('com.google.firebase:firebase-bom:32.2.0')
52+
implementation platform('com.google.firebase:firebase-bom:32.2.2')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-auth'
5555
implementation project(':app:app_resources')

‎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,'11.0'
7-
pod'Firebase/Auth','10.12.0'
7+
pod'Firebase/Auth','10.13.0'
88
end
99

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

1515
post_installdo |installer|

‎build_scripts/ios/Info.plist

+3-5
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
<array>
77
<dict>
88
<key>LibraryIdentifier</key>
9-
<string>ios-arm64_i386_x86_64-simulator</string>
9+
<string>ios-arm64_x86_64-simulator</string>
1010
<key>LibraryPath</key>
1111
<string>LIBRARY_PATH</string>
1212
<key>SupportedArchitectures</key>
1313
<array>
1414
<string>arm64</string>
15-
<string>i386</string>
1615
<string>x86_64</string>
1716
</array>
1817
<key>SupportedPlatform</key>
@@ -22,13 +21,12 @@
2221
</dict>
2322
<dict>
2423
<key>LibraryIdentifier</key>
25-
<string>ios-arm64_armv7</string>
24+
<string>ios-arm64</string>
2625
<key>LibraryPath</key>
2726
<string>LIBRARY_PATH</string>
2827
<key>SupportedArchitectures</key>
2928
<array>
3029
<string>arm64</string>
31-
<string>armv7</string>
3230
</array>
3331
<key>SupportedPlatform</key>
3432
<string>ios</string>
@@ -39,4 +37,4 @@
3937
<key>XCFrameworkFormatVersion</key>
4038
<string>1.0</string>
4139
</dict>
42-
</plist>
40+
</plist>

‎build_scripts/ios/build.sh

+10-14
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright 2020 Google LLC
44
#
55
# Script to build iOS XCFrameworks
6-
# If built for all architectures (arm64 armv7 x86_64 i386),
6+
# If built for all architectures (arm64 x86_64),
77
# it will build universal framework as well
88
#
99

@@ -24,9 +24,9 @@ usage(){
2424
set -e
2525

2626
readonly SUPPORTED_PLATFORMS=(device simulator)
27-
readonly SUPPORTED_ARCHITECTURES=(arm64 armv7 x86_64 i386)
28-
readonly DEVICE_ARCHITECTURES=(arm64 armv7)
29-
readonly SIMULATOR_ARCHITECTURES=(arm64 x86_64 i386)
27+
readonly SUPPORTED_ARCHITECTURES=(arm64 x86_64)
28+
readonly DEVICE_ARCHITECTURES=(arm64)
29+
readonly SIMULATOR_ARCHITECTURES=(arm64 x86_64)
3030
readonly SUPPORTED_TARGETS=(firebase_analytics firebase_auth firebase_app_check firebase_database firebase_dynamic_links firebase_firestore firebase_functions firebase_gma firebase_installations firebase_messaging firebase_remote_config firebase_storage)
3131

3232
# build default value
@@ -198,7 +198,7 @@ if ${cmakeBuild}; then
198198
done
199199
done
200200

201-
# if we built for all architectures (arm64 armv7 x86_64 i386)
201+
# if we built for all architectures (arm64 x86_64)
202202
# build universal framework as well
203203
if [[ ${#architectures[@]}<${#SUPPORTED_ARCHITECTURES[@]} ]];then
204204
exit 0
@@ -209,8 +209,6 @@ if ${cmakeBuild}; then
209209
mkdir -p universal/${target}.framework
210210
libsubpath="${target}.framework/${target}"
211211
lipo -create "device-arm64/${libsubpath}" \
212-
"device-armv7/${libsubpath}" \
213-
"simulator-i386/${libsubpath}" \
214212
"simulator-x86_64/${libsubpath}" \
215213
-output "universal/${libsubpath}"
216214
done
@@ -228,17 +226,15 @@ if ${cmakeBuild}; then
228226
fortargetin${targets[@]};do
229227
libsubpath="${target}.framework/${target}"
230228
if [[ "${platform}"=="device" ]];then
231-
outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64_armv7/${target}.framework"
229+
outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64/${target}.framework"
232230
mkdir -p ${outputdir}
233231
lipo -create "${frameworkspath}/device-arm64/${libsubpath}" \
234-
"${frameworkspath}/device-armv7/${libsubpath}" \
235232
-output "${outputdir}/${target}"
236233

237234
elif [[ "${platform}"=="simulator" ]];then
238-
outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64_i386_x86_64-simulator/${target}.framework"
235+
outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64_x86_64-simulator/${target}.framework"
239236
mkdir -p ${outputdir}
240237
lipo -create "${frameworkspath}/simulator-arm64/${libsubpath}" \
241-
"${frameworkspath}/simulator-i386/${libsubpath}" \
242238
"${frameworkspath}/simulator-x86_64/${libsubpath}" \
243239
-output "${outputdir}/${target}"
244240
fi
@@ -252,11 +248,11 @@ if ${cmakeBuild}; then
252248
done
253249

254250
# create Headers for xcframework
255-
if [[ !-d"${xcframeworkspath}/firebase.xcframework/ios-arm64_armv7/firebase.framework/Headers" ]];then
251+
if [[ !-d"${xcframeworkspath}/firebase.xcframework/ios-arm64/firebase.framework/Headers" ]];then
256252
cp -R ${frameworkspath}/device-arm64/firebase.framework/Headers \
257-
${xcframeworkspath}/firebase.xcframework/ios-arm64_armv7/firebase.framework/Headers
253+
${xcframeworkspath}/firebase.xcframework/ios-arm64/firebase.framework/Headers
258254
cp -R ${frameworkspath}/device-arm64/firebase.framework/Headers \
259-
${xcframeworkspath}/firebase.xcframework/ios-arm64_i386_x86_64-simulator/firebase.framework/Headers
255+
${xcframeworkspath}/firebase.xcframework/ios-arm64_x86_64-simulator/firebase.framework/Headers
260256
fi
261257
echo"xcframeworks build end & ready to use"
262258
fi

‎build_scripts/tvos/Info_ios_and_tvos.plist

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
<array>
77
<dict>
88
<key>LibraryIdentifier</key>
9-
<string>ios-arm64_i386_x86_64-simulator</string>
9+
<string>ios-arm64_x86_64-simulator</string>
1010
<key>LibraryPath</key>
1111
<string>LIBRARY_PATH</string>
1212
<key>SupportedArchitectures</key>
1313
<array>
1414
<string>arm64</string>
15-
<string>i386</string>
1615
<string>x86_64</string>
1716
</array>
1817
<key>SupportedPlatform</key>
@@ -22,13 +21,12 @@
2221
</dict>
2322
<dict>
2423
<key>LibraryIdentifier</key>
25-
<string>ios-arm64_armv7</string>
24+
<string>ios-arm64</string>
2625
<key>LibraryPath</key>
2726
<string>LIBRARY_PATH</string>
2827
<key>SupportedArchitectures</key>
2928
<array>
3029
<string>arm64</string>
31-
<string>armv7</string>
3230
</array>
3331
<key>SupportedPlatform</key>
3432
<string>ios</string>

‎build_scripts/tvos/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ if ${cmakeBuild}; then
200200
done
201201
done
202202

203-
# if we built for all architectures (arm64 armv7 x86_64 i386)
203+
# if we built for all architectures (arm64 armv7 x86_64)
204204
# build universal framework as well
205205
if [[ ${#architectures[@]}<${#SUPPORTED_ARCHITECTURES[@]} ]];then
206206
exit 0

‎cmake/external/firestore.cmake

+1-1
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.12.0)
23+
set(version CocoaPods-10.13.0)
2424

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

‎database/database_resources/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation platform('com.google.firebase:firebase-bom:32.2.0')
48+
implementation platform('com.google.firebase:firebase-bom:32.2.2')
4949
implementation 'com.google.firebase:firebase-analytics'
5050
implementation 'com.google.firebase:firebase-database'
5151
//implementation project(':app:app_resources')

‎database/integration_test/Podfile

+4-4
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.12.0'
8-
pod'Firebase/Auth','10.12.0'
7+
pod'Firebase/Database','10.13.0'
8+
pod'Firebase/Auth','10.13.0'
99
end
1010

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

1717
post_installdo |installer|

‎dynamic_links/integration_test/Podfile

+1-1
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.12.0'
7+
pod'Firebase/DynamicLinks','10.13.0'
88
end
99

1010
post_installdo |installer|

‎firestore/firestore_resources/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ android {
5353
}
5454

5555
dependencies {
56-
implementation platform('com.google.firebase:firebase-bom:32.2.0')
56+
implementation platform('com.google.firebase:firebase-bom:32.2.2')
5757
implementation 'com.google.firebase:firebase-analytics'
5858
implementation 'com.google.firebase:firebase-firestore'
5959
}

‎firestore/integration_test/Podfile

+4-4
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/Firestore','10.12.0'
8-
pod'Firebase/Auth','10.12.0'
7+
pod'Firebase/Firestore','10.13.0'
8+
pod'Firebase/Auth','10.13.0'
99
end
1010

1111
target'integration_test_tvos'do
1212
platform:tvos,'12.0'
13-
pod'Firebase/Firestore','10.12.0'
14-
pod'Firebase/Auth','10.12.0'
13+
pod'Firebase/Firestore','10.13.0'
14+
pod'Firebase/Auth','10.13.0'
1515
end
1616

1717
post_installdo |installer|

0 commit comments

Comments
 (0)
close