Skip to content

Update Android dependencies - Thu Jun 23 2022 #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 24, 2022
Merged

Update Android dependencies - Thu Jun 23 2022 #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8dc3d2d
Update Android dependencies - Thu Jun 23 2022
Jun 23, 2022
a221233
Fix Android update regexes to handle platform()
jonsimantov Jun 24, 2022
d6b0a86
Fix.
jonsimantov Jun 24, 2022
d40a05a
Update more dependencies via the new script.
jonsimantov Jun 24, 2022
db58484
Merge branch 'main' into workflow/auto-update-deps-117-20220623-214859
jonsimantov Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Android/firebase_dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion admob/admob_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion app/app_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion app/google_api_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion app/invites_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion auth/auth_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion database/database_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion firestore/firestore_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion messaging/messaging_java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion release_build_files/Android/firebase_dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion release_build_files/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 8 additions & 5 deletions scripts/update_android_ios_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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 = []
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion storage/storage_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down