dataconnect/demo: upgrade dependencies to fix build

.github/workflows/dataconnect_demo_app.yml

@@ -26,7 +26,7 @@ on:
 env:
   FDC_NODE_VERSION: ${{ inputs.nodeVersion || '24' }}
   FDC_INPUT_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion }}
-  FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
+  FDC_JAVA_VERSION: ${{ inputs.javaVersion || '21' }}
   FDC_FIREBASE_TOOLS_DIR: ${{ github.workspace }}/firebase-tools
   FDC_FIREBASE_COMMAND: ${{ github.workspace }}/firebase-tools/node_modules/.bin/firebase
   FDC_PYTHON_VERSION: ${{ inputs.pythonVersion || '3.13' }}
@@ -89,6 +89,8 @@ jobs:
           cd "$FDC_FIREBASE_TOOLS_DIR"
           echo '{}' > package.json
           npm install --fund=false --audit=false --save --save-exact firebase-tools@"$FDC_FIREBASE_TOOLS_VERSION"
+          npm install-scripts approve google-logging-utils protobufjs re2
+          npm rebuild
 
       - name: install firebase-tools from package-lock.json
         if: steps.package_json_lock.outputs.cache-hit == 'true'
@@ -147,6 +149,7 @@ jobs:
           --warning-mode all \
           --project-dir firebase-dataconnect/demo \
           ${FDC_GRADLE_INFO_FLAG:+"$FDC_GRADLE_INFO_FLAG"} \
+          -PdataConnect.demo.firebaseCommand="$FDC_FIREBASE_COMMAND" \
           dokkaGeneratePublicationHtml
 
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1

firebase-dataconnect/demo/build.gradle.kts

@@ -20,36 +20,35 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   // Use whichever versions of these dependencies suit your application.
-  // The versions shown here were the latest versions as of July 17, 2025.
+  // The versions shown here were the latest versions as of October 09, 2026.
   // 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.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
+  // in general, match the version of the kotlin compiler bundled with the
+  // Android Gradle Plugin id("com.android.application").
+  id("com.android.application") version "9.4.1"
+  kotlin("plugin.serialization") version "2.2.10"
+  id("com.google.gms.google-services") version "4.5.0"
 
   // 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.1.0"
+  id("com.diffplug.spotless") version "8.10.4"
 
-  id("org.jetbrains.dokka") version "2.0.0"
+  id("org.jetbrains.dokka") version "2.2.0"
 }
 
 dependencies {
   // Use whichever versions of these dependencies suit your application.
-  // The versions shown here were the latest versions as of July 17, 2025.
+  // The versions shown here were the latest versions as of October 09, 2026.
 
   // Data Connect
-  implementation(platform("com.google.firebase:firebase-bom:33.16.0"))
+  implementation(platform("com.google.firebase:firebase-bom:35.0.0"))
   implementation("com.google.firebase:firebase-dataconnect")
-  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.2")
-  implementation("com.google.android.material:material:1.12.0")
+  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0")
+  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0")
+  implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.11.0")
+  implementation("androidx.appcompat:appcompat:1.8.0")
+  implementation("androidx.activity:activity-ktx:1.13.0")
+  implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.11.0")
+  implementation("com.google.android.material:material:1.14.0")
 
   // The following code in this "dependencies" block can be omitted from customer
   // facing documentation as it is an implementation detail of this application.
@@ -60,8 +59,8 @@ dependencies {
 
 dokka {
   moduleName.set("Data Connect Demo")
-  dokkaSourceSets.main {
-    sourceRoots.from(layout.buildDirectory.dir("dataConnect/generatedSources/").get())
+  dokkaSourceSets.configureEach {
+    sourceRoots.from(layout.buildDirectory.dir("dataConnect/generatedSources/"))
   }
 }
 
@@ -71,30 +70,30 @@ dokka {
 
 android {
   namespace = "com.google.firebase.dataconnect.minimaldemo"
-  compileSdk = 36
+  compileSdk = 37
   defaultConfig {
     minSdk = 24
-    targetSdk = 36
+    targetSdk = 37
     versionCode = 1
     versionName = "1.0"
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
     isCoreLibraryDesugaringEnabled = true
   }
   buildFeatures.viewBinding = true
 }
 
 kotlin {
   compilerOptions {
-    jvmTarget = JvmTarget.JVM_1_8
+    jvmTarget = JvmTarget.JVM_11
     optIn.add("kotlin.RequiresOptIn")
   }
 }
 
 spotless {
-  val ktfmtVersion = "0.53"
+  val ktfmtVersion = "0.65"
   kotlin {
     target("**/*.kt")
     targetExclude("build/")
@@ -155,8 +154,6 @@ abstract class DataConnectGenerateSourcesTask : DefaultTask() {
 
   @get:Inject protected abstract val providerFactory: ProviderFactory
 
-  @get:Inject protected abstract val fileSystemOperations: FileSystemOperations
-
   @TaskAction
   fun run() {
     val inputDirectory: File = inputDirectory.get().dir
@@ -252,7 +249,7 @@ abstract class DataConnectGenerateSourcesTask : DefaultTask() {
 }
 
 @DisableCachingByDefault(
-  because = "Copying files is not worth caching, just like org.gradle.api.tasks.Copy"
+  because = "Copying files is not worth caching, just like org.gradle.api.tasks.Copy",
 )
 abstract class CopyDirectoryTask : DefaultTask() {
 
@@ -343,15 +340,14 @@ run {
         description =
           "Copy the generated Data Connect Kotlin SDK sources into the " +
             "generated code directory for the \"${variant.name}\" variant."
-        srcDirectory =
-          generateSourcesTask.flatMap {
-            it.outputDirectory.map { outputDirectory ->
-              objectFactory.fileTree().apply {
-                setDir(outputDirectory)
-                exclude("**/*.log")
-              }
+        srcDirectory = generateSourcesTask.flatMap {
+          it.outputDirectory.map { outputDirectory ->
+            objectFactory.fileTree().apply {
+              setDir(outputDirectory)
+              exclude("**/*.log")
             }
           }
+        }
       }
 
     variant.sources.java!!.addGeneratedSourceDirectory(copyTask, CopyDirectoryTask::destDirectory)

firebase-dataconnect/demo/gradle.properties

@@ -6,31 +6,36 @@ android.useAndroidX=true
 
 org.gradle.jvmargs=-Xmx2g
 
-// Use Dokka Gradle Plugin v2, which is technically "experimental"
-// but is fine for our purposes.
-// https://kotlinlang.org/docs/dokka-migration.html
+# Use Dokka Gradle Plugin v2, which is technically "experimental"
+# but is fine for our purposes.
+# https://kotlinlang.org/docs/dokka-migration.html
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 
-// The path of the "firebase" command to use.
-// If not specified, then "firebase" is used, resolved using the PATH environment variable.
-// See build.gradle.kts for details.
-//dataConnect.demo.firebaseCommand=/path/to/firebase
-
-// The path of the directory containing the "node" and "npm" commands.
-// This directory will be prepended to the PATH before running the "firebase" command
-// and may be useful to override the "node" and "npm" executables that get used by it.
-// See build.gradle.kts for details.
-//dataConnect.demo.nodeExecutableDirectory=/path/to/node/bin
-
-// The Data Connect emulator executable to use.
-// If set, the `DATACONNECT_EMULATOR_BINARY_PATH` environment variable will be set before calling
-// the "firebase" command to instruct it to use the specified Data Connect emulator rather than
-// 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
+# The path of the "firebase" command to use.
+# If not specified, then "firebase" is used, resolved using the PATH environment variable.
+# See build.gradle.kts for details.
+#dataConnect.demo.firebaseCommand=/path/to/firebase
+
+# The path of the directory containing the "node" and "npm" commands.
+# This directory will be prepended to the PATH before running the "firebase" command
+# and may be useful to override the "node" and "npm" executables that get used by it.
+# See build.gradle.kts for details.
+#dataConnect.demo.nodeExecutableDirectory=/path/to/node/bin
+
+# The Data Connect emulator executable to use.
+# If set, the `DATACONNECT_EMULATOR_BINARY_PATH` environment variable will be set before calling
+# the "firebase" command to instruct it to use the specified Data Connect emulator rather than
+# 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
+
+# Enabled parallel sync for Gradle 9.4+
+org.gradle.tooling.parallel=true
+android.uniquePackageNames=false
+android.r8.strictFullModeForKeepRules=false

firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists