From 976302e7ef64a7864ba91f6d1a61e371e84e7bd9 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 19 Sep 2024 14:52:28 -0700 Subject: [PATCH 01/20] Update gradle versions to 7 --- analytics/build.gradle | 2 +- analytics/integration_test/build.gradle | 2 +- .../integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- app/app_resources/build.gradle | 2 +- app/build.gradle | 2 +- app/google_api_resources/build.gradle | 2 +- app/integration_test/build.gradle | 2 +- app/integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- app/invites_resources/build.gradle | 2 +- app/test_resources/build.gradle | 2 +- app_check/app_check_resources/build.gradle | 2 +- app_check/build.gradle | 2 +- app_check/integration_test/build.gradle | 2 +- .../integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- auth/auth_resources/build.gradle | 2 +- auth/build.gradle | 2 +- auth/integration_test/build.gradle | 2 +- auth/integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- database/build.gradle | 2 +- database/database_resources/build.gradle | 2 +- database/integration_test/build.gradle | 2 +- .../integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- dynamic_links/build.gradle | 2 +- dynamic_links/integration_test/build.gradle | 2 +- .../integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- firestore/build.gradle | 2 +- firestore/firestore_resources/build.gradle | 2 +- firestore/integration_test/build.gradle | 2 +- .../integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- firestore/integration_test_internal/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- functions/build.gradle | 2 +- functions/integration_test/build.gradle | 2 +- .../integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- gma/build.gradle | 2 +- gma/gma_resources/build.gradle | 2 +- gma/integration_test/build.gradle | 2 +- gma/integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- installations/build.gradle | 2 +- installations/integration_test/build.gradle | 2 +- .../integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- messaging/build.gradle | 2 +- messaging/integration_test/build.gradle | 2 +- .../integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- messaging/messaging_java/build.gradle | 2 +- remote_config/build.gradle | 2 +- remote_config/integration_test/build.gradle | 2 +- .../integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- remote_config/remote_config_resources/build.gradle | 2 +- scripts/gha/integration_testing/gameloop_android/build.gradle | 2 +- .../gameloop_android/gradle/wrapper/gradle-wrapper.properties | 2 +- scripts/gha/ui_testing/uitest_android/build.gradle | 2 +- .../uitest_android/gradle/wrapper/gradle-wrapper.properties | 2 +- storage/build.gradle | 2 +- storage/integration_test/build.gradle | 2 +- .../integration_test/gradle/wrapper/gradle-wrapper.properties | 2 +- storage/storage_resources/build.gradle | 2 +- testing/build.gradle | 2 +- 59 files changed, 59 insertions(+), 59 deletions(-) diff --git a/analytics/build.gradle b/analytics/build.gradle index b1e1705baa..6fd9f09602 100644 --- a/analytics/build.gradle +++ b/analytics/build.gradle @@ -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 { diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle index 29621bd352..ac8b5510e4 100644 --- a/analytics/integration_test/build.gradle +++ b/analytics/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties b/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index 8351e562db..3392451643 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/app/build.gradle b/app/build.gradle index fa2a2aae91..2f966677a0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 { diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index 7ee92162e2..8f130dfa66 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle index 3cec305c79..663a633569 100644 --- a/app/integration_test/build.gradle +++ b/app/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/app/integration_test/gradle/wrapper/gradle-wrapper.properties b/app/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/app/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/app/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index 1adbca0ae7..735a1532c4 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle index 53c2d0e136..55ab9933e6 100644 --- a/app/test_resources/build.gradle +++ b/app/test_resources/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index 6cc09ba1df..623fe79f7c 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/app_check/build.gradle b/app_check/build.gradle index 82ca483612..827f16e246 100644 --- a/app_check/build.gradle +++ b/app_check/build.gradle @@ -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 { diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle index 4877125e27..dde1c89208 100644 --- a/app_check/integration_test/build.gradle +++ b/app_check/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties b/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index 00564f2957..ec726dfda9 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/auth/build.gradle b/auth/build.gradle index 7ddc5e4e8d..abf0bcec5c 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -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 { diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle index 942a05b0d6..e44cc9f71f 100644 --- a/auth/integration_test/build.gradle +++ b/auth/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/auth/integration_test/gradle/wrapper/gradle-wrapper.properties b/auth/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/auth/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/auth/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/database/build.gradle b/database/build.gradle index 51cf8c0dfa..e8352d9449 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -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 { diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle index 4cfb882e01..6662e2bdf4 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle index 86907f840f..5d5faf4a15 100644 --- a/database/integration_test/build.gradle +++ b/database/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/database/integration_test/gradle/wrapper/gradle-wrapper.properties b/database/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/database/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/database/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle index 7a8fee4af8..c8c61b5692 100644 --- a/dynamic_links/build.gradle +++ b/dynamic_links/build.gradle @@ -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 { diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle index 92f1978cad..fc7f5ce3dd 100644 --- a/dynamic_links/integration_test/build.gradle +++ b/dynamic_links/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/dynamic_links/integration_test/gradle/wrapper/gradle-wrapper.properties b/dynamic_links/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/dynamic_links/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/dynamic_links/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/firestore/build.gradle b/firestore/build.gradle index 4c3d7c0800..ebdd78157f 100644 --- a/firestore/build.gradle +++ b/firestore/build.gradle @@ -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 { diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index 93439900aa..578f4a2d24 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle index 37efea8216..885df6eff5 100644 --- a/firestore/integration_test/build.gradle +++ b/firestore/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/firestore/integration_test/gradle/wrapper/gradle-wrapper.properties b/firestore/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/firestore/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/firestore/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index f1bb9b4f3b..a5102596f1 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/firestore/integration_test_internal/gradle/wrapper/gradle-wrapper.properties b/firestore/integration_test_internal/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/firestore/integration_test_internal/gradle/wrapper/gradle-wrapper.properties +++ b/firestore/integration_test_internal/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/functions/build.gradle b/functions/build.gradle index bdecc2819f..4f880885ff 100644 --- a/functions/build.gradle +++ b/functions/build.gradle @@ -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 { diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle index d773468cb1..e5183730e8 100644 --- a/functions/integration_test/build.gradle +++ b/functions/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/functions/integration_test/gradle/wrapper/gradle-wrapper.properties b/functions/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/functions/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/functions/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gma/build.gradle b/gma/build.gradle index bd0bab6803..1c7ee68c50 100644 --- a/gma/build.gradle +++ b/gma/build.gradle @@ -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 { diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index bd1a8144c3..85eca36d91 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle index 58cdfd4a82..2b699b9c75 100644 --- a/gma/integration_test/build.gradle +++ b/gma/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/gma/integration_test/gradle/wrapper/gradle-wrapper.properties b/gma/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/gma/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/gma/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 39e18027f1..78b9533282 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,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 diff --git a/installations/build.gradle b/installations/build.gradle index ba4d234524..4a2c378eca 100644 --- a/installations/build.gradle +++ b/installations/build.gradle @@ -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 { diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle index 9c501b9e25..af35fdf3a3 100644 --- a/installations/integration_test/build.gradle +++ b/installations/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/installations/integration_test/gradle/wrapper/gradle-wrapper.properties b/installations/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/installations/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/installations/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/messaging/build.gradle b/messaging/build.gradle index 6068dfb54c..814e9f404f 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -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 { diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle index 9bbc92c059..5da340d77a 100644 --- a/messaging/integration_test/build.gradle +++ b/messaging/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/messaging/integration_test/gradle/wrapper/gradle-wrapper.properties b/messaging/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/messaging/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/messaging/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle index a268401ee7..3a58715105 100644 --- a/messaging/messaging_java/build.gradle +++ b/messaging/messaging_java/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' // This uses Flatbuffers at 1.9 because the 1.10 version added a feature // that requires using a newer version of the JDK and at least Android N. diff --git a/remote_config/build.gradle b/remote_config/build.gradle index 720d8c770e..cfd7698012 100644 --- a/remote_config/build.gradle +++ b/remote_config/build.gradle @@ -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 { diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle index 5c669ad9cc..b56399fbea 100644 --- a/remote_config/integration_test/build.gradle +++ b/remote_config/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/remote_config/integration_test/gradle/wrapper/gradle-wrapper.properties b/remote_config/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/remote_config/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/remote_config/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index 9a766490da..6983cfc8ed 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/scripts/gha/integration_testing/gameloop_android/build.gradle b/scripts/gha/integration_testing/gameloop_android/build.gradle index dfcc273d9e..e6b5bb1ca5 100644 --- a/scripts/gha/integration_testing/gameloop_android/build.gradle +++ b/scripts/gha/integration_testing/gameloop_android/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/scripts/gha/integration_testing/gameloop_android/gradle/wrapper/gradle-wrapper.properties b/scripts/gha/integration_testing/gameloop_android/gradle/wrapper/gradle-wrapper.properties index 82458a4184..b9c7d0a07e 100644 --- a/scripts/gha/integration_testing/gameloop_android/gradle/wrapper/gradle-wrapper.properties +++ b/scripts/gha/integration_testing/gameloop_android/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/scripts/gha/ui_testing/uitest_android/build.gradle b/scripts/gha/ui_testing/uitest_android/build.gradle index 2bd3427703..e919d1924c 100644 --- a/scripts/gha/ui_testing/uitest_android/build.gradle +++ b/scripts/gha/ui_testing/uitest_android/build.gradle @@ -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' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/scripts/gha/ui_testing/uitest_android/gradle/wrapper/gradle-wrapper.properties b/scripts/gha/ui_testing/uitest_android/gradle/wrapper/gradle-wrapper.properties index a802084a46..d95d870842 100644 --- a/scripts/gha/ui_testing/uitest_android/gradle/wrapper/gradle-wrapper.properties +++ b/scripts/gha/ui_testing/uitest_android/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/storage/build.gradle b/storage/build.gradle index ebc6e14f12..0d00957d9e 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -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 { diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle index 2aa85d28e2..1e14b14953 100644 --- a/storage/integration_test/build.gradle +++ b/storage/integration_test/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/storage/integration_test/gradle/wrapper/gradle-wrapper.properties b/storage/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/storage/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/storage/integration_test/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 12282470b4..89501f8218 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/testing/build.gradle b/testing/build.gradle index 40b236689c..6ad9ff41fd 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -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' classpath 'com.google.gms:google-services:4.2.0' classpath 'com.google.flatbuffers:flatbuffers-java:1.12.0' } From 684ea132ef2941b4a506da13a11b38f606a81372 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 19 Sep 2024 15:18:28 -0700 Subject: [PATCH 02/20] Update Java version and buildToolsVersion --- analytics/build.gradle | 2 +- analytics/integration_test/build.gradle | 6 +++--- app/app_resources/build.gradle | 4 ++-- app/build.gradle | 2 +- app/google_api_resources/build.gradle | 4 ++-- app/integration_test/build.gradle | 6 +++--- app/invites_resources/build.gradle | 4 ++-- app_check/app_check_resources/build.gradle | 4 ++-- app_check/build.gradle | 2 +- app_check/integration_test/build.gradle | 6 +++--- auth/auth_resources/build.gradle | 4 ++-- auth/build.gradle | 2 +- auth/integration_test/build.gradle | 6 +++--- database/build.gradle | 2 +- database/integration_test/build.gradle | 6 +++--- dynamic_links/build.gradle | 2 +- dynamic_links/integration_test/build.gradle | 6 +++--- firestore/build.gradle | 2 +- firestore/firestore_resources/build.gradle | 4 ++-- firestore/integration_test/build.gradle | 6 +++--- firestore/integration_test_internal/build.gradle | 6 +++--- functions/build.gradle | 2 +- functions/integration_test/build.gradle | 6 +++--- gma/build.gradle | 2 +- gma/gma_resources/build.gradle | 4 ++-- gma/integration_test/build.gradle | 6 +++--- installations/build.gradle | 2 +- installations/integration_test/build.gradle | 6 +++--- messaging/build.gradle | 2 +- messaging/integration_test/build.gradle | 6 +++--- messaging/messaging_java/build.gradle | 4 ++-- remote_config/build.gradle | 2 +- remote_config/integration_test/build.gradle | 6 +++--- remote_config/remote_config_resources/build.gradle | 4 ++-- scripts/gha/ui_testing/uitest_android/app/build.gradle | 2 +- scripts/gha/ui_testing/uitest_android/build.gradle | 2 +- storage/build.gradle | 2 +- storage/integration_test/build.gradle | 6 +++--- storage/storage_resources/build.gradle | 4 ++-- testing/build.gradle | 2 +- 40 files changed, 78 insertions(+), 78 deletions(-) diff --git a/analytics/build.gradle b/analytics/build.gradle index 6fd9f09602..e3e12d8953 100644 --- a/analytics/build.gradle +++ b/analytics/build.gradle @@ -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 { diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle index ac8b5510e4..108183077c 100644 --- a/analytics/integration_test/build.gradle +++ b/analytics/integration_test/build.gradle @@ -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 { diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index 3392451643..bc6fc2bb5b 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -33,8 +33,8 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 diff --git a/app/build.gradle b/app/build.gradle index 2f966677a0..38dac86f0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 { diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index 8f130dfa66..7c3d4e9630 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -33,8 +33,8 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle index 663a633569..cdc0d6a768 100644 --- a/app/integration_test/build.gradle +++ b/app/integration_test/build.gradle @@ -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 { diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index 735a1532c4..c9469f4842 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -33,8 +33,8 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index 623fe79f7c..f9ac1ce0e1 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -33,8 +33,8 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 diff --git a/app_check/build.gradle b/app_check/build.gradle index 827f16e246..28fa1f47a5 100644 --- a/app_check/build.gradle +++ b/app_check/build.gradle @@ -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 { diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle index dde1c89208..430dc642c1 100644 --- a/app_check/integration_test/build.gradle +++ b/app_check/integration_test/build.gradle @@ -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 { diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index ec726dfda9..e915e10b3c 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -33,8 +33,8 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 diff --git a/auth/build.gradle b/auth/build.gradle index abf0bcec5c..b68195cf93 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -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 { diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle index e44cc9f71f..599573c98e 100644 --- a/auth/integration_test/build.gradle +++ b/auth/integration_test/build.gradle @@ -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 { diff --git a/database/build.gradle b/database/build.gradle index e8352d9449..0e3f42c23e 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -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 { diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle index 5d5faf4a15..c001385bb9 100644 --- a/database/integration_test/build.gradle +++ b/database/integration_test/build.gradle @@ -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 { diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle index c8c61b5692..4ee053cee5 100644 --- a/dynamic_links/build.gradle +++ b/dynamic_links/build.gradle @@ -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 { diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle index fc7f5ce3dd..d6d444e4c7 100644 --- a/dynamic_links/integration_test/build.gradle +++ b/dynamic_links/integration_test/build.gradle @@ -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 { diff --git a/firestore/build.gradle b/firestore/build.gradle index ebdd78157f..4c87fdb8cd 100644 --- a/firestore/build.gradle +++ b/firestore/build.gradle @@ -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 { diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index 578f4a2d24..4157e80e35 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -33,8 +33,8 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle index 885df6eff5..94889e7d3d 100644 --- a/firestore/integration_test/build.gradle +++ b/firestore/integration_test/build.gradle @@ -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 { diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index a5102596f1..84a63ff5bb 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -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 { diff --git a/functions/build.gradle b/functions/build.gradle index 4f880885ff..87d264c836 100644 --- a/functions/build.gradle +++ b/functions/build.gradle @@ -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 { diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle index e5183730e8..445cf2faf8 100644 --- a/functions/integration_test/build.gradle +++ b/functions/integration_test/build.gradle @@ -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 { diff --git a/gma/build.gradle b/gma/build.gradle index 1c7ee68c50..8a9619825b 100644 --- a/gma/build.gradle +++ b/gma/build.gradle @@ -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 { diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index 85eca36d91..66e2cc013c 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -33,8 +33,8 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle index 2b699b9c75..66a2f1dd1d 100644 --- a/gma/integration_test/build.gradle +++ b/gma/integration_test/build.gradle @@ -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 { diff --git a/installations/build.gradle b/installations/build.gradle index 4a2c378eca..16403213b3 100644 --- a/installations/build.gradle +++ b/installations/build.gradle @@ -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 { diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle index af35fdf3a3..eb40444432 100644 --- a/installations/integration_test/build.gradle +++ b/installations/integration_test/build.gradle @@ -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 { diff --git a/messaging/build.gradle b/messaging/build.gradle index 814e9f404f..cd4a4d8998 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -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 { diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle index 5da340d77a..d92528cc95 100644 --- a/messaging/integration_test/build.gradle +++ b/messaging/integration_test/build.gradle @@ -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 { diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle index 3a58715105..c7d925cc65 100644 --- a/messaging/messaging_java/build.gradle +++ b/messaging/messaging_java/build.gradle @@ -38,8 +38,8 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 diff --git a/remote_config/build.gradle b/remote_config/build.gradle index cfd7698012..9aeaf029fe 100644 --- a/remote_config/build.gradle +++ b/remote_config/build.gradle @@ -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 { diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle index b56399fbea..0f7ae53b63 100644 --- a/remote_config/integration_test/build.gradle +++ b/remote_config/integration_test/build.gradle @@ -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 { diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index 6983cfc8ed..f8c7b2f365 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -33,8 +33,8 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 diff --git a/scripts/gha/ui_testing/uitest_android/app/build.gradle b/scripts/gha/ui_testing/uitest_android/app/build.gradle index 8b765ec0fd..09cb0601ce 100644 --- a/scripts/gha/ui_testing/uitest_android/app/build.gradle +++ b/scripts/gha/ui_testing/uitest_android/app/build.gradle @@ -17,7 +17,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' defaultConfig { applicationId "com.google.firebase.uitest" diff --git a/scripts/gha/ui_testing/uitest_android/build.gradle b/scripts/gha/ui_testing/uitest_android/build.gradle index e919d1924c..2de22e71e1 100644 --- a/scripts/gha/ui_testing/uitest_android/build.gradle +++ b/scripts/gha/ui_testing/uitest_android/build.gradle @@ -33,7 +33,7 @@ allprojects { } ext { - buildToolsVersion = "28.0.3" + buildToolsVersion = "32.0.0" androidxLibVersion = "1.0.0" coreVersion = "1.3.0-alpha04" extJUnitVersion = "1.1.2-alpha04" diff --git a/storage/build.gradle b/storage/build.gradle index 0d00957d9e..66ea74e2c7 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -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 { diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle index 1e14b14953..c6077588e7 100644 --- a/storage/integration_test/build.gradle +++ b/storage/integration_test/build.gradle @@ -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 { diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 89501f8218..9794683a48 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -33,8 +33,8 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 diff --git a/testing/build.gradle b/testing/build.gradle index 6ad9ff41fd..767a38f1f5 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -36,7 +36,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 { From 691a3f84a480680fe35b9a913cb0b34eb54f9f56 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 19 Sep 2024 15:51:20 -0700 Subject: [PATCH 03/20] Update integration_tests.yml --- .github/workflows/integration_tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index fa9ae5c37f..37d17fa0c9 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -426,10 +426,10 @@ jobs: with: ref: ${{needs.check_and_prepare.outputs.github_ref}} submodules: true - - name: Force Java 8 (macOS) + - name: Force Java 11 (macOS) if: startsWith(matrix.os, 'macos') 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/setup-msbuild@v1.1 @@ -1058,11 +1058,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' From 25eced26822812086500cde9e974196837e4f29e Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 19 Sep 2024 16:10:27 -0700 Subject: [PATCH 04/20] Update integration_tests.yml --- .github/workflows/integration_tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 37d17fa0c9..b94a5d0c75 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -426,8 +426,7 @@ jobs: with: ref: ${{needs.check_and_prepare.outputs.github_ref}} submodules: true - - name: Force Java 11 (macOS) - if: startsWith(matrix.os, 'macos') + - name: Force Java 11 shell: bash run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV - name: Add msbuild to PATH (Windows) From 15a7a67d5df16b4d6dac77cecddfa14cbf11f158 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 19 Sep 2024 18:33:30 -0700 Subject: [PATCH 05/20] More fixes --- android_build_files/extract_and_dex.gradle | 8 ++++---- app/app_resources/build.gradle | 1 + app/google_api_resources/build.gradle | 1 + app/invites_resources/build.gradle | 1 + app/test_resources/build.gradle | 1 + app_check/app_check_resources/build.gradle | 1 + auth/auth_resources/build.gradle | 1 + auth/integration_test/build.gradle | 2 +- database/database_resources/build.gradle | 1 + firestore/firestore_resources/build.gradle | 1 + gma/gma_resources/build.gradle | 1 + messaging/messaging_java/build.gradle | 1 + remote_config/remote_config_resources/build.gradle | 1 + storage/storage_resources/build.gradle | 1 + 14 files changed, 17 insertions(+), 5 deletions(-) diff --git a/android_build_files/extract_and_dex.gradle b/android_build_files/extract_and_dex.gradle index 2173973339..dae2b59503 100644 --- a/android_build_files/extract_and_dex.gradle +++ b/android_build_files/extract_and_dex.gradle @@ -58,15 +58,15 @@ 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" + String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/d8" if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { dex_path = "${dex_path}.bat" } commandLine "${dex_path}", - '--dex', - "--output=$dexedJar", - "$buildDir/classes.jar" + "$buildDir/classes.jar", + "--output", + "$dexedJar" } // Once the dexed jar has been made, generate a proguard file for it. diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index bc6fc2bb5b..cf627e39b2 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -37,6 +37,7 @@ android { targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index 7c3d4e9630..459b3ce5e1 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -37,6 +37,7 @@ android { targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index c9469f4842..a2b5dd0162 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -37,6 +37,7 @@ android { targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle index 55ab9933e6..6925bf7331 100644 --- a/app/test_resources/build.gradle +++ b/app/test_resources/build.gradle @@ -33,6 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index f9ac1ce0e1..df1e21b37d 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -37,6 +37,7 @@ android { targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index e915e10b3c..33fdde1436 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -37,6 +37,7 @@ android { targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle index 599573c98e..2c9ed756da 100644 --- a/auth/integration_test/build.gradle +++ b/auth/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.auth.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle index 6662e2bdf4..cfab55d763 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -33,6 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index 4157e80e35..bf3ee97849 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -37,6 +37,7 @@ android { targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index 66e2cc013c..24e46c2c82 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -38,6 +38,7 @@ android { } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle index c7d925cc65..1ac0a67f4c 100644 --- a/messaging/messaging_java/build.gradle +++ b/messaging/messaging_java/build.gradle @@ -42,6 +42,7 @@ android { targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' defaultConfig { minSdkVersion 23 diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index f8c7b2f365..554a35f2fc 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -37,6 +37,7 @@ android { targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 9794683a48..54281132c4 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -37,6 +37,7 @@ android { targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { From bde361c38d33c23ea08a62dcc7b5f25ee6258df3 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Tue, 24 Sep 2024 13:29:04 -0700 Subject: [PATCH 06/20] Update google services dependency version --- analytics/integration_test/build.gradle | 2 +- app/app_resources/build.gradle | 2 +- app/google_api_resources/build.gradle | 2 +- app/integration_test/build.gradle | 2 +- app/invites_resources/build.gradle | 2 +- app/test_resources/build.gradle | 2 +- app_check/app_check_resources/build.gradle | 2 +- app_check/integration_test/build.gradle | 2 +- auth/auth_resources/build.gradle | 2 +- auth/integration_test/build.gradle | 4 ++-- database/database_resources/build.gradle | 2 +- database/integration_test/build.gradle | 2 +- dynamic_links/integration_test/build.gradle | 2 +- firestore/firestore_resources/build.gradle | 2 +- firestore/integration_test/build.gradle | 2 +- firestore/integration_test_internal/build.gradle | 2 +- functions/integration_test/build.gradle | 2 +- gma/gma_resources/build.gradle | 2 +- gma/integration_test/build.gradle | 2 +- installations/integration_test/build.gradle | 2 +- messaging/integration_test/build.gradle | 2 +- messaging/messaging_java/build.gradle | 2 +- remote_config/integration_test/build.gradle | 2 +- remote_config/remote_config_resources/build.gradle | 2 +- storage/integration_test/build.gradle | 2 +- storage/storage_resources/build.gradle | 2 +- testing/build.gradle | 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle index 108183077c..866f695db1 100644 --- a/analytics/integration_test/build.gradle +++ b/analytics/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index cf627e39b2..630315dabf 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index 459b3ce5e1..5c3252e98c 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle index cdc0d6a768..8367bf6181 100644 --- a/app/integration_test/build.gradle +++ b/app/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index a2b5dd0162..de1f5e3d68 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle index 6925bf7331..5588b40340 100644 --- a/app/test_resources/build.gradle +++ b/app/test_resources/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index df1e21b37d..f541ed2d97 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle index 430dc642c1..d1c371b4ca 100644 --- a/app_check/integration_test/build.gradle +++ b/app_check/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index 33fdde1436..b65dbb9c01 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle index 2c9ed756da..98e3dd17dc 100644 --- a/auth/integration_test/build.gradle +++ b/auth/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.auth.testapp' - minSdkVersion 24 + minSdkVersion 23 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle index cfab55d763..364bdeea28 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle index c001385bb9..36ec8d72aa 100644 --- a/database/integration_test/build.gradle +++ b/database/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle index d6d444e4c7..a544f1ab5d 100644 --- a/dynamic_links/integration_test/build.gradle +++ b/dynamic_links/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index bf3ee97849..96e0cb8714 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle index 94889e7d3d..c9214bd199 100644 --- a/firestore/integration_test/build.gradle +++ b/firestore/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index 84a63ff5bb..f6ce2fff16 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle index 445cf2faf8..4c6e172956 100644 --- a/functions/integration_test/build.gradle +++ b/functions/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index 24e46c2c82..d4544609f8 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle index 66a2f1dd1d..e0d09cad06 100644 --- a/gma/integration_test/build.gradle +++ b/gma/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle index eb40444432..035f105787 100644 --- a/installations/integration_test/build.gradle +++ b/installations/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle index d92528cc95..fd5b9c964b 100644 --- a/messaging/integration_test/build.gradle +++ b/messaging/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle index 1ac0a67f4c..c6277855f0 100644 --- a/messaging/messaging_java/build.gradle +++ b/messaging/messaging_java/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' // This uses Flatbuffers at 1.9 because the 1.10 version added a feature // that requires using a newer version of the JDK and at least Android N. // This has already been fixed at head, but a tagged release is not yet diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle index 0f7ae53b63..0d9938360f 100644 --- a/remote_config/integration_test/build.gradle +++ b/remote_config/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index 554a35f2fc..53cf0ec0be 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle index c6077588e7..a502e19d96 100644 --- a/storage/integration_test/build.gradle +++ b/storage/integration_test/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.4.1' } } diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 54281132c4..39de07de01 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { diff --git a/testing/build.gradle b/testing/build.gradle index 767a38f1f5..eddf7b4eae 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.4.1' classpath 'com.google.flatbuffers:flatbuffers-java:1.12.0' } } From aed9c1d52e326bb8e9d681807f9ba1c807cb296e Mon Sep 17 00:00:00 2001 From: a-maurice Date: Tue, 24 Sep 2024 13:29:18 -0700 Subject: [PATCH 07/20] Remove logic to set ANDROID_SDK_HOME --- scripts/gha/build_testapps.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/scripts/gha/build_testapps.py b/scripts/gha/build_testapps.py index a4f8fd8fd3..867202f71e 100644 --- a/scripts/gha/build_testapps.py +++ b/scripts/gha/build_testapps.py @@ -59,13 +59,11 @@ JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-8-latest/Contents/Home ANDROID_HOME=/Users/user_name/Library/Android/sdk - ANDROID_SDK_HOME=/Users/user_name/Library/Android/sdk ANDROID_NDK_HOME=/Users/user_name/Library/Android/sdk/ndk-bundle Or on Linux: JAVA_HOME=/usr/local/buildtools/java/jdk/ ANDROID_HOME=~/Android/Sdk - ANDROID_SDK_HOME=~/Android/Sdk ANDROID_NDK_HOME=~/Android/Sdk/ndk If using this tool frequently, you will likely find it convenient to @@ -97,7 +95,6 @@ # Environment variables _JAVA_HOME = "JAVA_HOME" _ANDROID_HOME = "ANDROID_HOME" -_ANDROID_SDK_HOME = "ANDROID_SDK_HOME" _NDK_ROOT = "NDK_ROOT" _ANDROID_NDK_HOME = "ANDROID_NDK_HOME" @@ -538,12 +535,8 @@ def _validate_android_environment_variables(): android_home = os.environ.get(_ANDROID_HOME) if not os.environ.get(_JAVA_HOME): logging.warning("%s not set", _JAVA_HOME) - if not os.environ.get(_ANDROID_SDK_HOME): - if android_home: # Use ANDROID_HOME as backup for ANDROID_SDK_HOME - os.environ[_ANDROID_SDK_HOME] = android_home - logging.info("%s not found, using %s", _ANDROID_SDK_HOME, _ANDROID_HOME) - else: - logging.warning("Missing: %s and %s", _ANDROID_SDK_HOME, _ANDROID_HOME) + if not android_home: + logging.warning("Missing ANDROID_HOME: %s", _ANDROID_HOME) # Different environments may have different NDK env vars specified. We look # for these, in this order, and set the others to the first found. # If none are set, we check the default location for the ndk. From a2aa6227bdf002f63b9b3bec12fc149c545b6835 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 14:20:19 -0700 Subject: [PATCH 08/20] Update minSdkVersion. --- analytics/build.gradle | 2 +- analytics/integration_test/build.gradle | 2 +- app/build.gradle | 2 +- app/integration_test/build.gradle | 2 +- app_check/build.gradle | 2 +- app_check/integration_test/build.gradle | 2 +- auth/build.gradle | 2 +- auth/integration_test/build.gradle | 2 +- database/build.gradle | 2 +- database/integration_test/build.gradle | 2 +- dynamic_links/build.gradle | 2 +- dynamic_links/integration_test/build.gradle | 2 +- firestore/build.gradle | 2 +- firestore/integration_test/build.gradle | 2 +- firestore/integration_test_internal/build.gradle | 2 +- functions/build.gradle | 2 +- functions/integration_test/build.gradle | 2 +- gma/build.gradle | 2 +- gma/integration_test/build.gradle | 2 +- installations/build.gradle | 2 +- installations/integration_test/build.gradle | 2 +- messaging/build.gradle | 2 +- messaging/integration_test/build.gradle | 2 +- messaging/messaging_java/build.gradle | 2 +- remote_config/build.gradle | 2 +- remote_config/integration_test/build.gradle | 2 +- scripts/gha/ui_testing/uitest_android/app/build.gradle | 2 +- storage/build.gradle | 2 +- storage/integration_test/build.gradle | 2 +- testing/build.gradle | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/analytics/build.gradle b/analytics/build.gradle index e3e12d8953..4eae16890f 100644 --- a/analytics/build.gradle +++ b/analytics/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle index 866f695db1..d4185f86fd 100644 --- a/analytics/integration_test/build.gradle +++ b/analytics/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.analytics.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/app/build.gradle b/app/build.gradle index 38dac86f0a..4ceb729572 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle index 8367bf6181..50bf9496d3 100644 --- a/app/integration_test/build.gradle +++ b/app/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.analytics.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/app_check/build.gradle b/app_check/build.gradle index 28fa1f47a5..2b8d1eb44e 100644 --- a/app_check/build.gradle +++ b/app_check/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle index d1c371b4ca..417732be4b 100644 --- a/app_check/integration_test/build.gradle +++ b/app_check/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.appcheck.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/auth/build.gradle b/auth/build.gradle index b68195cf93..8825c85463 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle index 98e3dd17dc..4f745af43b 100644 --- a/auth/integration_test/build.gradle +++ b/auth/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.auth.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/database/build.gradle b/database/build.gradle index 0e3f42c23e..881aa9ca3e 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle index 36ec8d72aa..4401b08894 100644 --- a/database/integration_test/build.gradle +++ b/database/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.database.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle index 4ee053cee5..6add551ed6 100644 --- a/dynamic_links/build.gradle +++ b/dynamic_links/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle index a544f1ab5d..e523684703 100644 --- a/dynamic_links/integration_test/build.gradle +++ b/dynamic_links/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.dynamiclinks.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/firestore/build.gradle b/firestore/build.gradle index 4c87fdb8cd..85c83d6c82 100644 --- a/firestore/build.gradle +++ b/firestore/build.gradle @@ -49,7 +49,7 @@ android { defaultConfig { // Jelly Bean is the minimum supported version needed by Firebase. - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle index c9214bd199..64f64b5b8b 100644 --- a/firestore/integration_test/build.gradle +++ b/firestore/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.firestore.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index f6ce2fff16..da56c2940b 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -63,7 +63,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.firestore.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/functions/build.gradle b/functions/build.gradle index 87d264c836..f0ba967d9f 100644 --- a/functions/build.gradle +++ b/functions/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle index 4c6e172956..a78ddfbb4c 100644 --- a/functions/integration_test/build.gradle +++ b/functions/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.functions.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/gma/build.gradle b/gma/build.gradle index 8a9619825b..50a0b56b2c 100644 --- a/gma/build.gradle +++ b/gma/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle index e0d09cad06..0e78ade8b9 100644 --- a/gma/integration_test/build.gradle +++ b/gma/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.admob.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/installations/build.gradle b/installations/build.gradle index 16403213b3..f9de82e6b9 100644 --- a/installations/build.gradle +++ b/installations/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle index 035f105787..daad7ca6e1 100644 --- a/installations/integration_test/build.gradle +++ b/installations/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.fis.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/messaging/build.gradle b/messaging/build.gradle index cd4a4d8998..f9a585abe6 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle index fd5b9c964b..7f274e868b 100644 --- a/messaging/integration_test/build.gradle +++ b/messaging/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.messaging.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle index c6277855f0..59d9d0a3aa 100644 --- a/messaging/messaging_java/build.gradle +++ b/messaging/messaging_java/build.gradle @@ -45,7 +45,7 @@ android { buildToolsVersion '32.0.0' defaultConfig { - minSdkVersion 23 + minSdkVersion 24 } sourceSets { diff --git a/remote_config/build.gradle b/remote_config/build.gradle index 9aeaf029fe..1809f8aaeb 100644 --- a/remote_config/build.gradle +++ b/remote_config/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle index 0d9938360f..66e0a3e1e9 100644 --- a/remote_config/integration_test/build.gradle +++ b/remote_config/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.remoteconfig.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/scripts/gha/ui_testing/uitest_android/app/build.gradle b/scripts/gha/ui_testing/uitest_android/app/build.gradle index 09cb0601ce..f9a4ee5282 100644 --- a/scripts/gha/ui_testing/uitest_android/app/build.gradle +++ b/scripts/gha/ui_testing/uitest_android/app/build.gradle @@ -21,7 +21,7 @@ android { defaultConfig { applicationId "com.google.firebase.uitest" - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/storage/build.gradle b/storage/build.gradle index 66ea74e2c7..ba1d700c3e 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle index a502e19d96..2e3e458316 100644 --- a/storage/integration_test/build.gradle +++ b/storage/integration_test/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.storage.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/testing/build.gradle b/testing/build.gradle index eddf7b4eae..06d5e0b58b 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -49,7 +49,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" From 0623cd046afab343005e6f1d820df765e988ab96 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 15:20:39 -0700 Subject: [PATCH 09/20] Try working around a build tools error on Windows. --- .github/workflows/integration_tests.yml | 4 ++++ android_build_files/extract_and_dex.gradle | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index b94a5d0c75..daf6b3a26d 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -449,6 +449,10 @@ jobs: timeout_minutes: 10 max_attempts: 3 command: scripts/gha/install_test_workflow_prereqs.sh -p Android + - name: Fix dexer command line on Windows + if: startsWith(matrix.os, 'windows') + shell: bash + run: sed -i~ 's/-Djava\.ext\.dirs="\%frameworkdir\%"//' "${ANDROID_HOME}/build-tools/*/d8.bat" - name: Fetch prebuilt packaged SDK from previous run uses: dawidd6/action-download-artifact@v2 if: ${{ github.event.inputs.test_packaged_sdk != '' }} diff --git a/android_build_files/extract_and_dex.gradle b/android_build_files/extract_and_dex.gradle index dae2b59503..aa5123f050 100644 --- a/android_build_files/extract_and_dex.gradle +++ b/android_build_files/extract_and_dex.gradle @@ -62,7 +62,7 @@ def defineExtractionTasks(String resourceName, String buildType) { if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { dex_path = "${dex_path}.bat" } - + commandLine "${dex_path}", "$buildDir/classes.jar", "--output", From feaa4cd0a5768d29c49037162815f39d0df03f7b Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 15:27:51 -0700 Subject: [PATCH 10/20] Call d8 directly via java instead of by broken shell script. --- .github/workflows/integration_tests.yml | 4 ---- android_build_files/extract_and_dex.gradle | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index daf6b3a26d..b94a5d0c75 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -449,10 +449,6 @@ jobs: timeout_minutes: 10 max_attempts: 3 command: scripts/gha/install_test_workflow_prereqs.sh -p Android - - name: Fix dexer command line on Windows - if: startsWith(matrix.os, 'windows') - shell: bash - run: sed -i~ 's/-Djava\.ext\.dirs="\%frameworkdir\%"//' "${ANDROID_HOME}/build-tools/*/d8.bat" - name: Fetch prebuilt packaged SDK from previous run uses: dawidd6/action-download-artifact@v2 if: ${{ github.event.inputs.test_packaged_sdk != '' }} diff --git a/android_build_files/extract_and_dex.gradle b/android_build_files/extract_and_dex.gradle index aa5123f050..65541a2177 100644 --- a/android_build_files/extract_and_dex.gradle +++ b/android_build_files/extract_and_dex.gradle @@ -58,12 +58,8 @@ 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}/d8" - if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { - dex_path = "${dex_path}.bat" - } - - commandLine "${dex_path}", + 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" From 3949acbb892f60a0845171b0e7c370b702d4df82 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 15:47:54 -0700 Subject: [PATCH 11/20] Add note about minSdkVersion. --- release_build_files/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 5a169fff5c..e684bd2534 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -633,6 +633,7 @@ code. ## Release Notes ### Upcoming Release - Changes + - General (Android): Updated minSdkVersion to 24. - Messaging: Changed SetListener to send the last token received before the listener was set. - Remote Config: Fixed ConfigInfo fields to default to 0 when From 4fafe1600eb603b168b8d25f585c68b6fe365529 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 17:21:27 -0700 Subject: [PATCH 12/20] Change Java version in CI build too. --- .github/workflows/android.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 2b4520e51d..f540ce20ab 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -54,10 +54,9 @@ jobs: - name: setup Xcode version (macos) if: runner.os == 'macOS' run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer - - 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: Store git credentials for all git commands # Forces all git commands to use authenticated https, to prevent throttling. shell: bash From e956c57acd553fb7514ed9cc24a588c37e384c81 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 25 Sep 2024 13:04:21 -0700 Subject: [PATCH 13/20] Change APP_BINARY_DIR to instead scan for the directory. --- CMakeLists.txt | 44 ++++++++++++++++++++++++++------------ analytics/CMakeLists.txt | 1 + analytics/build.gradle | 1 + functions/build.gradle | 2 ++ gma/build.gradle | 2 ++ installations/build.gradle | 2 ++ messaging/build.gradle | 2 ++ remote_config/build.gradle | 2 ++ storage/build.gradle | 4 ++++ 9 files changed, 46 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 194618cd77..ae91a8210d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,6 +180,7 @@ endif() # Set directories needed by the Firebase subprojects # Directory to store generated files. set(FIREBASE_GEN_FILE_DIR ${CMAKE_BINARY_DIR}/generated) + # Directory for any shared scripts. set(FIREBASE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_DIR}) @@ -227,20 +228,34 @@ set(FIRESTORE_INCLUDE_OBJC OFF CACHE BOOL "Disabled for the CPP SDK") set(RE2_BUILD_TESTING OFF CACHE BOOL "") if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD) - # Quote meta characters in ${CMAKE_CURRENT_LIST_DIR} so we can - # match it in a regex. - # For example, '/path/with/+meta/char.acters' will become - # '/path/with/\+meta/char\.acters'. - string(REGEX REPLACE - "([][+.*()^])" "\\\\\\1" # Yes, this many \'s is correct. - current_list_dir_regex - "${CMAKE_CURRENT_LIST_DIR}") - # Figure out where app's binary_dir was. - string(REGEX REPLACE - "${current_list_dir_regex}/[^/]+/(.*)" - "${CMAKE_CURRENT_LIST_DIR}/app/\\1" - APP_BINARY_DIR "${FIREBASE_BINARY_DIR}") - + # Gradle now adds a random hash to each separate NDK cmake build. + # Scan the previously built directories to find the one containing app's header. + set(header_to_scan_for "generated/app/src/include/firebase/version.h") + set(prev_build_path "${CMAKE_BINARY_DIR}/../../../../../app/.cxx/${CMAKE_BUILD_TYPE}/*/${CMAKE_ANDROID_ARCH_ABI}") + file(GLOB possible_prev_build_dirs "${prev_build_path}") + # In case there are multiple matches, take the one with the newest timestamp. + set(newest_timestamp 0) + foreach(possible_prev_build_dir IN LISTS possible_prev_build_dirs) + message("CONSIDERING ${possible_prev_build_dir}") + if(IS_DIRECTORY ${possible_prev_build_dir}) + if(EXISTS "${possible_prev_build_dir}/${header_to_scan_for}") + # Check if it's newer than any other files. + message("FOUND ${possible_prev_build_dir}/${header_to_scan_for}") + file(TIMESTAMP "${possible_prev_build_dir}/${header_to_scan_for}" timestamp "%s") + message("GOT TIMESTAMP: ${timestamp}") + if(${timestamp} GREATER ${newest_timestamp}) + message("USING ${possible_prev_build_dir}") + set(APP_BINARY_DIR ${possible_prev_build_dir}) + set(newest_timestamp ${timestamp}) + endif() + endif() + endif() + endforeach() + if (IS_DIRECTORY "${APP_BINARY_DIR}") + message("Found previous Firebase App build in ${APP_BINARY_DIR}") + else() + message(FATAL_ERROR "Could not find previous Firebase App build under ${prev_build_path}") + endif() set(FIRESTORE_SOURCE_DIR ${APP_BINARY_DIR}/external/src/firestore) else() # Run the CMake build logic that will download all the external dependencies. @@ -579,6 +594,7 @@ if(NOT FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD) else() # Add firebase_app as a target on the previously built app. add_library(firebase_app STATIC IMPORTED GLOBAL) + file(MAKE_DIRECTORY "${APP_BINARY_DIR}/generated") file(MAKE_DIRECTORY "${FIREBASE_BINARY_DIR}/generated") set(app_include_dirs diff --git a/analytics/CMakeLists.txt b/analytics/CMakeLists.txt index 6bc41fbc51..84166eb772 100644 --- a/analytics/CMakeLists.txt +++ b/analytics/CMakeLists.txt @@ -16,6 +16,7 @@ # Analytics generates header files for default events, parameters, and # properties based on the iOS SDK, that are used across all platforms. + set(analytics_generated_headers_dir "${FIREBASE_GEN_FILE_DIR}/analytics/src/include/firebase/analytics") set(event_names_header "${analytics_generated_headers_dir}/event_names.h") diff --git a/analytics/build.gradle b/analytics/build.gradle index 4eae16890f..f08ac090fb 100644 --- a/analytics/build.gradle +++ b/analytics/build.gradle @@ -85,4 +85,5 @@ apply from: "$rootDir/android_build_files/extract_and_dex.gradle" apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('analytics') + preBuild.dependsOn(':app:build') } diff --git a/functions/build.gradle b/functions/build.gradle index f0ba967d9f..640b2090eb 100644 --- a/functions/build.gradle +++ b/functions/build.gradle @@ -84,4 +84,6 @@ apply from: "$rootDir/android_build_files/android_abis.gradle" apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('functions') + preDebugBuild.dependsOn(':app:externalNativeBuildDebug') + preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') } diff --git a/gma/build.gradle b/gma/build.gradle index 50a0b56b2c..d65f60d6c3 100644 --- a/gma/build.gradle +++ b/gma/build.gradle @@ -86,4 +86,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('gma') setupDexDependencies(':gma:gma_resources') + preDebugBuild.dependsOn(':app:externalNativeBuildDebug') + preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') } diff --git a/installations/build.gradle b/installations/build.gradle index f9de82e6b9..6cdd123f5a 100644 --- a/installations/build.gradle +++ b/installations/build.gradle @@ -84,4 +84,6 @@ apply from: "$rootDir/android_build_files/android_abis.gradle" apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('installations') + preDebugBuild.dependsOn(':app:externalNativeBuildDebug') + preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') } diff --git a/messaging/build.gradle b/messaging/build.gradle index f9a585abe6..3fbb292ad6 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -86,4 +86,6 @@ apply from: "$rootDir/android_build_files/extract_and_dex.gradle" apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('messaging') + preDebugBuild.dependsOn(':app:externalNativeBuildDebug') + preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') } diff --git a/remote_config/build.gradle b/remote_config/build.gradle index 1809f8aaeb..2868d802e9 100644 --- a/remote_config/build.gradle +++ b/remote_config/build.gradle @@ -86,4 +86,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('remote_config') setupDexDependencies(':remote_config:remote_config_resources') + preDebugBuild.dependsOn(':app:externalNativeBuildDebug') + preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') } diff --git a/storage/build.gradle b/storage/build.gradle index ba1d700c3e..ce90e91cdf 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -86,4 +86,8 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('storage') setupDexDependencies(':storage:storage_resources') + preDebugBuild.dependsOn(':app:externalNativeBuildDebug') + preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') + preDebugBuild.dependsOn(':auth:externalNativeBuildDebug') + preReleaseBuild.dependsOn(':auth:externalNativeBuildRelease') } From b552d12b975d01a87289f950c51c4efdff918a2c Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 25 Sep 2024 13:07:34 -0700 Subject: [PATCH 14/20] Clean up prebuild dependencies from gradle files. --- app_check/build.gradle | 1 + auth/build.gradle | 1 + database/build.gradle | 2 ++ dynamic_links/build.gradle | 1 + firestore/build.gradle | 2 ++ functions/build.gradle | 4 ++-- gma/build.gradle | 3 +-- installations/build.gradle | 3 +-- messaging/build.gradle | 3 +-- remote_config/build.gradle | 3 +-- storage/build.gradle | 6 ++---- 11 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app_check/build.gradle b/app_check/build.gradle index 2b8d1eb44e..164c33f38f 100644 --- a/app_check/build.gradle +++ b/app_check/build.gradle @@ -86,4 +86,5 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('app_check') setupDexDependencies(':app_check:app_check_resources') + preBuild.dependsOn(':app:build') } diff --git a/auth/build.gradle b/auth/build.gradle index 8825c85463..83106d0567 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -86,4 +86,5 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('auth') setupDexDependencies(':auth:auth_resources') + preBuild.dependsOn(':app:build') } diff --git a/database/build.gradle b/database/build.gradle index 881aa9ca3e..f7281608cc 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -86,4 +86,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('database') setupDexDependencies(':database:database_resources') + preBuild.dependsOn(':app:build') + preBuild.dependsOn(':auth:build') } diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle index 6add551ed6..b675bf7575 100644 --- a/dynamic_links/build.gradle +++ b/dynamic_links/build.gradle @@ -84,4 +84,5 @@ apply from: "$rootDir/android_build_files/android_abis.gradle" apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('dynamic_links') + preBuild.dependsOn(':app:build') } diff --git a/firestore/build.gradle b/firestore/build.gradle index 85c83d6c82..582389d37a 100644 --- a/firestore/build.gradle +++ b/firestore/build.gradle @@ -87,4 +87,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('firestore') setupDexDependencies(':firestore:firestore_resources') + preBuild.dependsOn(':app:build') + preBuild.dependsOn(':auth:build') } diff --git a/functions/build.gradle b/functions/build.gradle index 640b2090eb..b2c12f845c 100644 --- a/functions/build.gradle +++ b/functions/build.gradle @@ -84,6 +84,6 @@ apply from: "$rootDir/android_build_files/android_abis.gradle" apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('functions') - preDebugBuild.dependsOn(':app:externalNativeBuildDebug') - preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') + preBuild.dependsOn(':app:build') + preBuild.dependsOn(':auth:build') } diff --git a/gma/build.gradle b/gma/build.gradle index d65f60d6c3..e793294f8c 100644 --- a/gma/build.gradle +++ b/gma/build.gradle @@ -86,6 +86,5 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('gma') setupDexDependencies(':gma:gma_resources') - preDebugBuild.dependsOn(':app:externalNativeBuildDebug') - preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') + preBuild.dependsOn(':app:build') } diff --git a/installations/build.gradle b/installations/build.gradle index 6cdd123f5a..e5eb114a92 100644 --- a/installations/build.gradle +++ b/installations/build.gradle @@ -84,6 +84,5 @@ apply from: "$rootDir/android_build_files/android_abis.gradle" apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('installations') - preDebugBuild.dependsOn(':app:externalNativeBuildDebug') - preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') + preBuild.dependsOn(':app:build') } diff --git a/messaging/build.gradle b/messaging/build.gradle index 3fbb292ad6..0b8f2f1e71 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -86,6 +86,5 @@ apply from: "$rootDir/android_build_files/extract_and_dex.gradle" apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('messaging') - preDebugBuild.dependsOn(':app:externalNativeBuildDebug') - preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') + preBuild.dependsOn(':app:build') } diff --git a/remote_config/build.gradle b/remote_config/build.gradle index 2868d802e9..79abec6dba 100644 --- a/remote_config/build.gradle +++ b/remote_config/build.gradle @@ -86,6 +86,5 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('remote_config') setupDexDependencies(':remote_config:remote_config_resources') - preDebugBuild.dependsOn(':app:externalNativeBuildDebug') - preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') + preBuild.dependsOn(':app:build') } diff --git a/storage/build.gradle b/storage/build.gradle index ce90e91cdf..6efb3b7169 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -86,8 +86,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('storage') setupDexDependencies(':storage:storage_resources') - preDebugBuild.dependsOn(':app:externalNativeBuildDebug') - preReleaseBuild.dependsOn(':app:externalNativeBuildRelease') - preDebugBuild.dependsOn(':auth:externalNativeBuildDebug') - preReleaseBuild.dependsOn(':auth:externalNativeBuildRelease') + preBuild.dependsOn(':app:build') + preBuild.dependsOn(':auth:build') } From 774bf4653f047a5f78b2e764d5cfe93dc94f70a8 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 25 Sep 2024 14:29:34 -0700 Subject: [PATCH 15/20] Add minSdkVersion and targetSdkVersion to resources gradle files. --- app/app_resources/build.gradle | 5 +++++ app/google_api_resources/build.gradle | 5 +++++ app/invites_resources/build.gradle | 5 +++++ app/test_resources/build.gradle | 5 +++++ app_check/app_check_resources/build.gradle | 5 +++++ auth/auth_resources/build.gradle | 5 +++++ database/database_resources/build.gradle | 5 +++++ firestore/firestore_resources/build.gradle | 5 +++++ gma/gma_resources/build.gradle | 5 +++++ remote_config/remote_config_resources/build.gradle | 5 +++++ storage/storage_resources/build.gradle | 4 ++++ 11 files changed, 54 insertions(+) diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index 630315dabf..9ecf700f29 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -39,6 +39,11 @@ android { compileSdkVersion 34 buildToolsVersion '32.0.0' + defaultConfig { + minSdkVersion 24 + targetSdkVersion 34 + } + sourceSets { main { manifest.srcFile '../../android_build_files/AndroidManifest.xml' diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index 5c3252e98c..31cff3c945 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -39,6 +39,11 @@ android { compileSdkVersion 34 buildToolsVersion '32.0.0' + defaultConfig { + minSdkVersion 24 + targetSdkVersion 34 + } + sourceSets { main { manifest.srcFile '../../android_build_files/AndroidManifest.xml' diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index de1f5e3d68..bf078fb04e 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -39,6 +39,11 @@ android { compileSdkVersion 34 buildToolsVersion '32.0.0' + defaultConfig { + minSdkVersion 24 + targetSdkVersion 34 + } + sourceSets { main { manifest.srcFile '../../android_build_files/AndroidManifest.xml' diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle index 5588b40340..9d3f52d552 100644 --- a/app/test_resources/build.gradle +++ b/app/test_resources/build.gradle @@ -35,6 +35,11 @@ android { compileSdkVersion 34 buildToolsVersion '32.0.0' + defaultConfig { + minSdkVersion 24 + targetSdkVersion 34 + } + sourceSets { main { manifest.srcFile '../../android_build_files/AndroidManifest.xml' diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index f541ed2d97..ad19bb318f 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -39,6 +39,11 @@ android { compileSdkVersion 34 buildToolsVersion '32.0.0' + defaultConfig { + minSdkVersion 24 + targetSdkVersion 34 + } + sourceSets { main { manifest.srcFile '../../android_build_files/AndroidManifest.xml' diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index b65dbb9c01..45f99720dd 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -39,6 +39,11 @@ android { compileSdkVersion 34 buildToolsVersion '32.0.0' + defaultConfig { + minSdkVersion 24 + targetSdkVersion 34 + } + sourceSets { main { manifest.srcFile '../../android_build_files/AndroidManifest.xml' diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle index 364bdeea28..7a91b37b52 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -35,6 +35,11 @@ android { compileSdkVersion 34 buildToolsVersion '32.0.0' + defaultConfig { + minSdkVersion 24 + targetSdkVersion 34 + } + sourceSets { main { manifest.srcFile '../../android_build_files/AndroidManifest.xml' diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index 96e0cb8714..fd10863991 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -39,6 +39,11 @@ android { compileSdkVersion 34 buildToolsVersion '32.0.0' + defaultConfig { + minSdkVersion 24 + targetSdkVersion 34 + } + sourceSets { main { manifest.srcFile 'AndroidManifest.xml' diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index d4544609f8..f20f9f1bad 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -40,6 +40,11 @@ android { compileSdkVersion 34 buildToolsVersion '32.0.0' + defaultConfig { + minSdkVersion 24 + targetSdkVersion 34 + } + sourceSets { main { manifest.srcFile 'AndroidManifest.xml' diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index 53cf0ec0be..be52478351 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -39,6 +39,11 @@ android { compileSdkVersion 34 buildToolsVersion '32.0.0' + defaultConfig { + minSdkVersion 24 + targetSdkVersion 34 + } + sourceSets { main { manifest.srcFile '../../android_build_files/AndroidManifest.xml' diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 39de07de01..1f83f5613c 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -39,6 +39,10 @@ android { compileSdkVersion 34 buildToolsVersion '32.0.0' + defaultConfig { + minSdkVersion 24 + targetSdkVersion 34 + } sourceSets { main { manifest.srcFile '../../android_build_files/AndroidManifest.xml' From b5c8d8b1b4c5535ef2e84aed26b00863fb10e5a1 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 25 Sep 2024 14:30:40 -0700 Subject: [PATCH 16/20] Add targetSdkVersion to messaging. --- messaging/messaging_java/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle index 59d9d0a3aa..ea8bfacd1d 100644 --- a/messaging/messaging_java/build.gradle +++ b/messaging/messaging_java/build.gradle @@ -45,6 +45,7 @@ android { buildToolsVersion '32.0.0' defaultConfig { + targetSdkVersion 34 minSdkVersion 24 } From aca573fa70796443da5d5f40070c81484e5cd42f Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 25 Sep 2024 14:32:23 -0700 Subject: [PATCH 17/20] Force Java 11 on packaging. --- .github/workflows/cpp-packaging.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index a19864449e..32e9617a46 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -248,6 +248,9 @@ jobs: strategy: fail-fast: false steps: + - name: Force Java 11 + shell: bash + run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV - name: fetch SDK uses: actions/checkout@v3 with: From 1b4725a4a84b475462fcffceb345b45fed292ab1 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 25 Sep 2024 14:45:19 -0700 Subject: [PATCH 18/20] Use the full path to the message forwarding service. --- messaging/src/android/java/LibraryManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/messaging/src/android/java/LibraryManifest.xml b/messaging/src/android/java/LibraryManifest.xml index aad8452455..844b044ae2 100644 --- a/messaging/src/android/java/LibraryManifest.xml +++ b/messaging/src/android/java/LibraryManifest.xml @@ -4,7 +4,7 @@ From 602099a40bd3a92a760036ea0c1bfa381b28f310 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 25 Sep 2024 15:12:55 -0700 Subject: [PATCH 19/20] Remove extraneous logging. --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae91a8210d..439ea7d5c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,15 +236,11 @@ if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD) # In case there are multiple matches, take the one with the newest timestamp. set(newest_timestamp 0) foreach(possible_prev_build_dir IN LISTS possible_prev_build_dirs) - message("CONSIDERING ${possible_prev_build_dir}") if(IS_DIRECTORY ${possible_prev_build_dir}) if(EXISTS "${possible_prev_build_dir}/${header_to_scan_for}") # Check if it's newer than any other files. - message("FOUND ${possible_prev_build_dir}/${header_to_scan_for}") file(TIMESTAMP "${possible_prev_build_dir}/${header_to_scan_for}" timestamp "%s") - message("GOT TIMESTAMP: ${timestamp}") if(${timestamp} GREATER ${newest_timestamp}) - message("USING ${possible_prev_build_dir}") set(APP_BINARY_DIR ${possible_prev_build_dir}) set(newest_timestamp ${timestamp}) endif() @@ -252,7 +248,7 @@ if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD) endif() endforeach() if (IS_DIRECTORY "${APP_BINARY_DIR}") - message("Found previous Firebase App build in ${APP_BINARY_DIR}") + message(STATUS "Found previous Firebase App build in ${APP_BINARY_DIR}") else() message(FATAL_ERROR "Could not find previous Firebase App build under ${prev_build_path}") endif() From ccc28d13009a6d025a5278e4dbecc2ef2126d1b1 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 25 Sep 2024 16:08:31 -0700 Subject: [PATCH 20/20] Fix Android packaging script to use new paths. --- android_build_files/generate_proguard.gradle | 2 +- build_scripts/android/package.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/android_build_files/generate_proguard.gradle b/android_build_files/generate_proguard.gradle index 6bb8e47391..2f78ee7109 100644 --- a/android_build_files/generate_proguard.gradle +++ b/android_build_files/generate_proguard.gradle @@ -72,7 +72,7 @@ def defineGenerateProguardFile(String subproject, String buildType, String nativeBuildDir = project.android.externalNativeBuild.cmake.buildStagingDirectory if (nativeBuildDir == null || nativeBuildDir.isEmpty()) { - nativeBuildDir = file('.cxx/cmake').absolutePath + nativeBuildDir = file('.cxx').absolutePath } // Find the static library that was built. Note that there are multiple diff --git a/build_scripts/android/package.sh b/build_scripts/android/package.sh index 30d98a52dd..8c0e6ff99b 100755 --- a/build_scripts/android/package.sh +++ b/build_scripts/android/package.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash -ex # Copyright 2020 Google LLC @@ -34,10 +34,12 @@ mkdir -p "${destpath}/libs/android" cd "${sourcepath}" # Make sure we only copy the libraries in product_list (specified in packaging.conf) for product in ${product_list[*]}; do - if [[ ! -d "${product}/build/intermediates/cmake/release/obj" ]]; then + if [[ ! -d "${product}/build/intermediates/cxx" ]]; then continue fi - dir="${product}/build/intermediates/cmake/release/obj" + # Get the most recent matching intermediate files directory. + dir=$(ls -td "${product}"/build/intermediates/cxx/Rel*/*/obj | head -1) + echo "${dir}" for cpudir in "${dir}"/*; do cpu=$(basename ${cpudir}) libsrc="${sourcepath}/${cpudir}/libfirebase_${product}.a" @@ -49,7 +51,7 @@ for product in ${product_list[*]}; do cp -f "${sourcepath}/${product}/build/Release/${product}.pro" "${destpath}/libs/android/" # Copy the special messaging aar file, but only if messaging was built. if [[ "${product}" == "messaging" ]]; then - cp -f "${sourcepath}/messaging/messaging_java/build/outputs/aar/messaging_java"*.aar "${destpath}/libs/android/firebase_messaging_cpp.aar" + cp -f "${sourcepath}/messaging/messaging_java/build/outputs/aar/messaging_java-release"*.aar "${destpath}/libs/android/firebase_messaging_cpp.aar" fi done cd "${origpath}"