Skip to content

Commit 8b5cb2a

Browse files
rlazorlazo
authored
Merge branch 'main' into rl.maven.update.api
2 parents b9e051f + 4100ebf commit 8b5cb2a

File tree

11 files changed

+54
-22
lines changed

11 files changed

+54
-22
lines changed

‎firebase-common/firebase-common.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ android {
3232
namespace = "com.google.firebase"
3333
defaultConfig {
3434
minSdk = minSdkVersion
35-
targetSdk = targetSdkVersion
3635
multiDexEnabled = true
3736
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3837
consumerProguardFiles("proguard.txt")
@@ -46,7 +45,11 @@ android {
4645
targetCompatibility = JavaVersion.VERSION_1_8
4746
}
4847
kotlinOptions { jvmTarget = "1.8" }
49-
testOptions.unitTests.isIncludeAndroidResources = true
48+
testOptions {
49+
targetSdk = targetSdkVersion
50+
unitTests { isIncludeAndroidResources = true }
51+
}
52+
lint { targetSdk = targetSdkVersion }
5053
}
5154

5255
dependencies {

‎firebase-components/firebase-components.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ android {
2323
val compileSdkVersion: Int by rootProject
2424
val targetSdkVersion: Int by rootProject
2525
val minSdkVersion: Int by rootProject
26+
2627
compileSdk = compileSdkVersion
2728
namespace = "com.google.firebase.components"
2829
defaultConfig {
2930
minSdk = minSdkVersion
30-
targetSdk = targetSdkVersion
3131
multiDexEnabled = true
3232
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3333
consumerProguardFiles("proguard.txt")
@@ -36,7 +36,11 @@ android {
3636
sourceCompatibility = JavaVersion.VERSION_1_8
3737
targetCompatibility = JavaVersion.VERSION_1_8
3838
}
39-
testOptions.unitTests.isIncludeAndroidResources = true
39+
testOptions {
40+
targetSdk = targetSdkVersion
41+
unitTests { isIncludeAndroidResources = true }
42+
}
43+
lint { targetSdk = targetSdkVersion }
4044
}
4145

4246
dependencies {

‎firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,18 @@ android {
3434
namespace = "com.google.firebase.dynamicloading"
3535
defaultConfig {
3636
minSdk = minSdkVersion
37-
targetSdk = targetSdkVersion
3837
multiDexEnabled = true
3938
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4039
}
4140
compileOptions {
4241
sourceCompatibility = JavaVersion.VERSION_1_8
4342
targetCompatibility = JavaVersion.VERSION_1_8
4443
}
45-
testOptions.unitTests.isIncludeAndroidResources = true
44+
testOptions {
45+
targetSdk = targetSdkVersion
46+
unitTests { isIncludeAndroidResources = true }
47+
}
48+
lint { targetSdk = targetSdkVersion }
4649
}
4750

4851
dependencies {

‎firebase-config-interop/firebase-config-interop.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ android {
3131

3232
defaultConfig {
3333
minSdk = minSdkVersion
34-
targetSdk = targetSdkVersion
3534

3635
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3736
}
@@ -40,6 +39,9 @@ android {
4039
sourceCompatibility = JavaVersion.VERSION_1_8
4140
targetCompatibility = JavaVersion.VERSION_1_8
4241
}
42+
43+
testOptions { targetSdk = targetSdkVersion }
44+
lint { targetSdk = targetSdkVersion }
4345
}
4446

4547
dependencies {

‎firebase-config/firebase-config.gradle.kts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ android {
3838

3939
defaultConfig {
4040
minSdk = 21
41-
targetSdk = targetSdkVersion
4241
multiDexEnabled = true
4342
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4443
}
@@ -49,8 +48,14 @@ android {
4948
sourceCompatibility = JavaVersion.VERSION_1_8
5049
targetCompatibility = JavaVersion.VERSION_1_8
5150
}
51+
5252
kotlinOptions { jvmTarget = "1.8" }
53-
testOptions.unitTests.isIncludeAndroidResources = true
53+
54+
testOptions {
55+
targetSdk = targetSdkVersion
56+
unitTests { isIncludeAndroidResources = true }
57+
}
58+
lint { targetSdk = targetSdkVersion }
5459
}
5560

5661
dependencies {

‎firebase-database-collection/firebase-database-collection.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ android {
2727
compileSdk = compileSdkVersion
2828

2929
namespace = "com.google.firebase.database.collection"
30-
defaultConfig {
31-
minSdk = minSdkVersion
32-
targetSdk = targetSdkVersion
33-
}
30+
defaultConfig { minSdk = minSdkVersion }
3431

3532
compileOptions {
3633
sourceCompatibility = JavaVersion.VERSION_1_8
3734
targetCompatibility = JavaVersion.VERSION_1_8
3835
}
36+
testOptions { targetSdk = targetSdkVersion }
37+
lint { targetSdk = targetSdkVersion }
3938
}
4039

4140
dependencies {

‎firebase-database/firebase-database.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ android {
3838
namespace = "com.google.firebase.database"
3939
defaultConfig {
4040
minSdk = minSdkVersion
41-
targetSdk = targetSdkVersion
4241
multiDexEnabled = true
4342
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4443
}
@@ -56,7 +55,12 @@ android {
5655
kotlinOptions { jvmTarget = "1.8" }
5756

5857
packagingOptions.resources.excludes += "META-INF/DEPENDENCIES"
59-
testOptions.unitTests.isIncludeAndroidResources = true
58+
59+
testOptions {
60+
targetSdk = targetSdkVersion
61+
unitTests { isIncludeAndroidResources = true }
62+
}
63+
lint { targetSdk = targetSdkVersion }
6064
}
6165
}
6266

‎firebase-dataconnect/firebase-dataconnect.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,15 @@ android {
5757

5858
@Suppress("UnstableApiUsage")
5959
testOptions {
60+
targetSdk = targetSdkVersion
6061
unitTests {
6162
isIncludeAndroidResources = true
6263
isReturnDefaultValues = true
6364
}
6465
}
6566

67+
lint { targetSdk = targetSdkVersion }
68+
6669
packaging {
6770
resources {
6871
excludes.add("META-INF/LICENSE.md")

‎firebase-functions/firebase-functions.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ android {
4040
compileSdk = compileSdkVersion
4141
defaultConfig {
4242
minSdk = minSdkVersion
43-
targetSdk = targetSdkVersion
4443
multiDexEnabled = true
4544
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4645
consumerProguardFiles("proguard.txt")
@@ -51,7 +50,11 @@ android {
5150
targetCompatibility = JavaVersion.VERSION_1_8
5251
}
5352
kotlinOptions { jvmTarget = "1.8" }
54-
testOptions.unitTests.isIncludeAndroidResources = true
53+
testOptions {
54+
targetSdk = targetSdkVersion
55+
unitTests { isIncludeAndroidResources = true }
56+
}
57+
lint { targetSdk = targetSdkVersion }
5558
}
5659

5760
// Enable Kotlin "Explicit API Mode". This causes the Kotlin compiler to fail if any

‎firebase-sessions/firebase-sessions.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ android {
3939
compileSdk = compileSdkVersion
4040
defaultConfig {
4141
minSdk = minSdkVersion
42-
targetSdk = targetSdkVersion
4342
multiDexEnabled = true
4443
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4544
}
@@ -48,7 +47,11 @@ android {
4847
targetCompatibility = JavaVersion.VERSION_1_8
4948
}
5049
kotlinOptions { jvmTarget = "1.8" }
51-
testOptions.unitTests.isIncludeAndroidResources = true
50+
testOptions {
51+
targetSdk = targetSdkVersion
52+
unitTests { isIncludeAndroidResources = true }
53+
}
54+
lint { targetSdk = targetSdkVersion }
5255
}
5356

5457
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs::class.java).configureEach {

‎firebase-vertexai/firebase-vertexai.gradle.kts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ android {
4141
compileSdk = 34
4242
defaultConfig {
4343
minSdk = 21
44-
targetSdk = 34
4544
consumerProguardFiles("consumer-rules.pro")
4645
multiDexEnabled = true
4746
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -58,9 +57,13 @@ android {
5857
}
5958
kotlinOptions { jvmTarget = "1.8" }
6059
testOptions {
61-
unitTests.isIncludeAndroidResources = true
62-
unitTests.isReturnDefaultValues = true
60+
targetSdk = targetSdkVersion
61+
unitTests {
62+
isIncludeAndroidResources = true
63+
isReturnDefaultValues = true
64+
}
6365
}
66+
lint { targetSdk = targetSdkVersion }
6467
}
6568

6669
// Enable Kotlin "Explicit API Mode". This causes the Kotlin compiler to fail if any

0 commit comments

Comments
 (0)