Merge branch 'main' into rl.maven.update.api

rlazo · web-flow · commit 8b5cb2ab8d9b · 2024-11-08T14:22:14.000-05:00
diff --git 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
@@ -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
@@ -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 {
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ android {`
`31`	`31`
`32`	`32`	`defaultConfig {`
`33`	`33`	`minSdk = minSdkVersion`
`34`		`- targetSdk = targetSdkVersion`
`35`	`34`
`36`	`35`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`37`	`36`	`}`
`@@ -40,6 +39,9 @@ android {`
`40`	`39`	`sourceCompatibility = JavaVersion.VERSION_1_8`
`41`	`40`	`targetCompatibility = JavaVersion.VERSION_1_8`
`42`	`41`	`}`
	`42`	`+`
	`43`	`+ testOptions { targetSdk = targetSdkVersion }`
	`44`	`+ lint { targetSdk = targetSdkVersion }`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ android {`
`38`	`38`	`namespace = "com.google.firebase.database"`
`39`	`39`	`defaultConfig {`
`40`	`40`	`minSdk = minSdkVersion`
`41`		`- targetSdk = targetSdkVersion`
`42`	`41`	`multiDexEnabled = true`
`43`	`42`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`44`	`43`	`}`
`@@ -56,7 +55,12 @@ android {`
`56`	`55`	`kotlinOptions { jvmTarget = "1.8" }`
`57`	`56`
`58`	`57`	`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 }`
`60`	`64`	`}`
`61`	`65`	`}`
`62`	`66`
Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,15 @@ android {`
`57`	`57`
`58`	`58`	`@Suppress("UnstableApiUsage")`
`59`	`59`	`testOptions {`
	`60`	`+ targetSdk = targetSdkVersion`
`60`	`61`	`unitTests {`
`61`	`62`	`isIncludeAndroidResources = true`
`62`	`63`	`isReturnDefaultValues = true`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`
	`67`	`+ lint { targetSdk = targetSdkVersion }`
	`68`	`+`
`66`	`69`	`packaging {`
`67`	`70`	`resources {`
`68`	`71`	`excludes.add("META-INF/LICENSE.md")`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ android {`
`39`	`39`	`compileSdk = compileSdkVersion`
`40`	`40`	`defaultConfig {`
`41`	`41`	`minSdk = minSdkVersion`
`42`		`- targetSdk = targetSdkVersion`
`43`	`42`	`multiDexEnabled = true`
`44`	`43`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`45`	`44`	`}`
`@@ -48,7 +47,11 @@ android {`
`48`	`47`	`targetCompatibility = JavaVersion.VERSION_1_8`
`49`	`48`	`}`
`50`	`49`	`kotlinOptions { jvmTarget = "1.8" }`
`51`		`- testOptions.unitTests.isIncludeAndroidResources = true`
	`50`	`+ testOptions {`
	`51`	`+ targetSdk = targetSdkVersion`
	`52`	`+ unitTests { isIncludeAndroidResources = true }`
	`53`	`+ }`
	`54`	`+ lint { targetSdk = targetSdkVersion }`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs::class.java).configureEach {`