Skip to content
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.

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

Update to Firebase Android BoM 33.3.0 while also including the Gradle 7 change. #1653

Merged
merged 25 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
976302e
Update gradle versions to 7
a-maurice Sep 19, 2024
684ea13
Update Java version and buildToolsVersion
a-maurice Sep 19, 2024
691a3f8
Update integration_tests.yml
a-maurice Sep 19, 2024
25eced2
Update integration_tests.yml
a-maurice Sep 19, 2024
15a7a67
More fixes
a-maurice Sep 20, 2024
bde361c
Update google services dependency version
a-maurice Sep 24, 2024
aed9c1d
Remove logic to set ANDROID_SDK_HOME
a-maurice Sep 24, 2024
a2aa622
Update minSdkVersion.
jonsimantov Sep 24, 2024
0623cd0
Try working around a build tools error on Windows.
jonsimantov Sep 24, 2024
feaa4cd
Call d8 directly via java instead of by broken shell script.
jonsimantov Sep 24, 2024
3949acb
Add note about minSdkVersion.
jonsimantov Sep 24, 2024
4fafe16
Change Java version in CI build too.
jonsimantov Sep 25, 2024
ffd516c
Update Android dependencies - Wed Sep 25 2024
Sep 25, 2024
e956c57
Change APP_BINARY_DIR to instead scan for the directory.
jonsimantov Sep 25, 2024
b552d12
Clean up prebuild dependencies from gradle files.
jonsimantov Sep 25, 2024
774bf46
Add minSdkVersion and targetSdkVersion to resources gradle files.
jonsimantov Sep 25, 2024
b5c8d8b
Add targetSdkVersion to messaging.
jonsimantov Sep 25, 2024
aca573f
Force Java 11 on packaging.
jonsimantov Sep 25, 2024
1b4725a
Use the full path to the message forwarding service.
jonsimantov Sep 25, 2024
74507c5
Update version numbers.
jonsimantov Sep 25, 2024
54dea84
Merge branch 'am-gradle_update' into try-merging-gradle-7-change
jonsimantov Sep 25, 2024
602099a
Remove extraneous logging.
jonsimantov Sep 25, 2024
ccc28d1
Fix Android packaging script to use new paths.
jonsimantov Sep 25, 2024
82b522c
Merge branch 'am-gradle_update' into try-merging-gradle-7-change
jonsimantov Sep 25, 2024
22f91c1
Merge branch 'main' into try-merging-gradle-7-change
jonsimantov Sep 26, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ project.afterEvaluate {

// Add the bill-of-materials
project.dependencies {
implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.0')
}
for (String lib : firebaseCpp.dependencies.libSet) {
// Generate and include the proguard file
Expand Down
2 changes: 1 addition & 1 deletion app/app_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.0')
implementation 'com.google.firebase:firebase-analytics'
}

Expand Down
2 changes: 1 addition & 1 deletion app/google_api_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.android.gms:play-services-base:18.5.0'
implementation project(':app:app_resources')
Expand Down
2 changes: 1 addition & 1 deletion app/invites_resources/build.gradle
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:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.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 app_check/app_check_resources/build.gradle
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:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.0')
implementation 'com.google.firebase:firebase-appcheck'
}

Expand Down
2 changes: 1 addition & 1 deletion auth/auth_resources/build.gradle
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:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-auth'
implementation project(':app:app_resources')
Expand Down
6 changes: 3 additions & 3 deletions cpp_sdk_version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"released": "12.2.0",
"stable": "12.2.0",
"head": "12.2.0"
"released": "12.3.0",
"stable": "12.3.0",
"head": "12.3.0"
}
2 changes: 1 addition & 1 deletion database/database_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.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
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-firestore'
}
Expand Down
2 changes: 1 addition & 1 deletion gma/gma_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.android.gms:play-services-ads:23.0.0'
implementation 'com.google.android.ump:user-messaging-platform:2.2.0'
Expand Down
2 changes: 1 addition & 1 deletion messaging/messaging_java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.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
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ project.afterEvaluate {

// Add the bill-of-materials
project.dependencies {
implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.0')
}
for (String lib : firebaseCpp.dependencies.libSet) {
// Messaging includes an aar, which to be depended on properly requires
Expand Down
6 changes: 4 additions & 2 deletions release_build_files/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ distributed as part of the core Firebase

Feature | Required Libraries and Gradle Packages
-------------------------- | --------------------------------------
All Firebase SDKs | platform(com.google.firebase:firebase-bom:33.1.2)
All Firebase SDKs | platform(com.google.firebase:firebase-bom:33.3.0)
| | (Android Bill of Materials)
Firebase Analytics | libfirebase_analytics.a
| | libfirebase_app.a
Expand Down Expand Up @@ -631,8 +631,10 @@ workflow use only during the development of your app, not for publicly shipping
code.

## Release Notes
### Upcoming Release
### 12.3.0
- Changes
- General (iOS): Update to Firebase Cocoapods version 11.2.0.
- General (Android): Update to Firebase Android BoM version 33.3.0.
- General (Android): Updated minSdkVersion to 24.
- Messaging: Changed SetListener to send the last token received
before the listener was set.
Expand Down
2 changes: 1 addition & 1 deletion remote_config/remote_config_resources/build.gradle
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:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.0')
implementation 'com.google.firebase:firebase-config'
}

Expand Down
2 changes: 1 addition & 1 deletion storage/storage_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.3.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-storage'
}
Expand Down
Loading