Merge branch 'main' into ep/tutorial-alpha-versions

Author: emilypgoogle

.github/workflows/dataconnect.yml

@@ -13,6 +13,15 @@ on:
   pull_request:
     paths:
       - .github/workflows/dataconnect.yml
+      - gradlew
+      - build.gradle.kts
+      - gradle.properties
+      - gradlew.bat
+      - settings.gradle.kts
+      - subprojects.cfg
+      - 'gradle/**'
+      - 'plugins/**'
+      - '!plugins/**/*.md'
       - 'firebase-dataconnect/**'
       - '!firebase-dataconnect/demo/**'
       - '!firebase-dataconnect/scripts/**'

.github/workflows/dataconnect_demo_app.yml

@@ -106,12 +106,19 @@ jobs:
           set -x
           firebase-dataconnect/demo/gradlew \
           --project-dir firebase-dataconnect/demo \
-          --no-daemon \
           ${{ (inputs.gradleInfoLog && '--info') || '' }} \
           --profile \
           -PdataConnect.demo.firebaseCommand=${{ env.FDC_FIREBASE_COMMAND }} \
           assemble test
 
+      - name: gradle dokkaGeneratePublicationHtml
+        run: |
+          set -x
+          firebase-dataconnect/demo/gradlew \
+          --project-dir firebase-dataconnect/demo \
+          ${{ (inputs.gradleInfoLog && '--info') || '' }} \
+          dokkaGeneratePublicationHtml
+
       - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: apks
@@ -126,6 +133,13 @@ jobs:
           if-no-files-found: warn
           compression-level: 9
 
+      - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        with:
+          name: ktdoc
+          path: firebase-dataconnect/demo/build/dokka/html
+          if-no-files-found: warn
+          compression-level: 9
+
   spotlessCheck:
     continue-on-error: false
     runs-on: ubuntu-latest

ci/fireci/pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
   "pandas==1.5.3",
   "PyGithub==1.58.2",
   "pystache==0.6.0",
-  "requests==2.32.2",
+  "requests==2.32.4",
   "seaborn==0.12.2",
   "PyYAML==6.0.1",
   "termcolor==2.4.0",

firebase-dataconnect/demo/build.gradle.kts

@@ -31,6 +31,8 @@ plugins {
   // 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("org.jetbrains.dokka") version "2.0.0"
 }
 
 dependencies {
@@ -55,6 +57,13 @@ dependencies {
   implementation("io.kotest.extensions:kotest-property-arbs:2.1.2")
 }
 
+dokka {
+  moduleName.set("Data Connect Demo")
+  dokkaSourceSets.main {
+    sourceRoots.from(layout.buildDirectory.dir("dataConnect/generatedSources/").get())
+  }
+}
+
 // The remaining code in this file can be omitted from customer facing
 // documentation. It's here just to make things compile and/or configure
 // optional components of the build (e.g. spotless code formatting).

firebase-dataconnect/demo/gradle.properties

@@ -6,6 +6,12 @@ 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
+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.

gradle/libs.versions.toml

@@ -31,7 +31,7 @@ firebaseCrashlyticsGradle = "3.0.4"
 glide = "4.16.0"
 googleApiClient = "1.30.9"
 googleServices = "4.3.15"
-gradleErrorpronePlugin = "3.1.0"
+gradleErrorpronePlugin = "4.2.0"
 grpc = "1.62.2"
 grpcKotlin = "1.4.1"
 hamcrest = "2.2"