Skip to content

Update mobile dependencies - Thu Aug 03 2023 #1413

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 12 commits into from
Aug 6, 2023
Merged

Update mobile dependencies - Thu Aug 03 2023 #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7cda921
Update mobile dependencies - Thu Aug 03 2023
Aug 3, 2023
62e2e20
Ensure using a Swift bridging header that supports both arm64 and x86…
jonsimantov Aug 4, 2023
6ce5b23
Add release note about i386 no longer being supported.
jonsimantov Aug 4, 2023
561b38c
Remove armv7 as well.
jonsimantov Aug 4, 2023
f625308
Remove debug ifdef
jonsimantov Aug 4, 2023
744565e
Fix script since single value tuple doesn't work
jonsimantov Aug 4, 2023
e6e9f33
Remove more armv7 references.
jonsimantov Aug 4, 2023
d42186c
Remove extra tvOS simulator.
jonsimantov Aug 4, 2023
1942464
Revert "Remove extra tvOS simulator."
jonsimantov Aug 4, 2023
90e8620
Revert "Revert "Remove extra tvOS simulator.""
jonsimantov Aug 4, 2023
c059d01
Merge branch 'main' into workflow/auto-update-deps-172-20230803-212305
AlmostMatt Aug 5, 2023
ec86268
Fix copyright line.
jonsimantov Aug 6, 2023
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 .github/workflows/update-dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ jobs:
cd -
# Copy all *-Swift.h header files into ios_pod/swift_headers/
echo "Copying headers..."
find "${ziptmp}" -name '*-Swift.h' -print0 | xargs -0 -n 1 -J REPLACETEXT cp -f REPLACETEXT ios_pod/swift_headers/
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/
copyright_line="// Copyright $(date +%Y) Google LLC"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a github check warning that ios_pod/swift_headers/*.h no longer has the google copyright message (copyright_line), which the lines below this are supposed to add. Is it a side effect of this change, or is it something that is missing from the below command

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yeah, this was omitted because I was manually testing different swift files rather than updating them via this command.

I added the missing copyright lines back in.

# Add a note to each file about its source.
for ios_header in ios_pod/swift_headers/*.h; do
Expand Down
2 changes: 1 addition & 1 deletion Android/firebase_dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ project.afterEvaluate {

// Add the bill-of-materials
project.dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.0')
implementation platform('com.google.firebase:firebase-bom:32.2.2')
}
for (String lib : firebaseCpp.dependencies.libSet) {
// Generate and include the proguard file
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, '11.0'
pod 'Firebase/Analytics', '10.12.0'
pod 'Firebase/Analytics', '10.13.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Analytics', '10.12.0'
pod 'Firebase/Analytics', '10.13.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 2023 Google LLC

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

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

// Copied from Firebase Analytics iOS SDK 10.12.0.
// Copied from Firebase Analytics iOS SDK 10.13.0.

/// @file FIRUserPropertyNames.h
///
Expand Down
2 changes: 1 addition & 1 deletion app/app_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.0')
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation 'com.google.firebase:firebase-analytics'
}

Expand Down
2 changes: 1 addition & 1 deletion app/google_api_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.0')
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.android.gms:play-services-base:18.2.0'
implementation project(':app:app_resources')
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, '11.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/Analytics', '10.12.0'
pod 'Firebase/Analytics', '10.13.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion app/invites_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.0')
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-dynamic-links'
implementation project(':app:app_resources')
Expand Down
4 changes: 2 additions & 2 deletions app/src/tests/runner/ios/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
<string>arm64</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
Expand All @@ -46,4 +46,4 @@
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
</plist>
2 changes: 1 addition & 1 deletion app_check/app_check_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.0')
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation 'com.google.firebase:firebase-appcheck'
}

Expand Down
20 changes: 10 additions & 10 deletions app_check/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '11.0'
pod 'Firebase/AppCheck', '10.12.0'
pod 'Firebase/Database', '10.12.0'
pod 'Firebase/Auth', '10.12.0'
pod 'Firebase/Storage', '10.12.0'
pod 'Firebase/Functions', '10.12.0'
pod 'Firebase/AppCheck', '10.13.0'
pod 'Firebase/Database', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Storage', '10.13.0'
pod 'Firebase/Functions', '10.13.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/AppCheck', '10.12.0'
pod 'Firebase/Database', '10.12.0'
pod 'Firebase/Auth', '10.12.0'
pod 'Firebase/Storage', '10.12.0'
pod 'Firebase/Functions', '10.12.0'
pod 'Firebase/AppCheck', '10.13.0'
pod 'Firebase/Database', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Storage', '10.13.0'
pod 'Firebase/Functions', '10.13.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion auth/auth_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.0')
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-auth'
implementation project(':app:app_resources')
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, '11.0'
pod 'Firebase/Auth', '10.12.0'
pod 'Firebase/Auth', '10.13.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Auth', '10.12.0'
pod 'Firebase/Auth', '10.13.0'
end

post_install do |installer|
Expand Down
8 changes: 3 additions & 5 deletions build_scripts/ios/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_i386_x86_64-simulator</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>LIBRARY_PATH</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
Expand All @@ -22,13 +21,12 @@
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_armv7</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>LIBRARY_PATH</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
Expand All @@ -39,4 +37,4 @@
<key>XCFrameworkFormatVersion</key>
<string>1.0</string>
</dict>
</plist>
</plist>
24 changes: 10 additions & 14 deletions build_scripts/ios/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright 2020 Google LLC
#
# Script to build iOS XCFrameworks
# If built for all architectures (arm64 armv7 x86_64 i386),
# If built for all architectures (arm64 x86_64),
# it will build universal framework as well
#

Expand All @@ -24,9 +24,9 @@ usage(){
set -e

readonly SUPPORTED_PLATFORMS=(device simulator)
readonly SUPPORTED_ARCHITECTURES=(arm64 armv7 x86_64 i386)
readonly DEVICE_ARCHITECTURES=(arm64 armv7)
readonly SIMULATOR_ARCHITECTURES=(arm64 x86_64 i386)
readonly SUPPORTED_ARCHITECTURES=(arm64 x86_64)
readonly DEVICE_ARCHITECTURES=(arm64)
readonly SIMULATOR_ARCHITECTURES=(arm64 x86_64)
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)

# build default value
Expand Down Expand Up @@ -198,7 +198,7 @@ if ${cmakeBuild}; then
done
done

# if we built for all architectures (arm64 armv7 x86_64 i386)
# if we built for all architectures (arm64 x86_64)
# build universal framework as well
if [[ ${#architectures[@]} < ${#SUPPORTED_ARCHITECTURES[@]} ]]; then
exit 0
Expand All @@ -209,8 +209,6 @@ if ${cmakeBuild}; then
mkdir -p universal/${target}.framework
libsubpath="${target}.framework/${target}"
lipo -create "device-arm64/${libsubpath}" \
"device-armv7/${libsubpath}" \
"simulator-i386/${libsubpath}" \
"simulator-x86_64/${libsubpath}" \
-output "universal/${libsubpath}"
done
Expand All @@ -228,17 +226,15 @@ if ${cmakeBuild}; then
for target in ${targets[@]}; do
libsubpath="${target}.framework/${target}"
if [[ "${platform}" == "device" ]]; then
outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64_armv7/${target}.framework"
outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64/${target}.framework"
mkdir -p ${outputdir}
lipo -create "${frameworkspath}/device-arm64/${libsubpath}" \
"${frameworkspath}/device-armv7/${libsubpath}" \
-output "${outputdir}/${target}"

elif [[ "${platform}" == "simulator" ]]; then
outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64_i386_x86_64-simulator/${target}.framework"
outputdir="${xcframeworkspath}/${target}.xcframework/ios-arm64_x86_64-simulator/${target}.framework"
mkdir -p ${outputdir}
lipo -create "${frameworkspath}/simulator-arm64/${libsubpath}" \
"${frameworkspath}/simulator-i386/${libsubpath}" \
"${frameworkspath}/simulator-x86_64/${libsubpath}" \
-output "${outputdir}/${target}"
fi
Expand All @@ -252,11 +248,11 @@ if ${cmakeBuild}; then
done

# create Headers for xcframework
if [[ ! -d "${xcframeworkspath}/firebase.xcframework/ios-arm64_armv7/firebase.framework/Headers" ]]; then
if [[ ! -d "${xcframeworkspath}/firebase.xcframework/ios-arm64/firebase.framework/Headers" ]]; then
cp -R ${frameworkspath}/device-arm64/firebase.framework/Headers \
${xcframeworkspath}/firebase.xcframework/ios-arm64_armv7/firebase.framework/Headers
${xcframeworkspath}/firebase.xcframework/ios-arm64/firebase.framework/Headers
cp -R ${frameworkspath}/device-arm64/firebase.framework/Headers \
${xcframeworkspath}/firebase.xcframework/ios-arm64_i386_x86_64-simulator/firebase.framework/Headers
${xcframeworkspath}/firebase.xcframework/ios-arm64_x86_64-simulator/firebase.framework/Headers
fi
echo "xcframeworks build end & ready to use"
fi
6 changes: 2 additions & 4 deletions build_scripts/tvos/Info_ios_and_tvos.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_i386_x86_64-simulator</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>LIBRARY_PATH</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
Expand All @@ -22,13 +21,12 @@
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_armv7</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>LIBRARY_PATH</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
Expand Down
2 changes: 1 addition & 1 deletion build_scripts/tvos/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ if ${cmakeBuild}; then
done
done

# if we built for all architectures (arm64 armv7 x86_64 i386)
# if we built for all architectures (arm64 armv7 x86_64)
# build universal framework as well
if [[ ${#architectures[@]} < ${#SUPPORTED_ARCHITECTURES[@]} ]]; then
exit 0
Expand Down
2 changes: 1 addition & 1 deletion 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-10.12.0)
set(version CocoaPods-10.13.0)

function(GetReleasedDep)
message("Getting released firebase-ios-sdk @ ${version}")
Expand Down
2 changes: 1 addition & 1 deletion database/database_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.0')
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-database'
//implementation project(':app:app_resources')
Expand Down
8 changes: 4 additions & 4 deletions database/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '11.0'
pod 'Firebase/Database', '10.12.0'
pod 'Firebase/Auth', '10.12.0'
pod 'Firebase/Database', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Database', '10.12.0'
pod 'Firebase/Auth', '10.12.0'
pod 'Firebase/Database', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion dynamic_links/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, '11.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/DynamicLinks', '10.12.0'
pod 'Firebase/DynamicLinks', '10.13.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion firestore/firestore_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.0')
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-firestore'
}
Expand Down
8 changes: 4 additions & 4 deletions firestore/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '11.0'
pod 'Firebase/Firestore', '10.12.0'
pod 'Firebase/Auth', '10.12.0'
pod 'Firebase/Firestore', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Firestore', '10.12.0'
pod 'Firebase/Auth', '10.12.0'
pod 'Firebase/Firestore', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
end

post_install do |installer|
Expand Down
Loading