From c05a3191056b396fe0a42c1e5a9c0c6bfeb3ae72 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Fri, 8 Nov 2024 07:14:39 -0500 Subject: [PATCH] Replaced defaultConfig.targetSdk with testOptions.targetSdk `targetSdk` has been moved out of `defaultConfig` for libraries, and should be declared inside `testOptions` and/or `lint` --- firebase-common/firebase-common.gradle.kts | 7 +++++-- firebase-components/firebase-components.gradle.kts | 8 ++++++-- .../firebase-dynamic-module-support.gradle.kts | 7 +++++-- .../firebase-config-interop.gradle.kts | 4 +++- firebase-config/firebase-config.gradle.kts | 9 +++++++-- .../firebase-database-collection.gradle.kts | 7 +++---- firebase-database/firebase-database.gradle.kts | 8 ++++++-- firebase-dataconnect/firebase-dataconnect.gradle.kts | 3 +++ firebase-functions/firebase-functions.gradle.kts | 7 +++++-- firebase-sessions/firebase-sessions.gradle.kts | 7 +++++-- firebase-vertexai/firebase-vertexai.gradle.kts | 9 ++++++--- 11 files changed, 54 insertions(+), 22 deletions(-) diff --git a/firebase-common/firebase-common.gradle.kts b/firebase-common/firebase-common.gradle.kts index 046737ecb62..88bfa58e27d 100644 --- a/firebase-common/firebase-common.gradle.kts +++ b/firebase-common/firebase-common.gradle.kts @@ -32,7 +32,6 @@ android { namespace = "com.google.firebase" defaultConfig { minSdk = minSdkVersion - targetSdk = targetSdkVersion multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("proguard.txt") @@ -46,7 +45,11 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = "1.8" } - testOptions.unitTests.isIncludeAndroidResources = true + testOptions { + targetSdk = targetSdkVersion + unitTests { isIncludeAndroidResources = true } + } + lint { targetSdk = targetSdkVersion } } dependencies { diff --git a/firebase-components/firebase-components.gradle.kts b/firebase-components/firebase-components.gradle.kts index e15cc807d9f..212e8b7c488 100644 --- a/firebase-components/firebase-components.gradle.kts +++ b/firebase-components/firebase-components.gradle.kts @@ -23,11 +23,11 @@ android { val compileSdkVersion: Int by rootProject val targetSdkVersion: Int by rootProject val minSdkVersion: Int by rootProject + compileSdk = compileSdkVersion namespace = "com.google.firebase.components" defaultConfig { minSdk = minSdkVersion - targetSdk = targetSdkVersion multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("proguard.txt") @@ -36,7 +36,11 @@ android { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } - testOptions.unitTests.isIncludeAndroidResources = true + testOptions { + targetSdk = targetSdkVersion + unitTests { isIncludeAndroidResources = true } + } + lint { targetSdk = targetSdkVersion } } dependencies { diff --git a/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts b/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts index b826b81f76e..5e4ad98766a 100644 --- a/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts +++ b/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts @@ -34,7 +34,6 @@ android { namespace = "com.google.firebase.dynamicloading" defaultConfig { minSdk = minSdkVersion - targetSdk = targetSdkVersion multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -42,7 +41,11 @@ android { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } - testOptions.unitTests.isIncludeAndroidResources = true + testOptions { + targetSdk = targetSdkVersion + unitTests { isIncludeAndroidResources = true } + } + lint { targetSdk = targetSdkVersion } } dependencies { diff --git a/firebase-config-interop/firebase-config-interop.gradle.kts b/firebase-config-interop/firebase-config-interop.gradle.kts index efa4df17fa8..659180ab19a 100644 --- a/firebase-config-interop/firebase-config-interop.gradle.kts +++ b/firebase-config-interop/firebase-config-interop.gradle.kts @@ -31,7 +31,6 @@ android { defaultConfig { minSdk = minSdkVersion - targetSdk = targetSdkVersion testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -40,6 +39,9 @@ android { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } + + testOptions { targetSdk = targetSdkVersion } + lint { targetSdk = targetSdkVersion } } dependencies { diff --git a/firebase-config/firebase-config.gradle.kts b/firebase-config/firebase-config.gradle.kts index f358ad00096..009c5950c09 100644 --- a/firebase-config/firebase-config.gradle.kts +++ b/firebase-config/firebase-config.gradle.kts @@ -38,7 +38,6 @@ android { defaultConfig { minSdk = 21 - targetSdk = targetSdkVersion multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -49,8 +48,14 @@ android { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } + kotlinOptions { jvmTarget = "1.8" } - testOptions.unitTests.isIncludeAndroidResources = true + + testOptions { + targetSdk = targetSdkVersion + unitTests { isIncludeAndroidResources = true } + } + lint { targetSdk = targetSdkVersion } } dependencies { diff --git a/firebase-database-collection/firebase-database-collection.gradle.kts b/firebase-database-collection/firebase-database-collection.gradle.kts index 26486c63ff9..716b2bdcb23 100644 --- a/firebase-database-collection/firebase-database-collection.gradle.kts +++ b/firebase-database-collection/firebase-database-collection.gradle.kts @@ -27,15 +27,14 @@ android { compileSdk = compileSdkVersion namespace = "com.google.firebase.database.collection" - defaultConfig { - minSdk = minSdkVersion - targetSdk = targetSdkVersion - } + defaultConfig { minSdk = minSdkVersion } compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } + testOptions { targetSdk = targetSdkVersion } + lint { targetSdk = targetSdkVersion } } dependencies { diff --git a/firebase-database/firebase-database.gradle.kts b/firebase-database/firebase-database.gradle.kts index 626364a9357..e8a7a724080 100644 --- a/firebase-database/firebase-database.gradle.kts +++ b/firebase-database/firebase-database.gradle.kts @@ -38,7 +38,6 @@ android { namespace = "com.google.firebase.database" defaultConfig { minSdk = minSdkVersion - targetSdk = targetSdkVersion multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -56,7 +55,12 @@ android { kotlinOptions { jvmTarget = "1.8" } packagingOptions.resources.excludes += "META-INF/DEPENDENCIES" - testOptions.unitTests.isIncludeAndroidResources = true + + testOptions { + targetSdk = targetSdkVersion + unitTests { isIncludeAndroidResources = true } + } + lint { targetSdk = targetSdkVersion } } } diff --git a/firebase-dataconnect/firebase-dataconnect.gradle.kts b/firebase-dataconnect/firebase-dataconnect.gradle.kts index a0efdb5f811..58c5d63164a 100644 --- a/firebase-dataconnect/firebase-dataconnect.gradle.kts +++ b/firebase-dataconnect/firebase-dataconnect.gradle.kts @@ -57,12 +57,15 @@ android { @Suppress("UnstableApiUsage") testOptions { + targetSdk = targetSdkVersion unitTests { isIncludeAndroidResources = true isReturnDefaultValues = true } } + lint { targetSdk = targetSdkVersion } + packaging { resources { excludes.add("META-INF/LICENSE.md") diff --git a/firebase-functions/firebase-functions.gradle.kts b/firebase-functions/firebase-functions.gradle.kts index 1ecfa75ab8f..7ec958bdd79 100644 --- a/firebase-functions/firebase-functions.gradle.kts +++ b/firebase-functions/firebase-functions.gradle.kts @@ -40,7 +40,6 @@ android { compileSdk = compileSdkVersion defaultConfig { minSdk = minSdkVersion - targetSdk = targetSdkVersion multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("proguard.txt") @@ -51,7 +50,11 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = "1.8" } - testOptions.unitTests.isIncludeAndroidResources = true + testOptions { + targetSdk = targetSdkVersion + unitTests { isIncludeAndroidResources = true } + } + lint { targetSdk = targetSdkVersion } } // Enable Kotlin "Explicit API Mode". This causes the Kotlin compiler to fail if any diff --git a/firebase-sessions/firebase-sessions.gradle.kts b/firebase-sessions/firebase-sessions.gradle.kts index c13a553448a..15d22381e31 100644 --- a/firebase-sessions/firebase-sessions.gradle.kts +++ b/firebase-sessions/firebase-sessions.gradle.kts @@ -39,7 +39,6 @@ android { compileSdk = compileSdkVersion defaultConfig { minSdk = minSdkVersion - targetSdk = targetSdkVersion multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -48,7 +47,11 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = "1.8" } - testOptions.unitTests.isIncludeAndroidResources = true + testOptions { + targetSdk = targetSdkVersion + unitTests { isIncludeAndroidResources = true } + } + lint { targetSdk = targetSdkVersion } } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs::class.java).configureEach { diff --git a/firebase-vertexai/firebase-vertexai.gradle.kts b/firebase-vertexai/firebase-vertexai.gradle.kts index 7a2aa026c2c..1758766658e 100644 --- a/firebase-vertexai/firebase-vertexai.gradle.kts +++ b/firebase-vertexai/firebase-vertexai.gradle.kts @@ -41,7 +41,6 @@ android { compileSdk = 34 defaultConfig { minSdk = 21 - targetSdk = 34 consumerProguardFiles("consumer-rules.pro") multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" @@ -58,9 +57,13 @@ android { } kotlinOptions { jvmTarget = "1.8" } testOptions { - unitTests.isIncludeAndroidResources = true - unitTests.isReturnDefaultValues = true + targetSdk = targetSdkVersion + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + } } + lint { targetSdk = targetSdkVersion } } // Enable Kotlin "Explicit API Mode". This causes the Kotlin compiler to fail if any