Skip to content

Commit c7f5ce8

Browse files
firebase-workflow-trigger[bot]firebase-workflow-trigger-botjonsimantov
authored
Update Android dependencies - Thu Jun 23 2022 (#1007)
* Update Android dependencies - Thu Jun 23 2022 ### Android - com.google.firebase.firebase_bom → 30.2.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/2552174443). * Fix Android update regexes to handle platform() * Update more dependencies via the new script. Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: Jon Simantov <[email protected]>
1 parent 33d2162 commit c7f5ce8

File tree

13 files changed

+20
-17
lines changed

13 files changed

+20
-17
lines changed

‎Android/firebase_dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ project.afterEvaluate {
156156

157157
// Add the bill-of-materials
158158
project.dependencies {
159-
implementation platform('com.google.firebase:firebase-bom:30.1.0')
159+
implementation platform('com.google.firebase:firebase-bom:30.2.0')
160160
}
161161
for (String lib : firebaseCpp.dependencies.libSet) {
162162
// Generate and include the proguard file

‎admob/admob_resources/build.gradle

Lines changed: 1 addition & 1 deletion
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:30.1.0')
48+
implementation platform('com.google.firebase:firebase-bom:30.2.0')
4949
implementation 'com.google.firebase:firebase-analytics'
5050
implementation 'com.google.firebase:firebase-ads:19.8.0'
5151
}

‎app/app_resources/build.gradle

Lines changed: 1 addition & 1 deletion
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:30.1.0')
53+
implementation platform('com.google.firebase:firebase-bom:30.2.0')
5454
implementation 'com.google.firebase:firebase-analytics'
5555
}
5656

‎app/google_api_resources/build.gradle

Lines changed: 1 addition & 1 deletion
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:30.1.0')
56+
implementation platform('com.google.firebase:firebase-bom:30.2.0')
5757
implementation 'com.google.firebase:firebase-analytics'
5858
implementation 'com.google.android.gms:play-services-base:18.0.1'
5959
implementation project(':app:app_resources')

‎app/invites_resources/build.gradle

Lines changed: 1 addition & 1 deletion
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:30.1.0')
52+
implementation platform('com.google.firebase:firebase-bom:30.2.0')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-dynamic-links'
5555
implementation project(':app:app_resources')

‎auth/auth_resources/build.gradle

Lines changed: 1 addition & 1 deletion
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:30.1.0')
52+
implementation platform('com.google.firebase:firebase-bom:30.2.0')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-auth'
5555
implementation project(':app:app_resources')

‎database/database_resources/build.gradle

Lines changed: 1 addition & 1 deletion
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:30.1.0')
48+
implementation platform('com.google.firebase:firebase-bom:30.2.0')
4949
implementation 'com.google.firebase:firebase-analytics'
5050
implementation 'com.google.firebase:firebase-database'
5151
//implementation project(':app:app_resources')

‎firestore/firestore_resources/build.gradle

Lines changed: 1 addition & 1 deletion
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:30.1.0')
56+
implementation platform('com.google.firebase:firebase-bom:30.2.0')
5757
implementation 'com.google.firebase:firebase-analytics'
5858
implementation 'com.google.firebase:firebase-firestore'
5959
}

‎messaging/messaging_java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ android {
5555
}
5656

5757
dependencies {
58-
implementation platform('com.google.firebase:firebase-bom:30.1.0')
58+
implementation platform('com.google.firebase:firebase-bom:30.2.0')
5959
implementation 'com.google.firebase:firebase-analytics'
6060
implementation 'com.google.firebase:firebase-messaging'
6161
implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'

‎release_build_files/Android/firebase_dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ project.afterEvaluate {
130130

131131
// Add the bill-of-materials
132132
project.dependencies {
133-
implementation platform('com.google.firebase:firebase-bom:30.1.0')
133+
implementation platform('com.google.firebase:firebase-bom:30.2.0')
134134
}
135135
for (String lib : firebaseCpp.dependencies.libSet) {
136136
// Messaging includes an aar, which to be depended on properly requires

‎release_build_files/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ distributed as part of the core Firebase
7979

8080
Feature | Required Libraries and Gradle Packages
8181
-------------------------- | --------------------------------------
82-
All Firebase SDKs | platform(com.google.firebase:firebase-bom:30.1.0)
82+
All Firebase SDKs | platform(com.google.firebase:firebase-bom:30.2.0)
8383
| | (Android Bill of Materials)
8484
Firebase AdMob | libfirebase_admob.a
8585
| (deprecated) | libfirebase_app.a

‎scripts/update_android_ios_dependencies.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ def replace_dependency(m):
549549
# | | com.google.firebase:firebase-auth:1.2.3
550550
# | | com.google.firebase:firebase-auth:1.2.3-alpha
551551
RE_README_ANDROID_VERSION = re.compile(
552-
r"\|(?P<spaces>\s+)\| (?P<pkg>[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)")
552+
r"^(?P<intro>\|\s+|[A-Z][\w\s]+)\| (?P<mid>platform\()?(?P<pkg>[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)")
553553

554554

555555
def modify_readme_file_android(readme_filepath, version_map, dryrun=True):
@@ -579,12 +579,13 @@ def modify_readme_file_android(readme_filepath, version_map, dryrun=True):
579579

580580
# Replacement function, look up the version number of the given pkg.
581581
def replace_module_line(m):
582-
if not m.group('pkg'):
582+
if not m.group('pkg') or not m.group('intro'):
583583
return m.group(0)
584584
pkg = m.group('pkg').replace('-', '_').replace(':', '.')
585585
if pkg not in version_map:
586586
return m.group(0)
587-
repl = '|%s| %s:%s' % (m.group('spaces'), m.group('pkg'), version_map[pkg])
587+
repl = '%s| %s%s:%s' % (m.group('intro'), m.group('mid') if m.group('mid') else '',
588+
m.group('pkg'), version_map[pkg])
588589
return repl
589590

590591
substituted_pairs = []
@@ -612,7 +613,7 @@ def replace_module_line(m):
612613
# implementation 'com.google.firebase:firebase-auth:1.2.3'
613614
# implementation 'com.google.firebase:firebase-auth:1.2.3-alpha'
614615
RE_GRADLE_COMPILE_MODULE = re.compile(
615-
r"implementation\s*\'(?P<pkg>[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)\'")
616+
r"implementation\s*(?P<mid>platform\()?\'(?P<pkg>[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)\'(?P<end>\))?")
616617

617618

618619
def modify_gradle_file(gradle_filepath, version_map, dryrun=True):
@@ -646,7 +647,9 @@ def replace_module_line(m):
646647
pkg = m.group("pkg").replace("-", "_").replace(":", ".")
647648
if pkg not in version_map:
648649
return m.group(0)
649-
return "implementation '%s:%s'" % (m.group("pkg"), version_map[pkg])
650+
return "implementation %s'%s:%s'%s" % (m.group('mid') if m.group('mid') else '',
651+
m.group('pkg'), version_map[pkg],
652+
m.group('end') if m.group('end') else '')
650653

651654
substituted_pairs = []
652655
to_update = False

‎storage/storage_resources/build.gradle

Lines changed: 1 addition & 1 deletion
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:30.1.0')
52+
implementation platform('com.google.firebase:firebase-bom:30.2.0')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-storage'
5555
}

0 commit comments

Comments
 (0)