From a1acb7a420fa9afe1e7e230b705137d499504cfd Mon Sep 17 00:00:00 2001 From: firebase-workflow-trigger-bot Date: Tue, 10 Sep 2024 13:33:54 +0000 Subject: [PATCH 01/24] Update Android dependencies - Tue Sep 10 2024 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Triggered](https://github.com/firebase/firebase-android-sdk/actions/runs/10793542773) by [firebase-android-sdk Sep 10 release](https://github.com/firebase/firebase-android-sdk/commit/914f493eef4bb50421eda959f3b3e5c41dbc4791). ### Android - com.google.firebase.firebase_bom → 33.2.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/10793555606). --- Android/firebase_dependencies.gradle | 2 +- app/app_resources/build.gradle | 2 +- app/google_api_resources/build.gradle | 2 +- app/invites_resources/build.gradle | 2 +- app_check/app_check_resources/build.gradle | 2 +- auth/auth_resources/build.gradle | 2 +- database/database_resources/build.gradle | 2 +- firestore/firestore_resources/build.gradle | 2 +- gma/gma_resources/build.gradle | 2 +- messaging/messaging_java/build.gradle | 2 +- release_build_files/Android/firebase_dependencies.gradle | 2 +- release_build_files/readme.md | 2 +- remote_config/remote_config_resources/build.gradle | 2 +- storage/storage_resources/build.gradle | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index 81ea08c322..be97003a80 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -159,7 +159,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') } for (String lib : firebaseCpp.dependencies.libSet) { // Generate and include the proguard file diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index 8351e562db..701bc76a4b 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -50,7 +50,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' } diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index 7ee92162e2..2537f38004 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -53,7 +53,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.android.gms:play-services-base:18.5.0' implementation project(':app:app_resources') diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index 1adbca0ae7..3d9838712c 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-dynamic-links' implementation project(':app:app_resources') diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index 6cc09ba1df..09eaf842e4 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-appcheck' } diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index 00564f2957..3ccf6b4f19 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-auth' implementation project(':app:app_resources') diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle index 4cfb882e01..78639aaad0 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -45,7 +45,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-database' //implementation project(':app:app_resources') diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index 93439900aa..5e0d7bbe27 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -53,7 +53,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-firestore' } diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index bd1a8144c3..8e078b5ddf 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -50,7 +50,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.android.gms:play-services-ads:23.0.0' implementation 'com.google.android.ump:user-messaging-platform:2.2.0' diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle index a268401ee7..f7b8f1cac4 100644 --- a/messaging/messaging_java/build.gradle +++ b/messaging/messaging_java/build.gradle @@ -59,7 +59,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-messaging' implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0' diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle index b80aed1531..be73d6578e 100644 --- a/release_build_files/Android/firebase_dependencies.gradle +++ b/release_build_files/Android/firebase_dependencies.gradle @@ -132,7 +132,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') } for (String lib : firebaseCpp.dependencies.libSet) { // Messaging includes an aar, which to be depended on properly requires diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 298a4a6fdf..53be40e923 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -86,7 +86,7 @@ distributed as part of the core Firebase Feature | Required Libraries and Gradle Packages -------------------------- | -------------------------------------- -All Firebase SDKs | platform(com.google.firebase:firebase-bom:33.1.2) +All Firebase SDKs | platform(com.google.firebase:firebase-bom:33.2.0) | | (Android Bill of Materials) Firebase Analytics | libfirebase_analytics.a | | libfirebase_app.a diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index 9a766490da..1fc8a0c86f 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-config' } diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 12282470b4..b4cd0749b8 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-storage' } From ccaab81ef745b817babe8984ff5888d8a32cbe56 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 12 Sep 2024 14:59:15 -0700 Subject: [PATCH 02/24] Add pickFirst for kotlin file that breaks build. --- app_check/integration_test/build.gradle | 1 + auth/integration_test/build.gradle | 1 + database/integration_test/build.gradle | 1 + firestore/integration_test/build.gradle | 1 + firestore/integration_test_internal/build.gradle | 1 + functions/integration_test/build.gradle | 1 + storage/integration_test/build.gradle | 1 + 7 files changed, 7 insertions(+) diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle index 4877125e27..75da510b85 100644 --- a/app_check/integration_test/build.gradle +++ b/app_check/integration_test/build.gradle @@ -85,6 +85,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' } } diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle index 942a05b0d6..4ab76f7b3a 100644 --- a/auth/integration_test/build.gradle +++ b/auth/integration_test/build.gradle @@ -76,6 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' } } diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle index 86907f840f..8ed0a96362 100644 --- a/database/integration_test/build.gradle +++ b/database/integration_test/build.gradle @@ -76,6 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' } } diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle index 37efea8216..44c5a3654a 100644 --- a/firestore/integration_test/build.gradle +++ b/firestore/integration_test/build.gradle @@ -76,6 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' } } diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index f1bb9b4f3b..73261e4b1d 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -91,6 +91,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' } lintOptions { abortOnError false diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle index d773468cb1..483182c26c 100644 --- a/functions/integration_test/build.gradle +++ b/functions/integration_test/build.gradle @@ -76,6 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' } } diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle index 2aa85d28e2..c8ba7f8d84 100644 --- a/storage/integration_test/build.gradle +++ b/storage/integration_test/build.gradle @@ -76,6 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' } } From b9931afa3b0c070d288dd6c0c182b895f6963870 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 12 Sep 2024 16:48:28 -0700 Subject: [PATCH 03/24] Add a wildcard since it's more than one file. --- app_check/integration_test/build.gradle | 2 +- auth/integration_test/build.gradle | 2 +- database/integration_test/build.gradle | 2 +- firestore/integration_test/build.gradle | 2 +- firestore/integration_test_internal/build.gradle | 2 +- functions/integration_test/build.gradle | 2 +- storage/integration_test/build.gradle | 3 +-- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle index 75da510b85..529b3b2bda 100644 --- a/app_check/integration_test/build.gradle +++ b/app_check/integration_test/build.gradle @@ -85,7 +85,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' - pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } } diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle index 4ab76f7b3a..333511408a 100644 --- a/auth/integration_test/build.gradle +++ b/auth/integration_test/build.gradle @@ -76,7 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' - pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } } diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle index 8ed0a96362..6f52dba956 100644 --- a/database/integration_test/build.gradle +++ b/database/integration_test/build.gradle @@ -76,7 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' - pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } } diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle index 44c5a3654a..a8831c7904 100644 --- a/firestore/integration_test/build.gradle +++ b/firestore/integration_test/build.gradle @@ -76,7 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' - pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } } diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index 73261e4b1d..e2297fb026 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -91,7 +91,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' - pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } lintOptions { abortOnError false diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle index 483182c26c..1706e43cc0 100644 --- a/functions/integration_test/build.gradle +++ b/functions/integration_test/build.gradle @@ -76,7 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' - pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } } diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle index c8ba7f8d84..a688862f6a 100644 --- a/storage/integration_test/build.gradle +++ b/storage/integration_test/build.gradle @@ -76,8 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' - pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module' - } + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle" From f9ed78faecae765837fbefdb03c0bc2c7114232a Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 16 Sep 2024 11:20:46 -0700 Subject: [PATCH 04/24] Fix gradle error. --- storage/integration_test/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle index a688862f6a..45fecf667a 100644 --- a/storage/integration_test/build.gradle +++ b/storage/integration_test/build.gradle @@ -77,6 +77,7 @@ android { packagingOptions { pickFirst 'META-INF/**/coroutines.pro' pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' + } } apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle" From 232e0dcb84e78998698b2931b583ebab8fc6e742 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 16 Sep 2024 15:07:46 -0700 Subject: [PATCH 05/24] Force a newer guava dependency as an experiment. --- Android/firebase_dependencies.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index be97003a80..988c488c0c 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -25,7 +25,8 @@ def firebaseDependenciesMap = [ 'auth' : ['com.google.firebase:firebase-auth'], 'database' : ['com.google.firebase:firebase-database'], 'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'], - 'firestore' : ['com.google.firebase:firebase-firestore'], + 'firestore' : ['com.google.firebase:firebase-firestore', + 'com.google.guava:guava:32.1.3-android'], 'functions' : ['com.google.firebase:firebase-functions'], 'gma' : ['com.google.android.gms:play-services-ads:23.0.0', 'com.google.android.ump:user-messaging-platform:2.2.0'], From f8ab87ee3b96ec8a20f0c20de958ca1d3677b0a5 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 17 Sep 2024 11:28:46 -0700 Subject: [PATCH 06/24] Remove conflicting deps. --- Android/firebase_dependencies.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index 988c488c0c..be97003a80 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -25,8 +25,7 @@ def firebaseDependenciesMap = [ 'auth' : ['com.google.firebase:firebase-auth'], 'database' : ['com.google.firebase:firebase-database'], 'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'], - 'firestore' : ['com.google.firebase:firebase-firestore', - 'com.google.guava:guava:32.1.3-android'], + 'firestore' : ['com.google.firebase:firebase-firestore'], 'functions' : ['com.google.firebase:firebase-functions'], 'gma' : ['com.google.android.gms:play-services-ads:23.0.0', 'com.google.android.ump:user-messaging-platform:2.2.0'], From 9b42f923ac1bad20360fe08b66e1379b91105e40 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 17 Sep 2024 11:42:19 -0700 Subject: [PATCH 07/24] Try constraining version. --- firestore/integration_test_internal/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index e2297fb026..10fac57f9c 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -104,6 +104,12 @@ firebaseCpp.dependencies { firestore } +dependencies { + implementation ('com.google.firebase:firebase-firestore') { + constraint(group = 'com.google.guava', module = 'guava', version = '32.1.3-android') + } +} + apply plugin: 'com.google.gms.google-services' task copyIntegrationTestFiles(type:Exec) { From abf00461f46dbdf46cac0f106f0061f99d74aef4 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 17 Sep 2024 13:04:39 -0700 Subject: [PATCH 08/24] Try adding a different guava dep to the integration test. --- firestore/integration_test_internal/build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index 10fac57f9c..b9c94e1bc4 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -105,9 +105,7 @@ firebaseCpp.dependencies { } dependencies { - implementation ('com.google.firebase:firebase-firestore') { - constraint(group = 'com.google.guava', module = 'guava', version = '32.1.3-android') - } + implementation 'com.google.guava:guava:32.0.1-android' } apply plugin: 'com.google.gms.google-services' From d66d1edba9a7a9a147d9874933a5dcd532f7fdcc Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 17 Sep 2024 14:23:23 -0700 Subject: [PATCH 09/24] Force guava version. --- firestore/integration_test_internal/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index b9c94e1bc4..80513f385a 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -105,7 +105,9 @@ firebaseCpp.dependencies { } dependencies { - implementation 'com.google.guava:guava:32.0.1-android' + implementation 'com.google.guava:guava:32.0.1-android' { + force = true + } } apply plugin: 'com.google.gms.google-services' From eb6a24b8725d3f4553a6ddca061e408c1f4cd30f Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 17 Sep 2024 15:27:23 -0700 Subject: [PATCH 10/24] Reorder dependencies. --- firestore/integration_test_internal/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index 80513f385a..260bba8919 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -98,18 +98,18 @@ android { } } -apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle" -firebaseCpp.dependencies { - auth - firestore -} - dependencies { implementation 'com.google.guava:guava:32.0.1-android' { force = true } } +apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle" +firebaseCpp.dependencies { + auth + firestore +} + apply plugin: 'com.google.gms.google-services' task copyIntegrationTestFiles(type:Exec) { From b1c6522cc93525b973f954c1773d5e4ce24e9acd Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 18 Sep 2024 10:33:01 -0700 Subject: [PATCH 11/24] set the org.gradle.jvm.environment attribute --- firestore/integration_test_internal/build.gradle | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index 260bba8919..f0deaf8d6e 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -51,6 +51,14 @@ android { java.srcDirs = ['src/android/java'] res.srcDirs = ['res'] } + all { + configurations.getByName(runtimeClasspathConfigurationName) { + attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm") + } + configurations.getByName(compileClasspathConfigurationName) { + attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm") + } + } } Properties localProperties = new Properties() @@ -98,12 +106,6 @@ android { } } -dependencies { - implementation 'com.google.guava:guava:32.0.1-android' { - force = true - } -} - apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle" firebaseCpp.dependencies { auth From 976302e7ef64a7864ba91f6d1a61e371e84e7bd9 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 19 Sep 2024 14:52:28 -0700 Subject: [PATCH 12/24] 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 13/24] 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 14/24] 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 15/24] 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 16/24] 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 c6ae4c520b347e15f9402eaeeeaf57af94fa9661 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 12:28:55 -0700 Subject: [PATCH 17/24] Update google services plugin 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 | 2 +- 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, 27 insertions(+), 27 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..4f745af43b 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' } } 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 bde361c38d33c23ea08a62dcc7b5f25ee6258df3 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Tue, 24 Sep 2024 13:29:04 -0700 Subject: [PATCH 18/24] 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 19/24] 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 7a4a555981f4ffee0f0298e242d80111baaed1de Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 13:52:20 -0700 Subject: [PATCH 20/24] Remove guava hard dependency. --- firestore/integration_test_internal/build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index f0deaf8d6e..e2297fb026 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -51,14 +51,6 @@ android { java.srcDirs = ['src/android/java'] res.srcDirs = ['res'] } - all { - configurations.getByName(runtimeClasspathConfigurationName) { - attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm") - } - configurations.getByName(compileClasspathConfigurationName) { - attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm") - } - } } Properties localProperties = new Properties() From a1f609eb8c9a534b09fa3658925f786893322440 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 14:20:19 -0700 Subject: [PATCH 21/24] 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 | 6 +----- 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(+), 34 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 1662f0d85f..ef0edf02a9 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 57af9037c4..56b5b22b9b 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 133a83f737..ac7a7cc5f9 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 41a43d41fc..38e90b51b3 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 789c59c890..046f95d0a2 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' @@ -89,10 +89,6 @@ android { proguardFile file('proguard.pro') } } - packagingOptions { - pickFirst 'META-INF/**/coroutines.pro' - pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' - } lintOptions { abortOnError false } 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 d93f17c7af..1e6387d99c 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 e2f18fa41f..697b447c1f 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 0474304725..1b2d545f5d 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 3b0942efd2ba7928b2c83376e3ba9aca731f0698 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 14:45:02 -0700 Subject: [PATCH 22/24] Add debug output to extract --- android_build_files/extract_and_dex.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android_build_files/extract_and_dex.gradle b/android_build_files/extract_and_dex.gradle index dae2b59503..890c6fb1df 100644 --- a/android_build_files/extract_and_dex.gradle +++ b/android_build_files/extract_and_dex.gradle @@ -61,6 +61,11 @@ def defineExtractionTasks(String resourceName, String buildType) { String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/d8" if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { dex_path = "${dex_path}.bat" + + commandLine "cmd", "/c", "echo", "${dex_path}", + "$buildDir/classes.jar", + "--output", + "$dexedJar" } commandLine "${dex_path}", From 082887dd4f8ce09be8e45fba51ae841f5d930dd2 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 15:20:39 -0700 Subject: [PATCH 23/24] Try working around a build tools error on Windows. --- .github/workflows/integration_tests.yml | 4 ++++ android_build_files/extract_and_dex.gradle | 7 +------ 2 files changed, 5 insertions(+), 6 deletions(-) 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 890c6fb1df..aa5123f050 100644 --- a/android_build_files/extract_and_dex.gradle +++ b/android_build_files/extract_and_dex.gradle @@ -61,13 +61,8 @@ def defineExtractionTasks(String resourceName, String buildType) { String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/d8" if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { dex_path = "${dex_path}.bat" - - commandLine "cmd", "/c", "echo", "${dex_path}", - "$buildDir/classes.jar", - "--output", - "$dexedJar" } - + commandLine "${dex_path}", "$buildDir/classes.jar", "--output", From 0fd81598fa15f2f28e23822f0b041d6ac8f785f4 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 15:27:51 -0700 Subject: [PATCH 24/24] 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"