From 8dc3d2dc26ed5a071f54d4562070a1f6b31f4a4a Mon Sep 17 00:00:00 2001 From: firebase-workflow-trigger-bot Date: Thu, 23 Jun 2022 21:49:11 +0000 Subject: [PATCH 1/4] Update Android dependencies - Thu Jun 23 2022 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### 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). --- Android/firebase_dependencies.gradle | 2 +- release_build_files/Android/firebase_dependencies.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index e838eec0b3..7d639b679c 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -151,7 +151,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/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle index 46012c7650..d1b24e24a1 100644 --- a/release_build_files/Android/firebase_dependencies.gradle +++ b/release_build_files/Android/firebase_dependencies.gradle @@ -126,7 +126,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 From a221233db908c0353cb4d45d4c551a5b0f29ca13 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 24 Jun 2022 13:33:53 -0700 Subject: [PATCH 2/4] Fix Android update regexes to handle platform() --- scripts/update_android_ios_dependencies.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/update_android_ios_dependencies.py b/scripts/update_android_ios_dependencies.py index 11de7c61d7..2c330136fd 100644 --- 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\s+)\| (?P[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)") + r"^(?P\|\s+|[A-Z][\w\s]+)\| (?Pplatform\()?(?P[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[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)\'") + r"implementation\s*(platform\()?\'(?P[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)\'\)?") def modify_gradle_file(gradle_filepath, version_map, dryrun=True): From d6b0a863bcbce315ff77d6c402a5486e1231ffb5 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 24 Jun 2022 13:39:53 -0700 Subject: [PATCH 3/4] Fix. --- scripts/update_android_ios_dependencies.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/update_android_ios_dependencies.py b/scripts/update_android_ios_dependencies.py index 2c330136fd..6aa44074fe 100644 --- a/scripts/update_android_ios_dependencies.py +++ b/scripts/update_android_ios_dependencies.py @@ -613,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*(platform\()?\'(?P[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)\'\)?") + r"implementation\s*(?Pplatform\()?\'(?P[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)\'(?P\))?") def modify_gradle_file(gradle_filepath, version_map, dryrun=True): @@ -647,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 From d40a05a47b731ddc8836aa9f7db4c3f474a9ff14 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 24 Jun 2022 13:40:27 -0700 Subject: [PATCH 4/4] Update more dependencies via the new script. --- admob/admob_resources/build.gradle | 2 +- app/app_resources/build.gradle | 2 +- app/google_api_resources/build.gradle | 2 +- app/invites_resources/build.gradle | 2 +- auth/auth_resources/build.gradle | 2 +- database/database_resources/build.gradle | 2 +- firestore/firestore_resources/build.gradle | 2 +- messaging/messaging_java/build.gradle | 2 +- release_build_files/readme.md | 2 +- storage/storage_resources/build.gradle | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/admob/admob_resources/build.gradle b/admob/admob_resources/build.gradle index c1b669b9d0..f65c9dd48b 100644 --- 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 index 7d75d35b10..6c9f422300 100644 --- 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 index 3978903d65..b1be73b789 100644 --- 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 index 950fbde7ce..d28f5f2726 100644 --- 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 index 7fa0e4612c..e1e2e32cbf 100644 --- 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 index 979cac1c83..b2c9a14174 100644 --- 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 index d9f828eeb5..00b17f0a74 100644 --- 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 index c987a19701..d932748766 100644 --- 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/readme.md b/release_build_files/readme.md index 4c42fe026b..1646c13e85 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -78,7 +78,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 | | libfirebase_app.a diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 7a9129870e..b8265a8295 100644 --- 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' }