Skip to content

Gradle update with Firebase Android SDK dependency update #1651

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

Closed
wants to merge 29 commits into from
Closed

Gradle update with Firebase Android SDK dependency update #1651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a1acb7a
Update Android dependencies - Tue Sep 10 2024
Sep 10, 2024
ccaab81
Add pickFirst for kotlin file that breaks build.
jonsimantov Sep 12, 2024
b9931af
Add a wildcard since it's more than one file.
jonsimantov Sep 12, 2024
f9ed78f
Fix gradle error.
jonsimantov Sep 16, 2024
96223ae
Merge remote-tracking branch 'origin/main' into workflow/auto-update-…
jonsimantov Sep 16, 2024
232e0dc
Force a newer guava dependency as an experiment.
jonsimantov Sep 16, 2024
f8ab87e
Remove conflicting deps.
jonsimantov Sep 17, 2024
9b42f92
Try constraining version.
jonsimantov Sep 17, 2024
abf0046
Try adding a different guava dep to the integration test.
jonsimantov Sep 17, 2024
37e5cba
Merge branch 'main' into workflow/auto-update-deps-234-20240910-133322
jonsimantov Sep 17, 2024
d66d1ed
Force guava version.
jonsimantov Sep 17, 2024
6df22a9
Merge branch 'workflow/auto-update-deps-234-20240910-133322' of https…
jonsimantov Sep 17, 2024
eb6a24b
Reorder dependencies.
jonsimantov Sep 17, 2024
b1c6522
set the org.gradle.jvm.environment attribute
jonsimantov Sep 18, 2024
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
c6ae4c5
Update google services plugin version.
jonsimantov Sep 24, 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
8de882c
Merge remote-tracking branch 'origin/am-gradle_update' into js-gradle…
jonsimantov Sep 24, 2024
7a4a555
Remove guava hard dependency.
jonsimantov Sep 24, 2024
8e18f60
Merge branch 'workflow/auto-update-deps-234-20240910-133322' into js-…
jonsimantov Sep 24, 2024
a1f609e
Update minSdkVersion.
jonsimantov Sep 24, 2024
3b0942e
Add debug output to extract
jonsimantov Sep 24, 2024
082887d
Try working around a build tools error on Windows.
jonsimantov Sep 24, 2024
0fd8159
Call d8 directly via java instead of by broken shell script.
jonsimantov Sep 24, 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
9 changes: 4 additions & 5 deletions .github/workflows/integration_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,10 +426,9 @@ jobs:
with:
ref: ${{needs.check_and_prepare.outputs.github_ref}}
submodules: true
- name: Force Java 8 (macOS)
if: startsWith(matrix.os, 'macos')
- name: Force Java 11
shell: bash
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
- name: Add msbuild to PATH (Windows)
if: startsWith(matrix.os, 'windows')
uses: microsoft/[email protected]
Expand Down Expand Up @@ -1058,11 +1057,11 @@ jobs:
run: |
echo "device_type=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.android_device }} -get_device_type)" >> $GITHUB_OUTPUT
echo "device=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.android_device }} -get_ftl_device_list)" >> $GITHUB_OUTPUT
- name: Setup java 8 for test_simulator.py
- name: Setup java 11 for test_simulator.py
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '8'
java-version: '11'
- name: Run Android integration tests on Emulator locally
timeout-minutes: 180
if: steps.device-info.outputs.device_type == 'virtual'
Expand Down
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 @@ -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.2.0')
}
for (String lib : firebaseCpp.dependencies.libSet) {
// Generate and include the proguard file
Expand Down
6 changes: 3 additions & 3 deletions analytics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:7.4.2'
}
}
allprojects {
Expand All @@ -33,7 +33,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 34
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -48,7 +48,7 @@ android {
}

defaultConfig {
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName "1.0"
Expand Down
12 changes: 6 additions & 6 deletions analytics/integration_test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.0.1'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}

Expand All @@ -37,12 +37,12 @@ apply plugin: 'com.android.application'

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -55,7 +55,7 @@ android {

defaultConfig {
applicationId 'com.google.android.analytics.testapp'
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName '1.0'
Expand Down
2 changes: 1 addition & 1 deletion analytics/integration_test/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip
14 changes: 5 additions & 9 deletions android_build_files/extract_and_dex.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,11 @@ def defineExtractionTasks(String resourceName, String buildType) {
outputs.file "$outPro"

// Convert the jar format using the dx tool.
String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/dx"
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
dex_path = "${dex_path}.bat"
}

commandLine "${dex_path}",
'--dex',
"--output=$dexedJar",
"$buildDir/classes.jar"
String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/lib/d8.jar"
commandLine "java", "-cp", "${dex_path}", "com.android.tools.r8.D8",
"$buildDir/classes.jar",
"--output",
"$dexedJar"
}

// Once the dexed jar has been made, generate a proguard file for it.
Expand Down
11 changes: 6 additions & 5 deletions app/app_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}
allprojects {
Expand All @@ -33,10 +33,11 @@ apply plugin: 'com.android.library'

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -50,7 +51,7 @@ android {
}

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

Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:7.4.2'
}
}
allprojects {
Expand All @@ -33,7 +33,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 34
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -48,7 +48,7 @@ android {
}

defaultConfig {
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName "1.0"
Expand Down
11 changes: 6 additions & 5 deletions app/google_api_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}
allprojects {
Expand All @@ -33,10 +33,11 @@ apply plugin: 'com.android.library'

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -53,7 +54,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.2.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
12 changes: 6 additions & 6 deletions app/integration_test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.0.1'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}

Expand All @@ -37,12 +37,12 @@ apply plugin: 'com.android.application'

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -55,7 +55,7 @@ android {

defaultConfig {
applicationId 'com.google.android.analytics.testapp'
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName '1.0'
Expand Down
2 changes: 1 addition & 1 deletion app/integration_test/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip
11 changes: 6 additions & 5 deletions app/invites_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}
allprojects {
Expand All @@ -33,10 +33,11 @@ apply plugin: 'com.android.library'

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -49,7 +50,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation platform('com.google.firebase:firebase-bom:33.2.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-dynamic-links'
implementation project(':app:app_resources')
Expand Down
5 changes: 3 additions & 2 deletions app/test_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}
allprojects {
Expand All @@ -33,6 +33,7 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion 34
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand Down
11 changes: 6 additions & 5 deletions app_check/app_check_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}
allprojects {
Expand All @@ -33,10 +33,11 @@ apply plugin: 'com.android.library'

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -49,7 +50,7 @@ android {
}

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

Expand Down
6 changes: 3 additions & 3 deletions app_check/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:7.4.2'
}
}
allprojects {
Expand All @@ -33,7 +33,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 34
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -48,7 +48,7 @@ android {
}

defaultConfig {
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName "1.0"
Expand Down
Loading
Loading