diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index e81ae13c4f..f91f98b179 100644 --- 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 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/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle index 38ba3f190f..aaf244788c 100644 --- 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 index 1338f434b7..00b4055dcc 100644 --- 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 index 11de7c61d7..6aa44074fe 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*(?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): @@ -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 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' }