Skip to content

Commit 2362937

Browse files
committed
2 parents 8f245c8 + 43644e4 commit 2362937

File tree

5 files changed

+45
-7
lines changed

5 files changed

+45
-7
lines changed

.github/workflows/update-dependencies.yml

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
jobs:
2626
update_dependencies:
2727
name: update-deps
28-
runs-on: ubuntu-latest
28+
runs-on: macos-latest
2929
steps:
3030
- name: Get token for firebase-workflow-trigger
3131
uses: tibdex/github-app-token@v1
@@ -77,7 +77,45 @@ jobs:
7777
fi
7878
# iOS: Update Firestore external version to match Firestore Cocoapod version.
7979
firestore_version=$(grep "pod 'Firebase/Firestore'" ios_pod/Podfile | sed "s/.*'\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)'.*/\1/")
80+
echo "Setting Firestore external version to ${firestore_version}"
8081
sed -i~ "s/^set(version [^)]*)/set(version CocoaPods-${firestore_version})/i" cmake/external/firestore.cmake
82+
# iOS: Update Analytics header files, used for generating constants.
83+
analytics_version=$(grep "pod 'Firebase/Analytics'" ios_pod/Podfile | sed "s/.*'\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)'.*/\1/")
84+
if [[ "$(uname)" == "Darwin"* ]]; then
85+
echo "Updating Analytics iOS headers from version ${analytics_version}"
86+
# Unfortunately we can't just download these headers from GitHub, as
87+
# Analytics is closed-source. If it becomes open-source, we could just
88+
# download the header files from the iOS SDK's release branch. So instead,
89+
# download the Firebase Analytics cocoapod (via a stub project) and get the
90+
# header from there. This will only work on macOS.
91+
podtmp="$(mktemp -d)"
92+
cd "${podtmp}"
93+
# Generate a Podfile for Firebase/Analytics. Use the Specs.git
94+
# source to avoid any propagation delays due to CocoaPods mirror.
95+
echo "source 'https://github.com/CocoaPods/Specs.git'" > Podfile
96+
echo "platform :ios, '14.0'" >> Podfile
97+
echo "pod 'Firebase/Analytics', '${analytics_version}'" >> Podfile
98+
pod repo update
99+
pod install || true # ignore error since there is no Xcode project
100+
declare -a header_dirs
101+
# Get all of the framework header directories from the xcframework.
102+
header_dirs=(Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.xcframework/*/FirebaseAnalytics.framework/Headers)
103+
# Just use the first directory found, the headers should be the same across
104+
# all of the frameworks.
105+
header_dir="${header_dirs[0]}"
106+
cd -
107+
cd analytics/ios_headers
108+
for ios_header in *.h; do
109+
# Each file in this directory matches a file in the Analytics iOS SDK.
110+
cp -vf "${podtmp}/${header_dir}/${ios_header}" .
111+
# Add a note to each file about its source.
112+
sed -i~ 's|^/// @file|// Copied from Firebase Analytics iOS SDK '"${analytics_version}"'.\n\n/// @file|' "${ios_header}"
113+
rm -f "${ios_header}~" # remove backup file that sed generated
114+
python ../../scripts/format_code.py --f "${ios_header}"
115+
done
116+
cd -
117+
rm -rf "${podtmp}"
118+
fi
81119
elif [[ ${{ github.event.inputs.updateAndroid }} -eq 1 ]]; then
82120
# Update Android only
83121
echo "Updating Android dependencies only"

Android/firebase_dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def firebaseDependenciesMap = [
2323
'analytics' : ['com.google.firebase:firebase-analytics:20.0.0',
2424
'com.google.android.gms:play-services-base:17.6.0'],
2525
'auth' : ['com.google.firebase:firebase-auth:21.0.1'],
26-
'database' : ['com.google.firebase:firebase-database:20.0.2'],
26+
'database' : ['com.google.firebase:firebase-database:20.0.3'],
2727
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:21.0.0'],
2828
'firestore' : ['com.google.firebase:firebase-firestore:24.0.0'],
2929
'functions' : ['com.google.firebase:firebase-functions:20.0.1'],
@@ -36,7 +36,7 @@ def firebaseDependenciesMap = [
3636
'androidx.core:core:1.6.0-alpha03',
3737
'com.google.flatbuffers:flatbuffers-java:1.12.0',
3838
'com.google.android.gms:play-services-base:17.6.0'],
39-
'performance' : ['com.google.firebase:firebase-perf:20.0.3'],
39+
'performance' : ['com.google.firebase:firebase-perf:20.0.4'],
4040
'remote_config' : ['com.google.firebase:firebase-config:21.0.1',
4141
'com.google.android.gms:play-services-base:17.6.0'],
4242
'storage' : ['com.google.firebase:firebase-storage:20.0.0'],

database/database_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ android {
4646

4747
dependencies {
4848
implementation 'com.google.firebase:firebase-analytics:20.0.0'
49-
implementation 'com.google.firebase:firebase-database:20.0.2'
49+
implementation 'com.google.firebase:firebase-database:20.0.3'
5050
//implementation project(':app:app_resources')
5151
}
5252

release_build_files/Android/firebase_dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def firebaseDependenciesMap = [
2323
'analytics' : ['com.google.firebase:firebase-analytics:20.0.0',
2424
'com.google.android.gms:play-services-base:17.6.0'],
2525
'auth' : ['com.google.firebase:firebase-auth:21.0.1'],
26-
'database' : ['com.google.firebase:firebase-database:20.0.2'],
26+
'database' : ['com.google.firebase:firebase-database:20.0.3'],
2727
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:21.0.0'],
2828
'firestore' : ['com.google.firebase:firebase-firestore:24.0.0'],
2929
'functions' : ['com.google.firebase:firebase-functions:20.0.1'],
@@ -36,7 +36,7 @@ def firebaseDependenciesMap = [
3636
'androidx.core:core:1.6.0-alpha03',
3737
'com.google.flatbuffers:flatbuffers-java:1.12.0',
3838
'com.google.android.gms:play-services-base:17.6.0'],
39-
'performance' : ['com.google.firebase:firebase-perf:20.0.3'],
39+
'performance' : ['com.google.firebase:firebase-perf:20.0.4'],
4040
'remote_config' : ['com.google.firebase:firebase-config:21.0.1',
4141
'com.google.android.gms:play-services-base:17.6.0'],
4242
'storage' : ['com.google.firebase:firebase-storage:20.0.0'],

release_build_files/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Firebase Realtime Database | libfirebase_database.a
140140
| | libfirebase_app.a
141141
| | com.google.firebase:firebase-analytics:20.0.0
142142
| | (Maven package)
143-
| | com.google.firebase:firebase-database:20.0.2
143+
| | com.google.firebase:firebase-database:20.0.3
144144
| | (Maven package)
145145
| | com.google.firebase:firebase-auth:21.0.1
146146
| | (Maven package)

0 commit comments

Comments
 (0)