Merge remote-tracking branch 'origin/main' into UserDefinedEnumsInternal

Author: dconeybe

.github/workflows/dataconnect.yml

@@ -134,6 +134,7 @@ jobs:
 
           ./gradlew \
             --profile \
+            --warning-mode all \
             ${{ (inputs.gradleInfoLog && '--info') || '' }} \
             :firebase-dataconnect:assembleDebugAndroidTest
 
@@ -222,7 +223,7 @@ jobs:
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
           script: |
-            set -eux && ./gradlew ${{ (inputs.gradleInfoLog && '--info') || '' }} :firebase-dataconnect:connectedCheck :firebase-dataconnect:connectors:connectedCheck
+            set -eux && ./gradlew --warning-mode all ${{ (inputs.gradleInfoLog && '--info') || '' }} :firebase-dataconnect:connectedCheck :firebase-dataconnect:connectors:connectedCheck
 
       - name: Upload Log Files
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1

.github/workflows/dataconnect_demo_app.yml

@@ -108,13 +108,15 @@ jobs:
           --project-dir firebase-dataconnect/demo \
           ${{ (inputs.gradleInfoLog && '--info') || '' }} \
           --profile \
+          --warning-mode all \
           -PdataConnect.demo.firebaseCommand=${{ env.FDC_FIREBASE_COMMAND }} \
           assemble test
 
       - name: gradle dokkaGeneratePublicationHtml
         run: |
           set -x
           firebase-dataconnect/demo/gradlew \
+          --warning-mode all \
           --project-dir firebase-dataconnect/demo \
           ${{ (inputs.gradleInfoLog && '--info') || '' }} \
           dokkaGeneratePublicationHtml
@@ -176,6 +178,7 @@ jobs:
         run: |
           set -x
           firebase-dataconnect/demo/gradlew \
+          --warning-mode all \
           --project-dir firebase-dataconnect/demo \
           --no-daemon \
           ${{ (inputs.gradleInfoLog && '--info') || '' }} \

firebase-dataconnect/CHANGELOG.md

@@ -2,8 +2,7 @@
 
 - [changed] Ignore unknown fields in response data instead of throwing a
   `DataConnectOperationException` with message "decoding data from the server's response failed: An
-  unknown field for index -3"
-  ([#7314](https://github.com/firebase/firebase-android-sdk/pull/7314))
+  unknown field for index -3" ([#7314](https://github.com/firebase/firebase-android-sdk/pull/7314))
 - [changed] Added classes `EnumValue` and `EnumValueSerializer`. These classes are identical to
   those produced by the Data Connect code generator; however, a future version of the code generator
   will start using these classes from the SDK rather than generating them.

firebase-dataconnect/androidTestutil/androidTestutil.gradle.kts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("com.android.library")
@@ -31,14 +31,16 @@ android {
   compileSdk = compileSdkVersion
   defaultConfig {
     minSdk = minSdkVersion
-    targetSdk = targetSdkVersion
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
-  kotlinOptions { jvmTarget = "1.8" }
+
+  @Suppress("UnstableApiUsage") testOptions { targetSdk = targetSdkVersion }
+
+  lint { targetSdk = targetSdkVersion }
 
   packaging {
     resources {
@@ -48,6 +50,13 @@ android {
   }
 }
 
+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.JVM_1_8
+    optIn.add("kotlin.RequiresOptIn")
+  }
+}
+
 dependencies {
   implementation(project(":firebase-dataconnect"))
   implementation(project(":firebase-dataconnect:testutil"))
@@ -66,7 +75,3 @@ dependencies {
   implementation(libs.truth)
   implementation(libs.turbine)
 }
-
-tasks.withType<KotlinCompile>().all {
-  kotlinOptions { freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn") }
-}

firebase-dataconnect/connectors/connectors.gradle.kts

@@ -15,7 +15,9 @@
  */
 
 import com.google.firebase.dataconnect.gradle.plugin.UpdateDataConnectExecutableVersionsTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("com.android.library")
@@ -33,23 +35,24 @@ android {
   compileSdk = compileSdkVersion
   defaultConfig {
     minSdk = minSdkVersion
-    targetSdk = targetSdkVersion
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
-  kotlinOptions { jvmTarget = "1.8" }
 
   @Suppress("UnstableApiUsage")
   testOptions {
+    targetSdk = targetSdkVersion
     unitTests {
       isIncludeAndroidResources = true
       isReturnDefaultValues = true
     }
   }
 
+  lint { targetSdk = targetSdkVersion }
+
   packaging {
     resources {
       excludes.add("META-INF/LICENSE.md")
@@ -63,6 +66,13 @@ android {
   }
 }
 
+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.JVM_1_8
+    optIn.add("kotlin.RequiresOptIn")
+  }
+}
+
 dependencies {
   implementation(project(":firebase-dataconnect"))
   implementation(libs.kotlinx.coroutines.core)
@@ -92,21 +102,15 @@ dependencies {
   androidTestImplementation(libs.turbine)
 }
 
-tasks.withType<KotlinCompile>().all {
-  kotlinOptions { freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn") }
-}
-
 // Enable Kotlin "Explicit API Mode". This causes the Kotlin compiler to fail if any
 // classes, methods, or properties have implicit `public` visibility. This check helps
 // avoid  accidentally leaking elements into the public API, requiring that any public
 // element be explicitly declared as `public`.
 // https://github.com/Kotlin/KEEP/blob/master/proposals/explicit-api-mode.md
 // https://chao2zhang.medium.com/explicit-api-mode-for-kotlin-on-android-b8264fdd76d1
-tasks.withType<KotlinCompile>().all {
+tasks.withType<KotlinJvmCompile>().configureEach {
   if (!name.contains("test", ignoreCase = true)) {
-    if (!kotlinOptions.freeCompilerArgs.contains("-Xexplicit-api=strict")) {
-      kotlinOptions.freeCompilerArgs += "-Xexplicit-api=strict"
-    }
+    compilerOptions.freeCompilerArgs.add("-Xexplicit-api=strict")
   }
 }
 

firebase-dataconnect/demo/build.gradle.kts

@@ -16,6 +16,7 @@
 
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import java.nio.charset.StandardCharsets
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   // Use whichever versions of these dependencies suit your application.
@@ -83,7 +84,13 @@ android {
     isCoreLibraryDesugaringEnabled = true
   }
   buildFeatures.viewBinding = true
-  kotlinOptions.jvmTarget = "1.8"
+}
+
+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.JVM_1_8
+    optIn.add("kotlin.RequiresOptIn")
+  }
 }
 
 spotless {
@@ -115,7 +122,7 @@ spotless {
     target("**/*.xml")
     targetExclude("build/")
     trimTrailingWhitespace()
-    indentWithSpaces(2)
+    leadingTabsToSpaces(2)
     endWithNewline()
   }
 }

firebase-dataconnect/firebase-dataconnect.gradle.kts

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("firebase-library")
@@ -28,6 +30,7 @@ firebaseLibrary {
   libraryGroup = "dataconnect"
   testLab.enabled = false
   publishJavadoc = true
+  onlyPublishKotlindoc = true
   releaseNotes {
     name.set("{{data_connect_short}}")
     versionName.set("data-connect")
@@ -43,15 +46,13 @@ android {
   compileSdk = compileSdkVersion
   defaultConfig {
     minSdk = minSdkVersion
-    targetSdk = targetSdkVersion
     multiDexEnabled = true
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
-  kotlinOptions { jvmTarget = "1.8" }
 
   @Suppress("UnstableApiUsage")
   testOptions {
@@ -72,6 +73,13 @@ android {
   }
 }
 
+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.JVM_1_8
+    optIn.add("kotlin.RequiresOptIn")
+  }
+}
+
 protobuf {
   protoc { artifact = "${libs.protoc.get()}" }
   plugins {
@@ -144,20 +152,14 @@ dependencies {
   androidTestImplementation(libs.turbine)
 }
 
-tasks.withType<KotlinCompile>().all {
-  kotlinOptions { freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn") }
-}
-
 // Enable Kotlin "Explicit API Mode". This causes the Kotlin compiler to fail if any
 // classes, methods, or properties have implicit `public` visibility. This check helps
 // avoid  accidentally leaking elements into the public API, requiring that any public
 // element be explicitly declared as `public`.
 // https://github.com/Kotlin/KEEP/blob/master/proposals/explicit-api-mode.md
 // https://chao2zhang.medium.com/explicit-api-mode-for-kotlin-on-android-b8264fdd76d1
-tasks.withType<KotlinCompile>().all {
+tasks.withType<KotlinJvmCompile>().configureEach {
   if (!name.contains("test", ignoreCase = true)) {
-    if (!kotlinOptions.freeCompilerArgs.contains("-Xexplicit-api=strict")) {
-      kotlinOptions.freeCompilerArgs += "-Xexplicit-api=strict"
-    }
+    compilerOptions.freeCompilerArgs.add("-Xexplicit-api=strict")
   }
 }

firebase-dataconnect/gradleplugin/plugin/src/main/kotlin/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableDownloadTask.kt

@@ -20,12 +20,14 @@ import java.net.HttpURLConnection
 import java.net.URL
 import java.security.MessageDigest
 import java.util.regex.Pattern
+import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 import org.gradle.api.DefaultTask
 import org.gradle.api.Task
 import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
@@ -34,6 +36,7 @@ import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
+import org.gradle.process.ExecOperations
 
 abstract class DataConnectExecutableDownloadTask : DefaultTask() {
 
@@ -47,6 +50,10 @@ abstract class DataConnectExecutableDownloadTask : DefaultTask() {
 
   @get:OutputFile abstract val outputFile: RegularFileProperty
 
+  @get:Inject abstract val fileSystemOperations: FileSystemOperations
+
+  @get:Inject abstract val execOperations: ExecOperations
+
   @TaskAction
   fun run() {
     val inputFile: File? = inputFile.orNull?.asFile
@@ -62,7 +69,7 @@ abstract class DataConnectExecutableDownloadTask : DefaultTask() {
     logger.info("outputFile: {}", outputFile)
 
     logger.info("Deleting build directory: {}", buildDirectory)
-    project.delete(buildDirectory)
+    fileSystemOperations.delete { it.delete(buildDirectory) }
 
     if (inputFile !== null && version !== null) {
       throw DataConnectGradleException(
@@ -74,7 +81,7 @@ abstract class DataConnectExecutableDownloadTask : DefaultTask() {
     } else if (inputFile !== null) {
       runWithFile(inputFile = inputFile, outputFile = outputFile)
     } else if (version !== null) {
-      downloadDataConnectExecutable(version, operatingSystem, outputFile)
+      downloadDataConnectExecutable(version, operatingSystem, outputFile, execOperations)
       verifyOutputFile(outputFile, operatingSystem, version)
     } else {
       throw DataConnectGradleException(
@@ -184,7 +191,7 @@ abstract class DataConnectExecutableDownloadTask : DefaultTask() {
     }
 
     logger.info("Copying {} to {}", inputFile, outputFile)
-    project.copy {
+    fileSystemOperations.copy {
       it.from(inputFile)
       it.into(outputFile.parentFile)
       it.rename(Pattern.quote(inputFile.name), Pattern.quote(outputFile.name))
@@ -195,7 +202,8 @@ abstract class DataConnectExecutableDownloadTask : DefaultTask() {
     fun Task.downloadDataConnectExecutable(
       version: String,
       operatingSystem: OperatingSystem,
-      outputFile: File
+      outputFile: File,
+      execOperations: ExecOperations
     ) {
       val osName =
         when (operatingSystem) {
@@ -208,7 +216,7 @@ abstract class DataConnectExecutableDownloadTask : DefaultTask() {
         URL("https://storage.googleapis.com/firemat-preview-drop/emulator/$downloadFileName")
 
       logger.info("Downloading {} to {}", url, outputFile)
-      project.mkdir(outputFile.parentFile)
+      outputFile.parentFile.mkdirs()
 
       val connection = url.openConnection() as HttpURLConnection
       connection.requestMethod = "GET"
@@ -251,7 +259,7 @@ abstract class DataConnectExecutableDownloadTask : DefaultTask() {
       }
 
       if (operatingSystem != OperatingSystem.Windows) {
-        project.exec { execSpec ->
+        execOperations.exec { execSpec ->
           execSpec.run {
             executable = "chmod"
             args = listOf("a+x", outputFile.absolutePath)

firebase-dataconnect/gradleplugin/plugin/src/main/kotlin/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableLauncher.kt

@@ -17,6 +17,7 @@ package com.google.firebase.dataconnect.gradle.plugin
 
 import java.io.File
 import org.gradle.api.Task
+import org.gradle.process.ExecOperations
 
 interface DataConnectExecutableConfig {
   var outputDirectory: File?
@@ -33,6 +34,7 @@ fun Task.runDataConnectExecutable(
   dataConnectExecutable: File,
   subCommand: List<String>,
   configDirectory: File,
+  execOperations: ExecOperations,
   configure: DataConnectExecutableConfig.() -> Unit,
 ) {
   val config =
@@ -48,11 +50,11 @@ fun Task.runDataConnectExecutable(
       }
       .apply(configure)
 
-  val logFile = config.logFile?.also { project.mkdir(it.parentFile) }
+  val logFile = config.logFile?.also { it.parentFile.mkdirs() }
   val logFileStream = logFile?.outputStream()
 
   try {
-    project.exec { execSpec ->
+    execOperations.exec { execSpec ->
       execSpec.run {
         executable(dataConnectExecutable)
         isIgnoreExitValue = false