Merge branch 'main' into dconeybe/dataconnect/UserDefinedEnumsInternal

Author: dconeybe

.github/workflows/dataconnect.yml

@@ -34,7 +34,7 @@ env:
   FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
   FDC_ANDROID_EMULATOR_API_LEVEL: ${{ inputs.androidEmulatorApiLevel || '34' }}
   FDC_NODEJS_VERSION: ${{ inputs.nodeJsVersion || '20' }}
-  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.10.1' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.0' }}
   FDC_FIREBASE_TOOLS_DIR: /tmp/firebase-tools
   FDC_FIREBASE_COMMAND: /tmp/firebase-tools/node_modules/.bin/firebase
   FDC_PYTHON_VERSION: ${{ inputs.pythonVersion || '3.13' }}

.github/workflows/dataconnect_demo_app.yml

@@ -18,7 +18,7 @@ on:
 
 env:
   FDC_NODE_VERSION: ${{ inputs.nodeVersion || '20' }}
-  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.10.1' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.0' }}
   FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
   FDC_FIREBASE_TOOLS_DIR: ${{ github.workspace }}/firebase-tools
   FDC_FIREBASE_COMMAND: ${{ github.workspace }}/firebase-tools/node_modules/.bin/firebase

firebase-dataconnect/demo/build.gradle.kts

@@ -19,35 +19,35 @@ import java.nio.charset.StandardCharsets
 
 plugins {
   // Use whichever versions of these dependencies suit your application.
-  // The versions shown here were the latest versions as of June 10, 2025.
+  // The versions shown here were the latest versions as of July 17, 2025.
   // Note, however, that the version of kotlin("plugin.serialization") _must_,
   // in general, match the version of kotlin("android").
-  id("com.android.application") version "8.11.0"
-  id("com.google.gms.google-services") version "4.4.2"
+  id("com.android.application") version "8.11.1"
+  id("com.google.gms.google-services") version "4.4.3"
   val kotlinVersion = "2.1.10"
   kotlin("android") version kotlinVersion
   kotlin("plugin.serialization") version kotlinVersion
 
   // The following code in this "plugins" block can be omitted from customer
   // facing documentation as it is an implementation detail of this application.
-  id("com.diffplug.spotless") version "7.0.0.BETA4"
+  id("com.diffplug.spotless") version "7.1.0"
 
   id("org.jetbrains.dokka") version "2.0.0"
 }
 
 dependencies {
   // Use whichever versions of these dependencies suit your application.
-  // The versions shown here were the latest versions as of June 10, 2025.
+  // The versions shown here were the latest versions as of July 17, 2025.
 
   // Data Connect
-  implementation(platform("com.google.firebase:firebase-bom:33.15.0"))
+  implementation(platform("com.google.firebase:firebase-bom:33.16.0"))
   implementation("com.google.firebase:firebase-dataconnect")
-  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
-  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
-  implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.1")
+  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
+  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
+  implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.9.0")
   implementation("androidx.appcompat:appcompat:1.7.1")
   implementation("androidx.activity:activity-ktx:1.10.1")
-  implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1")
+  implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2")
   implementation("com.google.android.material:material:1.12.0")
 
   // The following code in this "dependencies" block can be omitted from customer
@@ -70,10 +70,10 @@ dokka {
 
 android {
   namespace = "com.google.firebase.dataconnect.minimaldemo"
-  compileSdk = 35
+  compileSdk = 36
   defaultConfig {
     minSdk = 23
-    targetSdk = 35
+    targetSdk = 36
     versionCode = 1
     versionName = "1.0"
   }
@@ -138,6 +138,8 @@ abstract class DataConnectGenerateSourcesTask : DefaultTask() {
   @get:PathSensitive(PathSensitivity.ABSOLUTE)
   abstract val dataConnectEmulatorExecutable: RegularFileProperty
 
+  @get:Input @get:Optional abstract val dataConnectPreviewFlags: Property<String>
+
   @get:OutputDirectory abstract val outputDirectory: DirectoryProperty
 
   @get:Internal abstract val workDirectory: DirectoryProperty
@@ -155,6 +157,7 @@ abstract class DataConnectGenerateSourcesTask : DefaultTask() {
     val firebaseCommand: String = firebaseCommand.get()
     val nodeExecutableDirectory: String? = nodeExecutableDirectory.orNull
     val dataConnectEmulatorExecutable: File? = dataConnectEmulatorExecutable.orNull?.asFile
+    val dataConnectPreviewFlags: String? = dataConnectPreviewFlags.orNull
     val outputDirectory: File = outputDirectory.get().asFile
     val workDirectory: File = workDirectory.get().asFile
 
@@ -163,6 +166,7 @@ abstract class DataConnectGenerateSourcesTask : DefaultTask() {
     logger.info("firebaseCommand: {}", firebaseCommand)
     logger.info("nodeExecutableDirectory: {}", nodeExecutableDirectory)
     logger.info("dataConnectEmulatorExecutable: {}", dataConnectEmulatorExecutable)
+    logger.info("dataConnectPreviewFlags: {}", dataConnectPreviewFlags)
     logger.info("outputDirectory: {}", outputDirectory.absolutePath)
     logger.info("workDirectory: {}", workDirectory.absolutePath)
 
@@ -187,14 +191,15 @@ abstract class DataConnectGenerateSourcesTask : DefaultTask() {
               firebaseCommand = firebaseCommand,
               nodeExecutableDirectory = nodeExecutableDirectory,
               dataConnectEmulatorExecutable = dataConnectEmulatorExecutable,
+              dataConnectPreviewFlags = dataConnectPreviewFlags,
               path = providerFactory.environmentVariable("PATH").orNull,
             )
             args("--debug", "dataconnect:sdk:generate")
             workingDir(inputDirectory)
             isIgnoreExitValue = false
-            if (logStream !== null) {
-              standardOutput = logStream
-              errorOutput = logStream
+            logStream?.let {
+              standardOutput = it
+              errorOutput = it
             }
           }
         }
@@ -215,31 +220,21 @@ abstract class DataConnectGenerateSourcesTask : DefaultTask() {
       firebaseCommand: String,
       nodeExecutableDirectory: String?,
       dataConnectEmulatorExecutable: File?,
+      dataConnectPreviewFlags: String?,
       path: String?,
     ) {
       execSpec.setCommandLine(firebaseCommand)
 
-      val newPath: String? =
-        if (nodeExecutableDirectory === null) {
-          null
-        } else {
-          if (path === null) {
-            nodeExecutableDirectory
-          } else {
-            nodeExecutableDirectory + File.pathSeparator + path
-          }
-        }
-
-      if (newPath !== null) {
+      nodeExecutableDirectory?.let {
+        val newPath = if (path === null) it else (it + File.pathSeparator + path)
         execSpec.environment("PATH", newPath)
       }
 
-      if (dataConnectEmulatorExecutable !== null) {
-        execSpec.environment(
-          "DATACONNECT_EMULATOR_BINARY_PATH",
-          dataConnectEmulatorExecutable.absolutePath,
-        )
+      dataConnectEmulatorExecutable?.let {
+        execSpec.environment("DATACONNECT_EMULATOR_BINARY_PATH", it.absolutePath)
       }
+
+      dataConnectPreviewFlags?.let { execSpec.environment("DATA_CONNECT_PREVIEW", it) }
     }
   }
 }
@@ -301,6 +296,9 @@ run {
           projectDirectory.file(it)
         }
 
+      dataConnectPreviewFlags =
+        project.providers.gradleProperty("dataConnect.demo.dataConnectPreviewFlags")
+
       val path = providers.environmentVariable("PATH")
       firebaseToolsVersion =
         providers
@@ -310,6 +308,7 @@ run {
               firebaseCommand = firebaseCommand.get(),
               nodeExecutableDirectory = nodeExecutableDirectory.orNull,
               dataConnectEmulatorExecutable = dataConnectEmulatorExecutable.orNull?.asFile,
+              dataConnectPreviewFlags = dataConnectPreviewFlags.orNull,
               path = path.orNull,
             )
             args("--version")

firebase-dataconnect/demo/gradle.properties

@@ -29,3 +29,8 @@ org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 // downloading an official version and using it.
 // See build.gradle.kts for details.
 //dataConnect.demo.dataConnectEmulatorExecutable=/path/to/cli
+
+// A comma-separated list of "preview flags" to specify to the Data Connect emulator and codegen.
+// This is used to enable features that are not (yet) intended for end-user consumption.
+// See build.gradle.kts for details.
+//dataConnect.demo.dataConnectPreviewFlags=flag1,flag2,flag3

firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json

@@ -1,5 +1,5 @@
 {
-  "defaultVersion": "2.9.1",
+  "defaultVersion": "2.10.0",
   "versions": [
     {
       "version": "1.3.4",
@@ -882,6 +882,24 @@
       "os": "linux",
       "size": 29233336,
       "sha512DigestHex": "e320752834236d4b1cb67fa41c70e11f5b374832ffb4e2be31a06f6860ec389833fad62b3070d3ec16ea40fcf719bee8855acacb0627d943f0b8807cecaed564"
+    },
+    {
+      "version": "2.10.0",
+      "os": "windows",
+      "size": 29824000,
+      "sha512DigestHex": "fb430463430af8781c9b1c40488c3abf9362df076be43e966d54cf7d1d8cc39436cc7fc361c3ba45105b58ec6d10021456cb22f7ac050905a06d86127c22c5cb"
+    },
+    {
+      "version": "2.10.0",
+      "os": "macos",
+      "size": 29332320,
+      "sha512DigestHex": "9c4aa8d4dbea8bde36a53e1477d557c6a31dc16ca25ded38a0b06a5a4849222779be6bf6559c0e3c7f89970c3e9aeda5cbc15573a0832bd83c8d463294bc7f4f"
+    },
+    {
+      "version": "2.10.0",
+      "os": "linux",
+      "size": 29257912,
+      "sha512DigestHex": "93e71bdc76510cf70410338f016819b97abe7a4b372ee52c0f59c0c58f23814c3f94cf2e6772dce5a8fbabda582f363cabb808b4284dfa142b6bc94d305088a4"
     }
   ]
 }

firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/serializers/JavaTimeLocalDateSerializerUnitTest.kt

@@ -222,7 +222,8 @@ class JavaTimeLocalDateSerializerUnitTest {
     }
 
     fun Arb.Companion.unparseableDash(): Arb<String> {
-      val invalidString = string(1..5, codepoints.filterNot { it.value == '-'.code })
+      val invalidString =
+        string(1..5, codepoints.filterNot { it.value == '-'.code || Character.isDigit(it.value) })
       return arbitrary { rs ->
         val flags = Array(3) { rs.random.nextBoolean() }
         if (!flags[0]) {

firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/serializers/KotlinxDatetimeLocalDateSerializerUnitTest.kt

@@ -225,7 +225,8 @@ class KotlinxDatetimeLocalDateSerializerUnitTest {
     }
 
     fun Arb.Companion.unparseableDash(): Arb<String> {
-      val invalidString = string(1..5, codepoints.filterNot { it.value == '-'.code })
+      val invalidString =
+        string(1..5, codepoints.filterNot { it.value == '-'.code || Character.isDigit(it.value) })
       return arbitrary { rs ->
         val flags = Array(3) { rs.random.nextBoolean() }
         if (!flags[0]) {

firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/serializers/LocalDateSerializerUnitTest.kt

@@ -206,10 +206,7 @@ class LocalDateSerializerUnitTest {
 
     fun Arb.Companion.unparseableDash(): Arb<String> {
       val invalidString =
-        string(
-          1..5,
-          codepoints.filterNot { it.value == '-'.code || it.value in '0'.code..'9'.code }
-        )
+        string(1..5, codepoints.filterNot { it.value == '-'.code || Character.isDigit(it.value) })
       return arbitrary { rs ->
         val flags = Array(3) { rs.random.nextBoolean() }
         if (!flags[0]) {

plugins/build.gradle.kts

@@ -60,7 +60,7 @@ dependencies {
   implementation(libs.bundles.maven.resolver)
 
   implementation("com.google.guava:guava:31.1-jre")
-  implementation("org.ow2.asm:asm-tree:9.5")
+  implementation("org.ow2.asm:asm-tree:9.8")
   implementation("org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r")
   implementation(libs.kotlinx.serialization.json)
   implementation("com.google.code.gson:gson:2.8.9")