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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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 7a4a555981f4ffee0f0298e242d80111baaed1de Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 13:52:20 -0700 Subject: [PATCH 12/13] 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 7af8bfc8a11212725d74ada9d4fcae2b24cdf52e Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 24 Sep 2024 16:15:59 -0700 Subject: [PATCH 13/13] Update version numbers. --- cpp_sdk_version.json | 6 +++--- release_build_files/readme.md | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cpp_sdk_version.json b/cpp_sdk_version.json index b9b67f2eab..66cf14ce50 100644 --- a/cpp_sdk_version.json +++ b/cpp_sdk_version.json @@ -1,5 +1,5 @@ { - "released": "12.2.0", - "stable": "12.2.0", - "head": "12.2.0" + "released": "12.3.0", + "stable": "12.3.0", + "head": "12.3.0" } diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 16aebf6e2c..2776f80499 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -631,8 +631,10 @@ workflow use only during the development of your app, not for publicly shipping code. ## Release Notes -### Upcoming Release +### 12.3.0 - Changes + - General (Android): Update to Firebase Android BoM version 33.2.0. + - General (iOS): Update to Firebase Cocoapods version 11.2.0. - Messaging: Changed SetListener to send the last token received before the listener was set. - Remote Config: Fixed ConfigInfo fields to default to 0 when