Update Android dependencies - Thu Jun 23 2022 (#1007)

firebase-workflow-trigger[bot] · firebase-workflow-trigger-bot · jonsimantov · web-flow · commit c7f5ce82e0be · 2022-06-24T23:24:04.000Z
* 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 <firebase-workflow-trigger-bot@google.com> Co-authored-by: Jon Simantov <jsimantov@google.com>
diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle
@@ -156,7 +156,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:30.1.0')
+      implementation platform('com.google.firebase:firebase-bom:30.2.0')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Generate and include the proguard file
diff --git a/admob/admob_resources/build.gradle b/admob/admob_resources/build.gradle
@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:30.1.0')
+  implementation platform('com.google.firebase:firebase-bom:30.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-ads:19.8.0'
 }
diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:30.1.0')
+  implementation platform('com.google.firebase:firebase-bom:30.2.0')
   implementation 'com.google.firebase:firebase-analytics'
 }
 
diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:30.1.0')
+  implementation platform('com.google.firebase:firebase-bom:30.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-base:18.0.1'
   implementation project(':app:app_resources')
diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:30.1.0')
+  implementation platform('com.google.firebase:firebase-bom:30.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-dynamic-links'
   implementation project(':app:app_resources')
diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:30.1.0')
+  implementation platform('com.google.firebase:firebase-bom:30.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-auth'
   implementation project(':app:app_resources')
diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle
@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:30.1.0')
+  implementation platform('com.google.firebase:firebase-bom:30.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-database'
   //implementation project(':app:app_resources')
diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:30.1.0')
+  implementation platform('com.google.firebase:firebase-bom:30.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-firestore'
 }
diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:30.1.0')
+  implementation platform('com.google.firebase:firebase-bom:30.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-messaging'
   implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'
diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle
@@ -130,7 +130,7 @@ project.afterEvaluate {
 
       // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:30.1.0')
+      implementation platform('com.google.firebase:firebase-bom:30.2.0')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Messaging includes an aar, which to be depended on properly requires
diff --git a/release_build_files/readme.md b/release_build_files/readme.md
@@ -79,7 +79,7 @@ distributed as part of the core Firebase
 
 Feature                    | Required Libraries and Gradle Packages
 -------------------------- | --------------------------------------
-All Firebase SDKs          | platform(com.google.firebase:firebase-bom:30.1.0)
+All Firebase SDKs          | platform(com.google.firebase:firebase-bom:30.2.0)
 |                          | (Android Bill of Materials)
 Firebase AdMob             | libfirebase_admob.a
 | (deprecated)             | libfirebase_app.a
diff --git a/scripts/update_android_ios_dependencies.py b/scripts/update_android_ios_dependencies.py
@@ -549,7 +549,7 @@ def replace_dependency(m):
 # |                          | com.google.firebase:firebase-auth:1.2.3
 # |                          | com.google.firebase:firebase-auth:1.2.3-alpha
 RE_README_ANDROID_VERSION = re.compile(
-    r"\|(?P<spaces>\s+)\| (?P<pkg>[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)")
+    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._-]+)")
 
 
 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):
 
   # Replacement function, look up the version number of the given pkg.
   def replace_module_line(m):
-    if not m.group('pkg'):
+    if not m.group('pkg') or not m.group('intro'):
       return m.group(0)
     pkg = m.group('pkg').replace('-', '_').replace(':', '.')
     if pkg not in version_map:
       return m.group(0)
-    repl = '|%s| %s:%s' % (m.group('spaces'), m.group('pkg'), version_map[pkg])
+    repl = '%s| %s%s:%s' % (m.group('intro'), m.group('mid') if m.group('mid') else '',
+                            m.group('pkg'), version_map[pkg])
     return repl
 
   substituted_pairs = []
@@ -612,7 +613,7 @@ def replace_module_line(m):
 # implementation 'com.google.firebase:firebase-auth:1.2.3'
 # implementation 'com.google.firebase:firebase-auth:1.2.3-alpha'
 RE_GRADLE_COMPILE_MODULE = re.compile(
-    r"implementation\s*\'(?P<pkg>[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)\'")
+    r"implementation\s*(?P<mid>platform\()?\'(?P<pkg>[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)\'(?P<end>\))?")
 
 
 def modify_gradle_file(gradle_filepath, version_map, dryrun=True):
@@ -646,7 +647,9 @@ def replace_module_line(m):
     pkg = m.group("pkg").replace("-", "_").replace(":", ".")
     if pkg not in version_map:
       return m.group(0)
-    return "implementation '%s:%s'" % (m.group("pkg"), version_map[pkg])
+    return "implementation %s'%s:%s'%s" % (m.group('mid') if m.group('mid') else '',
+                                           m.group('pkg'), version_map[pkg],
+                                           m.group('end') if m.group('end') else '')
 
   substituted_pairs = []
   to_update = False
diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:30.1.0')
+  implementation platform('com.google.firebase:firebase-bom:30.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-storage'
 }

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ project.afterEvaluate {`
`156`	`156`
`157`	`157`	`// Add the bill-of-materials`
`158`	`158`	`project.dependencies {`
`159`		`- implementation platform('com.google.firebase:firebase-bom:30.1.0')`
	`159`	`+ implementation platform('com.google.firebase:firebase-bom:30.2.0')`
`160`	`160`	`}`
`161`	`161`	`for (String lib : firebaseCpp.dependencies.libSet) {`
`162`	`162`	`// Generate and include the proguard file`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ android {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`dependencies {`
`48`		`- implementation platform('com.google.firebase:firebase-bom:30.1.0')`
	`48`	`+ implementation platform('com.google.firebase:firebase-bom:30.2.0')`
`49`	`49`	`implementation 'com.google.firebase:firebase-analytics'`
`50`	`50`	`implementation 'com.google.firebase:firebase-ads:19.8.0'`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ android {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`dependencies {`
`53`		`- implementation platform('com.google.firebase:firebase-bom:30.1.0')`
	`53`	`+ implementation platform('com.google.firebase:firebase-bom:30.2.0')`
`54`	`54`	`implementation 'com.google.firebase:firebase-analytics'`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ android {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`dependencies {`
`56`		`- implementation platform('com.google.firebase:firebase-bom:30.1.0')`
	`56`	`+ implementation platform('com.google.firebase:firebase-bom:30.2.0')`
`57`	`57`	`implementation 'com.google.firebase:firebase-analytics'`
`58`	`58`	`implementation 'com.google.android.gms:play-services-base:18.0.1'`
`59`	`59`	`implementation project(':app:app_resources')`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ android {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`dependencies {`
`52`		`- implementation platform('com.google.firebase:firebase-bom:30.1.0')`
	`52`	`+ implementation platform('com.google.firebase:firebase-bom:30.2.0')`
`53`	`53`	`implementation 'com.google.firebase:firebase-analytics'`
`54`	`54`	`implementation 'com.google.firebase:firebase-dynamic-links'`
`55`	`55`	`implementation project(':app:app_resources')`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ android {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`dependencies {`
`58`		`- implementation platform('com.google.firebase:firebase-bom:30.1.0')`
	`58`	`+ implementation platform('com.google.firebase:firebase-bom:30.2.0')`
`59`	`59`	`implementation 'com.google.firebase:firebase-analytics'`
`60`	`60`	`implementation 'com.google.firebase:firebase-messaging'`
`61`	`61`	`implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ project.afterEvaluate {`
`130`	`130`
`131`	`131`	`// Add the bill-of-materials`
`132`	`132`	`project.dependencies {`
`133`		`- implementation platform('com.google.firebase:firebase-bom:30.1.0')`
	`133`	`+ implementation platform('com.google.firebase:firebase-bom:30.2.0')`
`134`	`134`	`}`
`135`	`135`	`for (String lib : firebaseCpp.dependencies.libSet) {`
`136`	`136`	`// Messaging includes an aar, which to be depended on properly requires`