Skip to content

Replaced defaultConfig.targetSdk with testOptions.targetSdk #6444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rlazo merged 2 commits into from
Nov 8, 2024
Merged

Replaced defaultConfig.targetSdk with testOptions.targetSdk #6444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c05a319
Replaced defaultConfig.targetSdk with testOptions.targetSdk
rlazo Nov 8, 2024
c463054
Merge branch 'main' into rl.kts.target
rlazo Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions firebase-common/firebase-common.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ android {
namespace = "com.google.firebase"
defaultConfig {
minSdk = minSdkVersion
targetSdk = targetSdkVersion
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("proguard.txt")
Expand All @@ -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 {
Expand Down
8 changes: 6 additions & 2 deletions firebase-components/firebase-components.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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 {
Expand Down
7 changes: 5 additions & 2 deletions ...ase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,18 @@ android {
namespace = "com.google.firebase.dynamicloading"
defaultConfig {
minSdk = minSdkVersion
targetSdk = targetSdkVersion
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
testOptions.unitTests.isIncludeAndroidResources = true
testOptions {
targetSdk = targetSdkVersion
unitTests { isIncludeAndroidResources = true }
}
lint { targetSdk = targetSdkVersion }
}

dependencies {
Expand Down
4 changes: 3 additions & 1 deletion firebase-config-interop/firebase-config-interop.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ android {

defaultConfig {
minSdk = minSdkVersion
targetSdk = targetSdkVersion

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -40,6 +39,9 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

testOptions { targetSdk = targetSdkVersion }
lint { targetSdk = targetSdkVersion }
}

dependencies {
Expand Down
9 changes: 7 additions & 2 deletions firebase-config/firebase-config.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ android {

defaultConfig {
minSdk = 21
targetSdk = targetSdkVersion
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions firebase-database-collection/firebase-database-collection.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 6 additions & 2 deletions firebase-database/firebase-database.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ android {
namespace = "com.google.firebase.database"
defaultConfig {
minSdk = minSdkVersion
targetSdk = targetSdkVersion
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -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 }
}
}

Expand Down
3 changes: 3 additions & 0 deletions firebase-dataconnect/firebase-dataconnect.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
7 changes: 5 additions & 2 deletions firebase-functions/firebase-functions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ android {
compileSdk = compileSdkVersion
defaultConfig {
minSdk = minSdkVersion
targetSdk = targetSdkVersion
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("proguard.txt")
Expand All @@ -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
Expand Down
7 changes: 5 additions & 2 deletions firebase-sessions/firebase-sessions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ android {
compileSdk = compileSdkVersion
defaultConfig {
minSdk = minSdkVersion
targetSdk = targetSdkVersion
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -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 {
Expand Down
9 changes: 6 additions & 3 deletions firebase-vertexai/firebase-vertexai.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ android {
compileSdk = 34
defaultConfig {
minSdk = 21
targetSdk = 34
consumerProguardFiles("consumer-rules.pro")
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -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
Expand Down
Loading