Merge branch 'main' into mila/fix-utf8-encoded-string-comparison

milaGGL · web-flow · commit 629b3947f44d · 2025-03-03T11:16:36.000-05:00
diff --git a/.github/workflows/dataconnect.yml b/.github/workflows/dataconnect.yml
@@ -217,10 +217,10 @@ jobs:
           if-no-files-found: warn
           compression-level: 9
 
-      - name: Check test result
+      - name: Verify "Gradle connectedCheck" step was successful
         if: steps.connectedCheck.outcome != 'success'
         run: |
-          echo "Failing the job since the connectedCheck step failed"
+          echo 'Failing because the outcome of the "Gradle connectedCheck" step ("${{ steps.connectedCheck.outcome }}") was not successful'
           exit 1
 
   # Check this yml file with "actionlint": https://github.com/rhysd/actionlint
diff --git a/.github/workflows/metalava-semver-check.yml b/.github/workflows/metalava-semver-check.yml
@@ -0,0 +1,34 @@
+name: Metalava SemVer Check
+
+on:
+  pull_request:
+
+jobs:
+  semver-check:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v4.1.1
+        with:
+          ref: ${{ github.base_ref }}
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Copy previous api.txt files
+        run: ./gradlew copyApiTxtFile
+
+      - name: Checkout PR
+        uses: actions/checkout@v4.1.1
+        with:
+          ref: ${{ github.head_ref }}
+          clean: false
+
+      - name: Run Metalava SemVer check
+        run: ./gradlew metalavaSemver
diff --git a/firebase-dataconnect/CHANGELOG.md b/firebase-dataconnect/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
-
+* [changed] Changed gRPC proto package to v1 (was v1beta).
+  ([#6729](https://github.com/firebase/firebase-android-sdk/pull/6729))
 
 # 16.0.0-beta04
 * [changed] `FirebaseDataConnect.logLevel` type changed from `LogLevel` to
diff --git a/firebase-dataconnect/demo/firebase/dataconnect/dataconnect.yaml b/firebase-dataconnect/demo/firebase/dataconnect/dataconnect.yaml
@@ -1,4 +1,4 @@
-specVersion: v1beta
+specVersion: v1
 serviceId: srv3ar8skbsza
 location: us-central1
 schema:
diff --git a/firebase-dataconnect/emulator/dataconnect/dataconnect.yaml b/firebase-dataconnect/emulator/dataconnect/dataconnect.yaml
@@ -1,4 +1,4 @@
-specVersion: "v1beta"
+specVersion: "v1"
 serviceId: "sid2ehn9ct8te"
 location: "us-central1"
 schema:
diff --git a/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json b/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json
@@ -1,5 +1,5 @@
 {
-  "defaultVersion": "1.7.7",
+  "defaultVersion": "1.8.3",
   "versions": [
     {
       "version": "1.3.4",
@@ -414,6 +414,78 @@
       "os": "linux",
       "size": 25268376,
       "sha512DigestHex": "f55feb1ce670b4728bb30be138ab427545f77f63f9e11ee458096091c075699c647d5b768c642a1ef6b3569a2db87dbbed6f2fdaf64febd1154d1a730fda4a9c"
+    },
+    {
+      "version": "1.8.0",
+      "os": "windows",
+      "size": 25903616,
+      "sha512DigestHex": "753a5e4be35c544317bcdbaaa860f079a9c9d8a24ca3db17fed601d30b64f083a9203fbb76718d23f3ad77f1556adfb5a4226751ec48c202bd227479c57d1ae9"
+    },
+    {
+      "version": "1.8.0",
+      "os": "macos",
+      "size": 25469696,
+      "sha512DigestHex": "23c1e405b196799a7c84b9783ca110459bba3aa86405d2fc03d83f90530642d590b02cd06588a8428e0e7bb7d1c59e6d03113bbc5c41e12cff7a7c46674fc430"
+    },
+    {
+      "version": "1.8.0",
+      "os": "linux",
+      "size": 25383064,
+      "sha512DigestHex": "9546bb62d54b67086847d3e129397f4cfceb5b715d64f0a1cc0a053b5dfe918e8372142b7e9bacd11dede77ddd17840058efb8ed6a7073e99fd5a684fdc57bea"
+    },
+    {
+      "version": "1.8.1",
+      "os": "windows",
+      "size": 25904128,
+      "sha512DigestHex": "26dc987e38d5d07a910da647920cc2fe990f1da0db56206def71a9833f8eeb66272d8f32ba091b0d4d6e065a3d5cd950cd835a891895c6a55d735a6f240bf4b7"
+    },
+    {
+      "version": "1.8.1",
+      "os": "macos",
+      "size": 25469696,
+      "sha512DigestHex": "d7bcb01912b1949a003fd0a7ebbc1bb42e79e97b7fd880ba9164b62e05d1ffb634662d97fd4664343e28780e69953aadecd5fb799a8f51229a4c0fbf552936ac"
+    },
+    {
+      "version": "1.8.1",
+      "os": "linux",
+      "size": 25383064,
+      "sha512DigestHex": "2a28ba7947f84ede9062b5f5efa145b29862be0a8724ac6b6a4210f6823024d33363bd3379a6474965fbd60376baae9103ce7e4509db9d52c2b13886bca5df92"
+    },
+    {
+      "version": "1.8.2",
+      "os": "windows",
+      "size": 25936384,
+      "sha512DigestHex": "f2aed75baaeed388d8fcd8a3d18e629f9ed012f60de0401bc365227094688f130ce7aa02db565002fe7b06a339b1cb133a7c87da365d480fb10cdb47d55c7dfa"
+    },
+    {
+      "version": "1.8.2",
+      "os": "macos",
+      "size": 25506560,
+      "sha512DigestHex": "d4ac9e15f5a42fed28fd2f3cb2c80bc3f4def60f76517661323c502fa7a4b085bda3d26eb62cdcb630a13999e2fb0428ee45d335e20641229a9439cc60a9e798"
+    },
+    {
+      "version": "1.8.2",
+      "os": "linux",
+      "size": 25415832,
+      "sha512DigestHex": "fec0fb97fb3ad30bdd9d0e3b65095e2dfdcfccd15e7c6ae9fe827ec1c3b5b9b592c80c59cadb3540e387d4adcf3560922094399c5ca3d162288a33403308104d"
+    },
+    {
+      "version": "1.8.3",
+      "os": "windows",
+      "size": 25965568,
+      "sha512DigestHex": "9b6ded9ddac61d5f137ac65944409003906d621bb3a03ba6bf037b1aeddabf23f9410de6fbc05b8ea0c9afa2a8328bb02a57ed225f8ebaa3c8d6921755ad715c"
+    },
+    {
+      "version": "1.8.3",
+      "os": "macos",
+      "size": 25535232,
+      "sha512DigestHex": "0c88a14ae64308e68957f5e79f9e20b4b946977187132dcc24193370c81b9117487fb0ee1c5be4e8f2368945add7ed37d6d97b015c3ea8232e09664458c8e802"
+    },
+    {
+      "version": "1.8.3",
+      "os": "linux",
+      "size": 25448600,
+      "sha512DigestHex": "6734188ed2dc41fdf9922e152848d46a4bd6a30083c918ac0de5197e1f998f8dc2b4e190c47b02c176f68b93591132c29be142b4b61a36c81aec2358a81864c6"
     }
   ]
 }
diff --git a/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/connector_service.proto b/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/connector_service.proto
@@ -18,7 +18,7 @@
 
 syntax = "proto3";
 
-package google.firebase.dataconnect.v1beta;
+package google.firebase.dataconnect.v1;
 
 import "google/firebase/dataconnect/proto/graphql_error.proto";
 import "google/protobuf/struct.proto";
diff --git a/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/graphql_error.proto b/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/graphql_error.proto
@@ -18,7 +18,7 @@
 
 syntax = "proto3";
 
-package google.firebase.dataconnect.v1beta;
+package google.firebase.dataconnect.v1;
 
 import "google/protobuf/struct.proto";
 
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGenerationResponse.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGenerationResponse.kt
@@ -16,10 +16,11 @@
 
 package com.google.firebase.vertexai.type
 
+import com.google.firebase.vertexai.ImagenModel
 import kotlinx.serialization.Serializable
 
 /**
- * Represents a response from a call to [ImagenModel#generateImages]
+ * Represents a response from a call to [ImagenModel.generateImages]
  *
  * @param images contains the generated images
  * @param filteredReason if fewer images were generated than were requested, this field will contain
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ hamcrestLibrary = "2.2"
 httpclientAndroid = "4.3.5.1"
 integrity = "1.2.0"
 jacksonCore = "2.13.1"
-jacksonDatabind = "2.13.1"
+jacksonDatabind = "2.18.2"
 javalite = "3.25.5"
 jsonassert = "1.5.0"
 kotest = "5.9.0" # Do not use 5.9.1 because it reverts the fix for https://github.com/kotest/kotest/issues/3981
@@ -71,7 +71,7 @@ serialization-plugin = "1.8.22"
 slf4jNop = "2.0.9"
 spotless = "7.0.0.BETA3"
 testServices = "1.2.0"
-truth = "1.4.2"
+truth = "1.4.4"
 truthProtoExtension = "1.0"
 wiremockStandalone = "2.26.3"
 
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.gradle.plugins
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+abstract class CopyApiTask : DefaultTask() {
+  @get:InputFile abstract val apiTxtFile: RegularFileProperty
+  @get:OutputFile abstract val output: RegularFileProperty
+
+  @TaskAction
+  fun run() {
+    output.get().asFile.writeText(apiTxtFile.get().asFile.readText())
+  }
+}
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt
@@ -160,6 +160,19 @@ class FirebaseAndroidLibraryPlugin : BaseFirebaseLibraryPlugin() {
           .getLatestReleasedVersion()
       )
     }
+
+    project.tasks.register<CopyApiTask>("copyApiTxtFile") {
+      apiTxtFile.set(project.file("api.txt"))
+      output.set(project.file("previous_api.txt"))
+    }
+
+    project.tasks.register<SemVerTask>("metalavaSemver") {
+      apiTxtFile.set(project.file("api.txt"))
+      otherApiFile.set(project.file("previous_api.txt"))
+      outputApiFile.set(project.file("opi.txt"))
+      currentVersionString.value(firebaseLibrary.version)
+      previousVersionString.value(firebaseLibrary.previousVersion)
+    }
   }
 
   private fun setupApiInformationAnalysis(project: Project, android: LibraryExtension) {
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
@@ -103,6 +103,19 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
 
       dependsOn("copyPreviousArtifacts")
     }
+
+    project.tasks.register<CopyApiTask>("copyApiTxtFile") {
+      apiTxtFile.set(project.file("api.txt"))
+      output.set(project.file("previous_api.txt"))
+    }
+
+    project.tasks.register<SemVerTask>("metalavaSemver") {
+      apiTxtFile.set(project.file("api.txt"))
+      otherApiFile.set(project.file("previous_api.txt"))
+      outputApiFile.set(project.file("opi.txt"))
+      currentVersionString.value(firebaseLibrary.version)
+      previousVersionString.value(firebaseLibrary.previousVersion)
+    }
   }
 
   private fun setupApiInformationAnalysis(project: Project) {
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt
@@ -241,6 +241,9 @@ constructor(val project: Project, val type: LibraryType) {
   val version: String
     get() = project.version.toString()
 
+  val previousVersion: String
+    get() = project.properties["latestReleasedVersion"].toString()
+
   val path: String = project.path
 
   val runtimeClasspath: String =
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt
@@ -55,7 +55,6 @@ fun Project.runMetalavaWithArgs(
 ) {
   val allArgs =
     listOf(
-      "--no-banner",
       "--hide",
       "HiddenSuperclass", // We allow having a hidden parent class
       "--hide",
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/SemVerTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/SemVerTask.kt
diff --git a/smoke-tests/src/androidTest/backend/functions/functions/package-lock.json b/smoke-tests/src/androidTest/backend/functions/functions/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-specVersion: v1beta`
	`1`	`+specVersion: v1`
`2`	`2`	`serviceId: srv3ar8skbsza`
`3`	`3`	`location: us-central1`
`4`	`4`	`schema:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-specVersion: "v1beta"`
	`1`	`+specVersion: "v1"`
`2`	`2`	`serviceId: "sid2ehn9ct8te"`
`3`	`3`	`location: "us-central1"`
`4`	`4`	`schema:`