Merge branch 'main' into dl/grounding

Author: dlarocque

.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-ai/src/main/kotlin/com/google/firebase/ai/type/Schema.kt

@@ -309,15 +309,13 @@ internal constructor(
      *
      * Example: A field that can hold either a simple userID or a more detailed user object.
      *
-     * Schema.anyOf( listOf( Schema.integer(description = "User ID"), Schema.obj(mapOf(
-     *
      * ```
+     * Schema.anyOf( listOf( Schema.integer(description = "User ID"), Schema.obj( mapOf(
      *     "userID" to Schema.integer(description = "User ID"),
      *     "username" to Schema.string(description = "Username")
+     * )))
      * ```
      *
-     * )) )
-     *
      * @param schemas The list of valid schemas which could be here
      */
     @JvmStatic

firebase-common/src/test/java/com/google/firebase/DataCollectionPreNDefaultEnabledTest.java

@@ -27,7 +27,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(AndroidJUnit4.class)
-@Config(sdk = 21)
+@Config(sdk = Config.OLDEST_SDK)
 public class DataCollectionPreNDefaultEnabledTest {
 
   @Test

firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java

@@ -87,7 +87,7 @@ public void test_auto_atHighEnoughApiLevel() {
   }
 
   @Test
-  @Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+  @Config(sdk = Config.OLDEST_SDK)
   public void test_auto_atNotHighEnoughApiLevel() {
     ShadowPackageManager shadowPackageManager =
         shadowOf(ApplicationProvider.getApplicationContext().getPackageManager());
@@ -98,7 +98,7 @@ public void test_auto_atNotHighEnoughApiLevel() {
         app -> {
           UserAgentPublisher ua = app.get(UserAgentPublisher.class);
 
-          assertThat(ua.getUserAgent()).containsMatch(Pattern.compile("android-platform/($|\\s)"));
+          assertThat(ua.getUserAgent()).containsMatch(Pattern.compile("android-installer/($|\\s)"));
         });
   }
 

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

@@ -6,7 +6,7 @@ android-lint = "31.3.2"
 androidGradlePlugin = "8.3.2"
 androidx-test-core="1.5.0"
 androidx-test-junit="1.1.5"
-androidx-test-truth = "1.5.0"
+androidx-test-truth = "1.6.0"
 appcompat = "1.7.0"
 autoValueParcel = "0.2.6"
 autovalue = "1.10.1"
@@ -70,7 +70,7 @@ rxandroid = "2.0.2"
 rxjava = "2.1.14"
 serialization = "1.5.1"
 slf4jNop = "2.0.9"
-spotless = "7.0.0.BETA3"
+spotless = "7.0.4"
 testServices = "1.2.0"
 truth = "1.4.4"
 truthProtoExtension = "1.0"
@@ -216,7 +216,7 @@ turbine = { module = "app.cash.turbine:turbine", version = "1.2.0" }
 # correspondingly-named classes from the java.time package, which should be drop-in replacements.
 # Do not use three-ten-abp in production code (it's only for tests) because it has performance
 # issues.
-testonly-three-ten-abp = { module = "com.jakewharton.threetenabp:threetenabp", version = "1.4.7" }
+testonly-three-ten-abp = { module = "com.jakewharton.threetenabp:threetenabp", version = "1.4.9" }
 wiremock-standalone = { module = "com.github.tomakehurst:wiremock-standalone", version.ref = "wiremockStandalone" }
 
 [bundles]

plugins/src/main/java/com/google/firebase/gradle/bomgenerator/GenerateTutorialBundleTask.kt

@@ -205,11 +205,13 @@ abstract class GenerateTutorialBundleTask : DefaultTask() {
   private fun artifactVariableString(fullArtifactName: String): String {
     val (name, alias, extra) = mappings[fullArtifactName]!!
 
-    return multiLine(
-      "<!-- $name -->",
-      "<!ENTITY $alias \"$fullArtifactName:${versionString(fullArtifactName)}\">",
-      extra,
-    )
+    val version = versionString(fullArtifactName)
+    if (version.lowercase().contains("-alpha")) {
+      logger.info("Ignoring alpha version of $fullArtifactName")
+      return "" // Alpha versions should not be included in the tutorial bundle
+    }
+
+    return multiLine("<!-- $name -->", "<!ENTITY $alias \"$fullArtifactName:${version}\">", extra)
   }
 
   companion object {