From fe9cef76a208b04e2d9e6712f9f9800ce1fb5e09 Mon Sep 17 00:00:00 2001 From: firebase-workflow-trigger-bot Date: Wed, 21 May 2025 21:17:58 +0000 Subject: [PATCH 1/6] Update Android dependencies - Wed May 21 2025 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Android - com.google.android.gms.play_services_base → 18.7.0 - com.google.firebase.firebase_bom → 33.14.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/15172710305). --- Android/firebase_dependencies.gradle | 4 ++-- app/app_resources/build.gradle | 2 +- app/google_api_resources/build.gradle | 4 ++-- 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 | 4 ++-- release_build_files/readme.md | 6 +++--- remote_config/remote_config_resources/build.gradle | 2 +- storage/storage_resources/build.gradle | 2 +- ump/ump_resources/build.gradle | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index 1cc13c4ed3..9f7d4ba4bf 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -20,7 +20,7 @@ def firebaseDependenciesMap = [ 'app_check' : ['com.google.firebase:firebase-appcheck', 'com.google.firebase:firebase-appcheck-debug', 'com.google.firebase:firebase-appcheck-playintegrity'], - 'play_services' : ['com.google.android.gms:play-services-base:18.6.0'], + 'play_services' : ['com.google.android.gms:play-services-base:18.7.0'], 'analytics' : ['com.google.firebase:firebase-analytics'], 'auth' : ['com.google.firebase:firebase-auth'], 'database' : ['com.google.firebase:firebase-database'], @@ -164,7 +164,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.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 a33339ba8c..8fa60577ee 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -56,7 +56,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.0') implementation 'com.google.firebase:firebase-analytics' } diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index fb69648443..38bcf83797 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -59,9 +59,9 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.0') implementation 'com.google.firebase:firebase-analytics' - implementation 'com.google.android.gms:play-services-base:18.6.0' + implementation 'com.google.android.gms:play-services-base:18.7.0' implementation project(':app:app_resources') } diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index 4d8db6b442..ea03132f6a 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -55,7 +55,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.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 94849cdae1..31253a4078 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -55,7 +55,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.0') implementation 'com.google.firebase:firebase-appcheck' } diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index b11f02e86a..e667565bbb 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -55,7 +55,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.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 cfa2d3408f..035b5062dd 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -51,7 +51,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.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 f03cb4298f..c5f1f665ab 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -59,7 +59,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.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 62140c669a..520bf8eb6e 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -56,7 +56,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.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 03e5bb2e2f..46ad6bdde4 100644 --- a/messaging/messaging_java/build.gradle +++ b/messaging/messaging_java/build.gradle @@ -61,7 +61,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.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 6a6ab2740b..7b3e40b386 100644 --- a/release_build_files/Android/firebase_dependencies.gradle +++ b/release_build_files/Android/firebase_dependencies.gradle @@ -20,7 +20,7 @@ def firebaseDependenciesMap = [ 'app_check' : ['com.google.firebase:firebase-appcheck', 'com.google.firebase:firebase-appcheck-debug', 'com.google.firebase:firebase-appcheck-playintegrity'], - 'play_services' : ['com.google.android.gms:play-services-base:18.6.0'], + 'play_services' : ['com.google.android.gms:play-services-base:18.7.0'], 'analytics' : ['com.google.firebase:firebase-analytics'], 'auth' : ['com.google.firebase:firebase-auth'], 'database' : ['com.google.firebase:firebase-database'], @@ -136,7 +136,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.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 4a07c05d59..a7c0f44418 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -87,7 +87,7 @@ distributed as part of the core Firebase Feature | Required Libraries and Gradle Packages -------------------------- | -------------------------------------- -All Firebase SDKs | platform(com.google.firebase:firebase-bom:33.11.0) +All Firebase SDKs | platform(com.google.firebase:firebase-bom:33.14.0) | | (Android Bill of Materials) Firebase Analytics | libfirebase_analytics.a | | libfirebase_app.a @@ -150,7 +150,7 @@ Firebase Messaging | libfirebase_messaging.a | | com.google.firebase:firebase-messaging | | (Maven package) | | libmessaging_java.jar (Android service) -| | androidx.core:core:1.15.0 (Maven package) +| | androidx.core:core:1.16.0 (Maven package) Firebase Realtime Database | libfirebase_database.a | | libfirebase_auth.a | | libfirebase_app.a @@ -181,7 +181,7 @@ User Messaging Platform | libfirebase_ump.a | | (Maven package) | | com.google.android.ump:user-messaging-platform:2.2.0 | | (Maven package) -Google Play services module| com.google.android.gms:play-services-base:18.6.0 +Google Play services module| com.google.android.gms:play-services-base:18.7.0 | | (Maven package) The Firebase C++ SDK uses an Android BoM (Bill of Materials) to specify a single diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index cdf73ed30a..3e00a23188 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -55,7 +55,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.0') implementation 'com.google.firebase:firebase-config' } diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 24a407fe26..4bbe898f57 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -54,7 +54,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-storage' } diff --git a/ump/ump_resources/build.gradle b/ump/ump_resources/build.gradle index 042ccd2266..638e6c4e94 100644 --- a/ump/ump_resources/build.gradle +++ b/ump/ump_resources/build.gradle @@ -56,7 +56,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.11.0') + implementation platform('com.google.firebase:firebase-bom:33.14.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.android.ump:user-messaging-platform:2.2.0' } From a9f4705bd77dcd4bd84113cf61fa6b4af1674c1c Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 21 May 2025 14:27:02 -0700 Subject: [PATCH 2/6] Add workaround to resources gradle files. --- app/app_resources/build.gradle | 5 +++++ app/google_api_resources/build.gradle | 5 +++++ app/invites_resources/build.gradle | 5 +++++ app/test_resources/build.gradle | 5 +++++ app_check/app_check_resources/build.gradle | 5 +++++ auth/auth_resources/build.gradle | 5 +++++ database/database_resources/build.gradle | 5 +++++ firestore/firestore_resources/build.gradle | 5 +++++ gma/gma_resources/build.gradle | 5 +++++ remote_config/remote_config_resources/build.gradle | 5 +++++ storage/storage_resources/build.gradle | 5 +++++ ump/ump_resources/build.gradle | 5 +++++ 12 files changed, 60 insertions(+) diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index 8fa60577ee..d2f431d183 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -62,6 +64,9 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index 38bcf83797..bbf51f3a4f 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -67,6 +69,9 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index ea03132f6a..7403fdd58c 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -63,6 +65,9 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle index 04aebe642b..7d9d59646c 100644 --- a/app/test_resources/build.gradle +++ b/app/test_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -54,6 +56,9 @@ android { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index 31253a4078..817db11653 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -61,6 +63,9 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index e667565bbb..42c202e343 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -63,6 +65,9 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle index 035b5062dd..4197b8e572 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -59,6 +61,9 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index c5f1f665ab..0072853aab 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -66,6 +68,9 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index 520bf8eb6e..ef5fbf8547 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -64,6 +66,9 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index 3e00a23188..8a642f40f2 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -61,6 +63,9 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 4bbe898f57..ea37f866a2 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -61,6 +63,9 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" diff --git a/ump/ump_resources/build.gradle b/ump/ump_resources/build.gradle index 638e6c4e94..2e5a039f28 100644 --- a/ump/ump_resources/build.gradle +++ b/ump/ump_resources/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -63,6 +65,9 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } apply from: "$rootDir/android_build_files/extract_and_dex.gradle" From af5aa627c51e80df52b69b37f8449d83f383e57c Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 21 May 2025 14:31:34 -0700 Subject: [PATCH 3/6] Add workaround to other gradle files. --- analytics/build.gradle | 5 +++++ analytics/integration_test/build.gradle | 8 ++++++++ app/build.gradle | 5 +++++ app/integration_test/build.gradle | 8 ++++++++ app_check/build.gradle | 5 +++++ app_check/integration_test/build.gradle | 8 ++++++++ auth/build.gradle | 5 +++++ auth/integration_test/build.gradle | 8 ++++++++ database/build.gradle | 5 +++++ database/integration_test/build.gradle | 8 ++++++++ dynamic_links/build.gradle | 5 +++++ dynamic_links/integration_test/build.gradle | 8 ++++++++ firestore/build.gradle | 5 +++++ firestore/integration_test/build.gradle | 8 ++++++++ firestore/integration_test_internal/build.gradle | 8 ++++++++ functions/build.gradle | 5 +++++ functions/integration_test/build.gradle | 8 ++++++++ gma/build.gradle | 5 +++++ gma/integration_test/build.gradle | 8 ++++++++ installations/build.gradle | 5 +++++ installations/integration_test/build.gradle | 8 ++++++++ messaging/build.gradle | 5 +++++ messaging/integration_test/build.gradle | 8 ++++++++ remote_config/build.gradle | 5 +++++ remote_config/integration_test/build.gradle | 8 ++++++++ storage/build.gradle | 5 +++++ storage/integration_test/build.gradle | 8 ++++++++ testing/build.gradle | 2 ++ ump/build.gradle | 5 +++++ ump/integration_test/build.gradle | 8 ++++++++ 30 files changed, 192 insertions(+) diff --git a/analytics/build.gradle b/analytics/build.gradle index 4a5d6149ff..b446652198 100644 --- a/analytics/build.gradle +++ b/analytics/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -86,4 +88,7 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('analytics') preBuild.dependsOn(':app:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle index 02743d45df..1e6dcc9563 100644 --- a/analytics/integration_test/build.gradle +++ b/analytics/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -96,3 +98,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/app/build.gradle b/app/build.gradle index 38dac86f0a..bdc6d54036 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -81,4 +83,7 @@ project.afterEvaluate { setupDexDependencies(':app:app_resources') setupDexDependencies(':app:google_api_resources') setupDexDependencies(':app:invites_resources') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle index b764da6189..141caaa0aa 100644 --- a/app/integration_test/build.gradle +++ b/app/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -96,3 +98,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/app_check/build.gradle b/app_check/build.gradle index eb0148237d..5668836c19 100644 --- a/app_check/build.gradle +++ b/app_check/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -87,4 +89,7 @@ project.afterEvaluate { generateProguardFile('app_check') setupDexDependencies(':app_check:app_check_resources') preBuild.dependsOn(':app:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle index 9a0e96b2fd..3d236c4ec2 100644 --- a/app_check/integration_test/build.gradle +++ b/app_check/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -113,3 +115,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/auth/build.gradle b/auth/build.gradle index 2e4764a7d1..8578b3d52a 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -87,4 +89,7 @@ project.afterEvaluate { generateProguardFile('auth') setupDexDependencies(':auth:auth_resources') preBuild.dependsOn(':app:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle index e65135b02a..24b94a6286 100644 --- a/auth/integration_test/build.gradle +++ b/auth/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -100,3 +102,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/database/build.gradle b/database/build.gradle index 79cc5eca33..7e61e095fe 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -88,4 +90,7 @@ project.afterEvaluate { setupDexDependencies(':database:database_resources') preBuild.dependsOn(':app:build') preBuild.dependsOn(':auth:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle index 9f3937a0a9..c41cc480da 100644 --- a/database/integration_test/build.gradle +++ b/database/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -101,3 +103,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle index ecf9231331..c3febc2a2b 100644 --- a/dynamic_links/build.gradle +++ b/dynamic_links/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -85,4 +87,7 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('dynamic_links') preBuild.dependsOn(':app:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle index 5c5be7e10c..402788fae0 100644 --- a/dynamic_links/integration_test/build.gradle +++ b/dynamic_links/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -96,3 +98,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/firestore/build.gradle b/firestore/build.gradle index c09891e92e..86d15cf61f 100644 --- a/firestore/build.gradle +++ b/firestore/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -89,4 +91,7 @@ project.afterEvaluate { setupDexDependencies(':firestore:firestore_resources') preBuild.dependsOn(':app:build') preBuild.dependsOn(':auth:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle index 2a08e24b6e..eadf3aa48d 100644 --- a/firestore/integration_test/build.gradle +++ b/firestore/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -101,3 +103,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index d7c578e467..269ae28bcb 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -119,3 +121,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/functions/build.gradle b/functions/build.gradle index 67722579a7..94edfdf68d 100644 --- a/functions/build.gradle +++ b/functions/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -86,4 +88,7 @@ project.afterEvaluate { generateProguardFile('functions') preBuild.dependsOn(':app:build') preBuild.dependsOn(':auth:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle index 48f346165f..6f3b797a9f 100644 --- a/functions/integration_test/build.gradle +++ b/functions/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -101,3 +103,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/gma/build.gradle b/gma/build.gradle index 45421c7fe0..b033f5194b 100644 --- a/gma/build.gradle +++ b/gma/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -87,4 +89,7 @@ project.afterEvaluate { generateProguardFile('gma') setupDexDependencies(':gma:gma_resources') preBuild.dependsOn(':app:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle index 41d156e8eb..a66f4faa6a 100644 --- a/gma/integration_test/build.gradle +++ b/gma/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -100,3 +102,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/installations/build.gradle b/installations/build.gradle index dd60ba8050..9d3f83fe21 100644 --- a/installations/build.gradle +++ b/installations/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -85,4 +87,7 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('installations') preBuild.dependsOn(':app:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle index cc000277c8..9d9ec117df 100644 --- a/installations/integration_test/build.gradle +++ b/installations/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -96,3 +98,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/messaging/build.gradle b/messaging/build.gradle index 3bf197d932..18eec0190b 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -87,4 +89,7 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('messaging') preBuild.dependsOn(':app:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle index 67f39bf793..284681ecef 100644 --- a/messaging/integration_test/build.gradle +++ b/messaging/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -101,3 +103,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/remote_config/build.gradle b/remote_config/build.gradle index 2b00fbdaae..689cc9fddc 100644 --- a/remote_config/build.gradle +++ b/remote_config/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -87,4 +89,7 @@ project.afterEvaluate { generateProguardFile('remote_config') setupDexDependencies(':remote_config:remote_config_resources') preBuild.dependsOn(':app:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle index 389718f1e6..bace52e42a 100644 --- a/remote_config/integration_test/build.gradle +++ b/remote_config/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -99,3 +101,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/storage/build.gradle b/storage/build.gradle index 00444f11d1..945d4dfedd 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -88,4 +90,7 @@ project.afterEvaluate { setupDexDependencies(':storage:storage_resources') preBuild.dependsOn(':app:build') preBuild.dependsOn(':auth:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle index ed536d709f..e9d0ef1ec7 100644 --- a/storage/integration_test/build.gradle +++ b/storage/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -101,3 +103,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} diff --git a/testing/build.gradle b/testing/build.gradle index eddf7b4eae..f420cd6011 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() diff --git a/ump/build.gradle b/ump/build.gradle index d2f9f50f9f..42d619272b 100644 --- a/ump/build.gradle +++ b/ump/build.gradle @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { google() @@ -87,4 +89,7 @@ project.afterEvaluate { generateProguardFile('ump') setupDexDependencies(':ump:ump_resources') preBuild.dependsOn(':app:build') + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } } diff --git a/ump/integration_test/build.gradle b/ump/integration_test/build.gradle index 2b6eec4e30..ebcf8c7b40 100644 --- a/ump/integration_test/build.gradle +++ b/ump/integration_test/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. +import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { mavenLocal() @@ -100,3 +102,9 @@ task copyIntegrationTestFiles(type:Exec) { } build.dependsOn(copyIntegrationTestFiles) + +project.afterEvaluate { + project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + enabled = false + } +} From 63e1b461f709a481619ffc50b586e44c35cfa13f Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 21 May 2025 14:43:14 -0700 Subject: [PATCH 4/6] Change format to build.gradle. --- analytics/build.gradle | 4 ++-- analytics/integration_test/build.gradle | 4 ++-- app/app_resources/build.gradle | 4 ++-- app/build.gradle | 4 ++-- app/google_api_resources/build.gradle | 4 ++-- app/integration_test/build.gradle | 4 ++-- app/invites_resources/build.gradle | 4 ++-- app/test_resources/build.gradle | 4 ++-- app_check/app_check_resources/build.gradle | 4 ++-- app_check/build.gradle | 4 ++-- app_check/integration_test/build.gradle | 4 ++-- auth/auth_resources/build.gradle | 4 ++-- auth/build.gradle | 4 ++-- auth/integration_test/build.gradle | 4 ++-- database/build.gradle | 4 ++-- database/database_resources/build.gradle | 4 ++-- database/integration_test/build.gradle | 4 ++-- dynamic_links/build.gradle | 4 ++-- dynamic_links/integration_test/build.gradle | 4 ++-- firestore/build.gradle | 4 ++-- firestore/firestore_resources/build.gradle | 4 ++-- firestore/integration_test/build.gradle | 4 ++-- firestore/integration_test_internal/build.gradle | 4 ++-- functions/build.gradle | 4 ++-- functions/integration_test/build.gradle | 4 ++-- gma/build.gradle | 4 ++-- gma/gma_resources/build.gradle | 4 ++-- gma/integration_test/build.gradle | 4 ++-- installations/build.gradle | 4 ++-- installations/integration_test/build.gradle | 4 ++-- messaging/build.gradle | 4 ++-- messaging/integration_test/build.gradle | 4 ++-- remote_config/build.gradle | 4 ++-- remote_config/integration_test/build.gradle | 4 ++-- remote_config/remote_config_resources/build.gradle | 4 ++-- storage/build.gradle | 4 ++-- storage/integration_test/build.gradle | 4 ++-- storage/storage_resources/build.gradle | 4 ++-- testing/build.gradle | 2 +- ump/build.gradle | 4 ++-- ump/integration_test/build.gradle | 4 +--- ump/ump_resources/build.gradle | 4 ++-- 42 files changed, 82 insertions(+), 84 deletions(-) diff --git a/analytics/build.gradle b/analytics/build.gradle index b446652198..940a6249ad 100644 --- a/analytics/build.gradle +++ b/analytics/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -88,7 +88,7 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('analytics') preBuild.dependsOn(':app:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle index 1e6dcc9563..cb9ff9a9e1 100644 --- a/analytics/integration_test/build.gradle +++ b/analytics/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -100,7 +100,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index d2f431d183..a9023a5d16 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -64,7 +64,7 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/app/build.gradle b/app/build.gradle index bdc6d54036..d6df2dc828 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -83,7 +83,7 @@ project.afterEvaluate { setupDexDependencies(':app:app_resources') setupDexDependencies(':app:google_api_resources') setupDexDependencies(':app:invites_resources') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index bbf51f3a4f..3de2423ceb 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -69,7 +69,7 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle index 141caaa0aa..99af4cb600 100644 --- a/app/integration_test/build.gradle +++ b/app/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -100,7 +100,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index 7403fdd58c..2afe940ba0 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -65,7 +65,7 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle index 7d9d59646c..77885932d7 100644 --- a/app/test_resources/build.gradle +++ b/app/test_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -56,7 +56,7 @@ android { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index 817db11653..7ddc930947 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -63,7 +63,7 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/app_check/build.gradle b/app_check/build.gradle index 5668836c19..bd7c85bcdb 100644 --- a/app_check/build.gradle +++ b/app_check/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -89,7 +89,7 @@ project.afterEvaluate { generateProguardFile('app_check') setupDexDependencies(':app_check:app_check_resources') preBuild.dependsOn(':app:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle index 3d236c4ec2..ffa5603d8f 100644 --- a/app_check/integration_test/build.gradle +++ b/app_check/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -117,7 +117,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index 42c202e343..d747e87904 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -65,7 +65,7 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/auth/build.gradle b/auth/build.gradle index 8578b3d52a..50f9ffe329 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -89,7 +89,7 @@ project.afterEvaluate { generateProguardFile('auth') setupDexDependencies(':auth:auth_resources') preBuild.dependsOn(':app:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle index 24b94a6286..338ead39ca 100644 --- a/auth/integration_test/build.gradle +++ b/auth/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -104,7 +104,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/database/build.gradle b/database/build.gradle index 7e61e095fe..574b91aa81 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -90,7 +90,7 @@ project.afterEvaluate { setupDexDependencies(':database:database_resources') preBuild.dependsOn(':app:build') preBuild.dependsOn(':auth:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle index 4197b8e572..a5009abbb0 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -61,7 +61,7 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle index c41cc480da..637f6cee27 100644 --- a/database/integration_test/build.gradle +++ b/database/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -105,7 +105,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle index c3febc2a2b..3373a62a34 100644 --- a/dynamic_links/build.gradle +++ b/dynamic_links/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -87,7 +87,7 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('dynamic_links') preBuild.dependsOn(':app:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle index 402788fae0..74eb089828 100644 --- a/dynamic_links/integration_test/build.gradle +++ b/dynamic_links/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -100,7 +100,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/firestore/build.gradle b/firestore/build.gradle index 86d15cf61f..2a62ac3352 100644 --- a/firestore/build.gradle +++ b/firestore/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -91,7 +91,7 @@ project.afterEvaluate { setupDexDependencies(':firestore:firestore_resources') preBuild.dependsOn(':app:build') preBuild.dependsOn(':auth:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index 0072853aab..cbbae1b61a 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -68,7 +68,7 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle index eadf3aa48d..66dfc9549c 100644 --- a/firestore/integration_test/build.gradle +++ b/firestore/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -105,7 +105,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index 269ae28bcb..d26eed0080 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -123,7 +123,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/functions/build.gradle b/functions/build.gradle index 94edfdf68d..76725bf953 100644 --- a/functions/build.gradle +++ b/functions/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -88,7 +88,7 @@ project.afterEvaluate { generateProguardFile('functions') preBuild.dependsOn(':app:build') preBuild.dependsOn(':auth:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle index 6f3b797a9f..064446f959 100644 --- a/functions/integration_test/build.gradle +++ b/functions/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -105,7 +105,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/gma/build.gradle b/gma/build.gradle index b033f5194b..d04ae7e6f1 100644 --- a/gma/build.gradle +++ b/gma/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -89,7 +89,7 @@ project.afterEvaluate { generateProguardFile('gma') setupDexDependencies(':gma:gma_resources') preBuild.dependsOn(':app:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index ef5fbf8547..d2842cb888 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -66,7 +66,7 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle index a66f4faa6a..cd7faf9417 100644 --- a/gma/integration_test/build.gradle +++ b/gma/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -104,7 +104,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/installations/build.gradle b/installations/build.gradle index 9d3f83fe21..e0f3fbaa93 100644 --- a/installations/build.gradle +++ b/installations/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -87,7 +87,7 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('installations') preBuild.dependsOn(':app:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle index 9d9ec117df..6589373859 100644 --- a/installations/integration_test/build.gradle +++ b/installations/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -100,7 +100,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/messaging/build.gradle b/messaging/build.gradle index 18eec0190b..a74e2bff48 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -89,7 +89,7 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle" project.afterEvaluate { generateProguardFile('messaging') preBuild.dependsOn(':app:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle index 284681ecef..0fd95055f7 100644 --- a/messaging/integration_test/build.gradle +++ b/messaging/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -105,7 +105,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/remote_config/build.gradle b/remote_config/build.gradle index 689cc9fddc..f5a536fd22 100644 --- a/remote_config/build.gradle +++ b/remote_config/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -89,7 +89,7 @@ project.afterEvaluate { generateProguardFile('remote_config') setupDexDependencies(':remote_config:remote_config_resources') preBuild.dependsOn(':app:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle index bace52e42a..46c2e82dd1 100644 --- a/remote_config/integration_test/build.gradle +++ b/remote_config/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -103,7 +103,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index 8a642f40f2..ec85996e61 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -63,7 +63,7 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/storage/build.gradle b/storage/build.gradle index 945d4dfedd..01244ce1f6 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -90,7 +90,7 @@ project.afterEvaluate { setupDexDependencies(':storage:storage_resources') preBuild.dependsOn(':app:build') preBuild.dependsOn(':auth:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle index e9d0ef1ec7..a62e827a58 100644 --- a/storage/integration_test/build.gradle +++ b/storage/integration_test/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -105,7 +105,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index ea37f866a2..72b21f3ea7 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -63,7 +63,7 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/testing/build.gradle b/testing/build.gradle index f420cd6011..2974e30825 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { diff --git a/ump/build.gradle b/ump/build.gradle index 42d619272b..58b01802bc 100644 --- a/ump/build.gradle +++ b/ump/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -89,7 +89,7 @@ project.afterEvaluate { generateProguardFile('ump') setupDexDependencies(':ump:ump_resources') preBuild.dependsOn(':app:build') - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/ump/integration_test/build.gradle b/ump/integration_test/build.gradle index ebcf8c7b40..d31f643652 100644 --- a/ump/integration_test/build.gradle +++ b/ump/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask - buildscript { repositories { mavenLocal() @@ -104,7 +102,7 @@ task copyIntegrationTestFiles(type:Exec) { build.dependsOn(copyIntegrationTestFiles) project.afterEvaluate { - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } diff --git a/ump/ump_resources/build.gradle b/ump/ump_resources/build.gradle index 2e5a039f28..d897b26bbb 100644 --- a/ump/ump_resources/build.gradle +++ b/ump/ump_resources/build.gradle @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import com.android.build.gradle.internal.tasks.CheckAarMetadataTask + buildscript { repositories { @@ -65,7 +65,7 @@ dependencies { afterEvaluate { generateReleaseBuildConfig.enabled = false - project.tasks.withType(CheckAarMetadataTask::class.java).configureEach { + project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) { enabled = false } } From dcbe28e9071152943c4c4c58ce3d07f583421884 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 21 May 2025 15:07:47 -0700 Subject: [PATCH 5/6] Update release notes with BoM version. --- release_build_files/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index a7c0f44418..f4a216bc12 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -656,6 +656,7 @@ code. ## Release Notes ### 12.8.0 - Changes + - General (Android): Update to Firebase Android BoM version 33.14.0. - General (iOS, tvOS, Desktop): iOS, tvOS, and macOS SDKs are now built using Xcode 16.2. - UMP: Moved the User Messaging Platform SDK to its own top-level From c8dc4523d2f30a029de73f21ce98db570bcbcf85 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 21 May 2025 16:36:56 -0700 Subject: [PATCH 6/6] Revert whitespace. --- analytics/build.gradle | 2 -- analytics/integration_test/build.gradle | 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/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 -- auth/auth_resources/build.gradle | 2 -- auth/build.gradle | 2 -- auth/integration_test/build.gradle | 2 -- database/build.gradle | 2 -- database/database_resources/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/firestore_resources/build.gradle | 2 -- firestore/integration_test/build.gradle | 2 -- firestore/integration_test_internal/build.gradle | 2 -- functions/build.gradle | 2 -- functions/integration_test/build.gradle | 2 -- gma/build.gradle | 2 -- gma/gma_resources/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 -- remote_config/build.gradle | 2 -- remote_config/integration_test/build.gradle | 2 -- remote_config/remote_config_resources/build.gradle | 2 -- storage/build.gradle | 2 -- storage/integration_test/build.gradle | 2 -- storage/storage_resources/build.gradle | 2 -- testing/build.gradle | 2 -- ump/build.gradle | 2 -- ump/ump_resources/build.gradle | 2 -- 41 files changed, 82 deletions(-) diff --git a/analytics/build.gradle b/analytics/build.gradle index 940a6249ad..961c866d2c 100644 --- a/analytics/build.gradle +++ b/analytics/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle index cb9ff9a9e1..b583820fe8 100644 --- a/analytics/integration_test/build.gradle +++ b/analytics/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index a9023a5d16..8073cc12a6 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/app/build.gradle b/app/build.gradle index d6df2dc828..4d2e2275e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index 3de2423ceb..ad14f7578c 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle index 99af4cb600..44663a32a2 100644 --- a/app/integration_test/build.gradle +++ b/app/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index 2afe940ba0..11774c8d87 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle index 77885932d7..1850b9fd40 100644 --- a/app/test_resources/build.gradle +++ b/app/test_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index 7ddc930947..d444aafdc3 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/app_check/build.gradle b/app_check/build.gradle index bd7c85bcdb..fe46f1d9cd 100644 --- a/app_check/build.gradle +++ b/app_check/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle index ffa5603d8f..c14dab02fe 100644 --- a/app_check/integration_test/build.gradle +++ b/app_check/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index d747e87904..9993425e3b 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/auth/build.gradle b/auth/build.gradle index 50f9ffe329..fbaca5f1d6 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle index 338ead39ca..88ceb6ca9d 100644 --- a/auth/integration_test/build.gradle +++ b/auth/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/database/build.gradle b/database/build.gradle index 574b91aa81..299e89cc60 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle index a5009abbb0..d6546bb8d2 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle index 637f6cee27..ba2d8b3675 100644 --- a/database/integration_test/build.gradle +++ b/database/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle index 3373a62a34..6fd8088c25 100644 --- a/dynamic_links/build.gradle +++ b/dynamic_links/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle index 74eb089828..65c65fc06b 100644 --- a/dynamic_links/integration_test/build.gradle +++ b/dynamic_links/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/firestore/build.gradle b/firestore/build.gradle index 2a62ac3352..de5fb63c57 100644 --- a/firestore/build.gradle +++ b/firestore/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index cbbae1b61a..29cd3542b6 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle index 66dfc9549c..19c75410cd 100644 --- a/firestore/integration_test/build.gradle +++ b/firestore/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index d26eed0080..5570e90f45 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/functions/build.gradle b/functions/build.gradle index 76725bf953..8be960eb3b 100644 --- a/functions/build.gradle +++ b/functions/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle index 064446f959..d88b4413da 100644 --- a/functions/integration_test/build.gradle +++ b/functions/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/gma/build.gradle b/gma/build.gradle index d04ae7e6f1..9b54eea9f6 100644 --- a/gma/build.gradle +++ b/gma/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index d2842cb888..c18695d73a 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle index cd7faf9417..16f9d2b87e 100644 --- a/gma/integration_test/build.gradle +++ b/gma/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/installations/build.gradle b/installations/build.gradle index e0f3fbaa93..58bde27730 100644 --- a/installations/build.gradle +++ b/installations/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle index 6589373859..6da58f4670 100644 --- a/installations/integration_test/build.gradle +++ b/installations/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/messaging/build.gradle b/messaging/build.gradle index a74e2bff48..01c6f0ad05 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle index 0fd95055f7..a9f76da475 100644 --- a/messaging/integration_test/build.gradle +++ b/messaging/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/remote_config/build.gradle b/remote_config/build.gradle index f5a536fd22..fe57588e18 100644 --- a/remote_config/build.gradle +++ b/remote_config/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle index 46c2e82dd1..31239ec5f3 100644 --- a/remote_config/integration_test/build.gradle +++ b/remote_config/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index ec85996e61..8fe56fddeb 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/storage/build.gradle b/storage/build.gradle index 01244ce1f6..977e770ac3 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle index a62e827a58..34c3f22f4c 100644 --- a/storage/integration_test/build.gradle +++ b/storage/integration_test/build.gradle @@ -13,8 +13,6 @@ // limitations under the License. // Top-level build file where you can add configuration options common to all sub-projects/modules. - - buildscript { repositories { mavenLocal() diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 72b21f3ea7..d80f930416 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/testing/build.gradle b/testing/build.gradle index 2974e30825..eddf7b4eae 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/ump/build.gradle b/ump/build.gradle index 58b01802bc..4eff85a1cf 100644 --- a/ump/build.gradle +++ b/ump/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google() diff --git a/ump/ump_resources/build.gradle b/ump/ump_resources/build.gradle index d897b26bbb..57eacc3b90 100644 --- a/ump/ump_resources/build.gradle +++ b/ump/ump_resources/build.gradle @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - buildscript { repositories { google()