Merge branch 'refs/heads/main' into perf-trace-before-init

# Conflicts:
#	firebase-perf/CHANGELOG.md

Author: mrober

.github/workflows/ci_tests.yml

@@ -167,7 +167,7 @@ jobs:
 
     steps:
       - name: Download Artifacts
-        uses: actions/[email protected].5
+        uses: actions/[email protected].7
         with:
           path: artifacts
 

build.gradle

@@ -54,9 +54,6 @@ ext {
     robolectricVersion = libs.versions.robolectric.get()
     androidxTestCoreVersion = libs.versions.androidx.test.core.get()
     androidxTestJUnitVersion = libs.versions.androidx.test.junit.get()
-    protocVersion = libs.versions.protoc.get()
-    javaliteVersion = libs.versions.javalite.get()
-    protobufJavaUtilVersion = libs.versions.protobufjavautil.get()
 }
 
 apply plugin: com.google.firebase.gradle.plugins.PublishingPlugin

encoders/firebase-encoders-proto/CHANGELOG.md

@@ -1,3 +1,4 @@
 # Unreleased
-
+* [changed] Updated protobuf dependency to `3.25.5` to fix
+  [CVE-2024-7254](https://github.com/advisories/GHSA-735f-pc8j-v9w8).
 

encoders/firebase-encoders-proto/firebase-encoders-proto.gradle

@@ -32,7 +32,7 @@ java {
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:$protocVersion"
+        artifact = libs.protoc.get().toString()
     }
 }
 
@@ -47,7 +47,7 @@ dependencies {
     testAnnotationProcessor project(':encoders:firebase-encoders-processor')
 
     testImplementation 'com.google.guava:guava:31.0-jre'
-    testImplementation "com.google.protobuf:protobuf-java-util:$protobufJavaUtilVersion"
+    testImplementation libs.protobuf.java.util
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'
     testImplementation 'junit:junit:4.13.1'

encoders/protoc-gen-firebase-encoders/protoc-gen-firebase-encoders.gradle

@@ -22,7 +22,7 @@ plugins {
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:$protocVersion"
+        artifact = libs.protoc.get().toString()
     }
 }
 

encoders/protoc-gen-firebase-encoders/tests/tests.gradle

@@ -26,7 +26,7 @@ dependencies {
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:$protocVersion"
+        artifact = libs.protoc.get().toString()
     }
     plugins {
         firebaseEncoders {
@@ -51,7 +51,7 @@ dependencies {
 
     testImplementation project(":encoders:firebase-encoders")
     testImplementation project(":encoders:firebase-encoders-proto")
-    testImplementation "com.google.protobuf:protobuf-java:3.21.9"
+    testImplementation libs.protobuf.java
     testImplementation "com.google.truth:truth:1.0.1"
     testImplementation 'junit:junit:4.13.1'
 }

firebase-config/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
-
+* [changed] Updated protobuf dependency to `3.25.5` to fix
+  [CVE-2024-7254](https://github.com/advisories/GHSA-735f-pc8j-v9w8).
 
 # 22.0.0
 * [changed] Bump internal dependencies

firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle

@@ -124,7 +124,7 @@ dependencies {
 
     androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
     androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation "com.google.protobuf:protobuf-javalite:$javaliteVersion"
+    androidTestImplementation libs.protobuf.java.lite
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.1'
     androidTestImplementation 'org.mockito:mockito-core:3.4.3'

firebase-crashlytics/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+* [changed] Updated protobuf dependency to `3.25.5` to fix
+  [CVE-2024-7254](https://github.com/advisories/GHSA-735f-pc8j-v9w8).
+
 
 # 19.2.0
 * [fixed] Improved data consistency for rapid user actions.

firebase-crashlytics/firebase-crashlytics.gradle

@@ -104,7 +104,7 @@ dependencies {
     androidTestImplementation(libs.androidx.test.runner)
     androidTestImplementation(libs.androidx.test.junit)
     androidTestImplementation("com.google.firebase:firebase-encoders-json:18.0.1")
-    androidTestImplementation("com.google.protobuf:protobuf-java:3.21.11")
+    androidTestImplementation(libs.protobuf.java)
     androidTestImplementation(libs.truth)
     androidTestImplementation("com.linkedin.dexmaker:dexmaker:2.28.3")
     androidTestImplementation(libs.mockito.dexmaker)

firebase-dataconnect/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Unreleased
+* [changed] Updated protobuf dependency to `3.25.5` to fix
+  [CVE-2024-7254](https://github.com/advisories/GHSA-735f-pc8j-v9w8).
 
 # 16.0.0-beta01
 * [feature] Initial release of the Data Connect SDK (public preview). Learn how to
@@ -19,3 +21,4 @@
   ([#6299](https://github.com/firebase/firebase-android-sdk/pull/6299))
 * [changed] Added `equals` and `hashCode` methods to `GeneratedConnector`.
   ([#6177](https://github.com/firebase/firebase-android-sdk/pull/6177))
+

firebase-dataconnect/androidTestutil/androidTestutil.gradle.kts

@@ -58,6 +58,7 @@ dependencies {
   implementation(libs.androidx.test.core)
   implementation(libs.androidx.test.junit)
   implementation(libs.auth0.jwt)
+  implementation(libs.kotest.assertions)
   implementation(libs.kotest.property)
   implementation(libs.kotlinx.coroutines.core)
   implementation(libs.kotlinx.serialization.core)

firebase-dataconnect/androidTestutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/DataConnectIntegrationTestBase.kt

@@ -19,7 +19,12 @@ package com.google.firebase.dataconnect.testutil
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.firebase.dataconnect.ConnectorConfig
 import com.google.firebase.util.nextAlphanumericString
+import io.kotest.property.Arb
 import io.kotest.property.RandomSource
+import io.kotest.property.arbitrary.Codepoint
+import io.kotest.property.arbitrary.alphanumeric
+import io.kotest.property.arbitrary.arbitrary
+import io.kotest.property.arbitrary.string
 import kotlin.random.Random
 import org.junit.Rule
 import org.junit.rules.TestName
@@ -40,6 +45,31 @@ abstract class DataConnectIntegrationTestBase {
 
   val rs: RandomSource by randomSeedTestRule.rs
 
+  /**
+   * Generates and returns a string containing random alphanumeric characters, including the name of
+   * the currently-running test as returned from [testName].
+   *
+   * @param string The [Arb] to use to generate the random string; if not specified, then an [Arb]
+   * that generates strings of 20 alphanumeric characters is used.
+   * @param prefix A prefix to include in the returned string; if null (the default) then no prefix
+   * will be included.
+   * @return a string containing random characters and incorporating the other information
+   * identified above.
+   */
+  fun Arb.Companion.alphanumericString(
+    string: Arb<String> = Arb.string(20, Codepoint.alphanumeric()),
+    prefix: String? = null,
+  ): Arb<String> = arbitrary {
+    buildString {
+      if (prefix != null) {
+        append(prefix)
+      }
+      append(testName)
+      append("_")
+      append(string.bind())
+    }
+  }
+
   companion object {
     val testConnectorConfig: ConnectorConfig
       get() =

firebase-dataconnect/androidTestutil/src/test/kotlin/com/google/firebase/dataconnect/testutil/DataConnectBackendUnitTest.kt

@@ -16,118 +16,123 @@
 
 package com.google.firebase.dataconnect.testutil
 
-import com.google.common.truth.Truth.assertThat
 import com.google.firebase.dataconnect.testutil.DataConnectBackend.Companion.fromInstrumentationArgument
+import io.kotest.assertions.assertSoftly
+import io.kotest.assertions.throwables.shouldThrow
+import io.kotest.matchers.nulls.shouldBeNull
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.types.shouldBeSameInstanceAs
 import java.net.URI
 import java.net.URL
 import org.junit.Test
 
 class DataConnectBackendUnitTest {
 
   @Test
-  fun `fromInstrumentationArgument(null) should return Production`() {
-    assertThat(fromInstrumentationArgument(null)).isNull()
+  fun `fromInstrumentationArgument(null) should return null`() {
+    fromInstrumentationArgument(null).shouldBeNull()
   }
 
   @Test
   fun `fromInstrumentationArgument('prod') should return Production`() {
-    assertThat(fromInstrumentationArgument("prod")).isSameInstanceAs(DataConnectBackend.Production)
+    fromInstrumentationArgument("prod") shouldBeSameInstanceAs DataConnectBackend.Production
   }
 
   @Test
   fun `fromInstrumentationArgument('staging') should return Staging`() {
-    assertThat(fromInstrumentationArgument("staging")).isSameInstanceAs(DataConnectBackend.Staging)
+    fromInstrumentationArgument("staging") shouldBeSameInstanceAs DataConnectBackend.Staging
   }
 
   @Test
   fun `fromInstrumentationArgument('autopush') should return Autopush`() {
-    assertThat(fromInstrumentationArgument("autopush"))
-      .isSameInstanceAs(DataConnectBackend.Autopush)
+    fromInstrumentationArgument("autopush") shouldBeSameInstanceAs DataConnectBackend.Autopush
   }
 
   @Test
   fun `fromInstrumentationArgument('emulator') should return Emulator()`() {
-    assertThat(fromInstrumentationArgument("emulator")).isEqualTo(DataConnectBackend.Emulator())
+    fromInstrumentationArgument("emulator") shouldBe DataConnectBackend.Emulator()
   }
 
   @Test
   fun `fromInstrumentationArgument(emulator with host) should return Emulator() with the host`() {
-    assertThat(fromInstrumentationArgument("emulator:a.b.c"))
-      .isEqualTo(DataConnectBackend.Emulator(host = "a.b.c"))
+    fromInstrumentationArgument("emulator:a.b.c") shouldBe
+      DataConnectBackend.Emulator(host = "a.b.c")
   }
 
   @Test
   fun `fromInstrumentationArgument(emulator with port) should return Emulator() with the port`() {
-    assertThat(fromInstrumentationArgument("emulator::9987"))
-      .isEqualTo(DataConnectBackend.Emulator(port = 9987))
+    fromInstrumentationArgument("emulator::9987") shouldBe DataConnectBackend.Emulator(port = 9987)
   }
 
   @Test
   fun `fromInstrumentationArgument(emulator with host and port) should return Emulator() with the host and port`() {
-    assertThat(fromInstrumentationArgument("emulator:a.b.c:9987"))
-      .isEqualTo(DataConnectBackend.Emulator(host = "a.b.c", port = 9987))
+    fromInstrumentationArgument("emulator:a.b.c:9987") shouldBe
+      DataConnectBackend.Emulator(host = "a.b.c", port = 9987)
   }
 
   @Test
   fun `fromInstrumentationArgument(http url with host) should return Custom()`() {
-    assertThat(fromInstrumentationArgument("http://a.b.c"))
-      .isEqualTo(DataConnectBackend.Custom("a.b.c", false))
+    fromInstrumentationArgument("http://a.b.c") shouldBe DataConnectBackend.Custom("a.b.c", false)
   }
 
   @Test
   fun `fromInstrumentationArgument(http url with host and port) should return Custom()`() {
-    assertThat(fromInstrumentationArgument("http://a.b.c:9987"))
-      .isEqualTo(DataConnectBackend.Custom("a.b.c:9987", false))
+    fromInstrumentationArgument("http://a.b.c:9987") shouldBe
+      DataConnectBackend.Custom("a.b.c:9987", false)
   }
 
   @Test
   fun `fromInstrumentationArgument(https url with host) should return Custom()`() {
-    assertThat(fromInstrumentationArgument("https://a.b.c"))
-      .isEqualTo(DataConnectBackend.Custom("a.b.c", true))
+    fromInstrumentationArgument("https://a.b.c") shouldBe DataConnectBackend.Custom("a.b.c", true)
   }
 
   @Test
   fun `fromInstrumentationArgument(https url with host and port) should return Custom()`() {
-    assertThat(fromInstrumentationArgument("https://a.b.c:9987"))
-      .isEqualTo(DataConnectBackend.Custom("a.b.c:9987", true))
+    fromInstrumentationArgument("https://a.b.c:9987") shouldBe
+      DataConnectBackend.Custom("a.b.c:9987", true)
   }
 
   @Test
   fun `fromInstrumentationArgument('foo') should throw an exception`() {
     val exception =
-      assertThrows(InvalidInstrumentationArgumentException::class) {
-        fromInstrumentationArgument("foo")
-      }
+      shouldThrow<InvalidInstrumentationArgumentException> { fromInstrumentationArgument("foo") }
+
     val urlParseErrorMessage = runCatching { URL("foo") }.exceptionOrNull()!!.message!!
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText("foo")
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText("invalid", ignoreCase = true)
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText("DATA_CONNECT_BACKEND")
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText(urlParseErrorMessage)
+    assertSoftly {
+      exception.message shouldContainWithNonAbuttingText "foo"
+      exception.message shouldContainWithNonAbuttingTextIgnoringCase "invalid"
+      exception.message shouldContainWithNonAbuttingText "DATA_CONNECT_BACKEND"
+      exception.message shouldContainWithNonAbuttingText urlParseErrorMessage
+    }
   }
 
   @Test
   fun `fromInstrumentationArgument(invalid URI) should throw an exception`() {
     val exception =
-      assertThrows(InvalidInstrumentationArgumentException::class) {
-        fromInstrumentationArgument("..:")
-      }
+      shouldThrow<InvalidInstrumentationArgumentException> { fromInstrumentationArgument("..:") }
+
     val uriParseErrorMessage = runCatching { URI("..:") }.exceptionOrNull()!!.message!!
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText("..:")
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText("invalid", ignoreCase = true)
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText("DATA_CONNECT_BACKEND")
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText(uriParseErrorMessage)
+    assertSoftly {
+      exception.message shouldContainWithNonAbuttingText "..:"
+      exception.message shouldContainWithNonAbuttingTextIgnoringCase "invalid"
+      exception.message shouldContainWithNonAbuttingText "DATA_CONNECT_BACKEND"
+      exception.message shouldContainWithNonAbuttingText uriParseErrorMessage
+    }
   }
 
   @Test
   fun `fromInstrumentationArgument(invalid emulator URI) should throw an exception`() {
     val exception =
-      assertThrows(InvalidInstrumentationArgumentException::class) {
+      shouldThrow<InvalidInstrumentationArgumentException> {
         fromInstrumentationArgument("emulator:::::")
       }
+
     val urlParseErrorMessage = runCatching { URL("https://::::") }.exceptionOrNull()!!.message!!
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText("emulator:::::")
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText("invalid", ignoreCase = true)
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText("DATA_CONNECT_BACKEND")
-    assertThat(exception).hasMessageThat().containsWithNonAdjacentText(urlParseErrorMessage)
+    assertSoftly {
+      exception.message shouldContainWithNonAbuttingText "emulator:::::"
+      exception.message shouldContainWithNonAbuttingTextIgnoringCase "invalid"
+      exception.message shouldContainWithNonAbuttingText "DATA_CONNECT_BACKEND"
+      exception.message shouldContainWithNonAbuttingText urlParseErrorMessage
+    }
   }
 }

firebase-dataconnect/connectors/connectors.gradle.kts

@@ -15,6 +15,7 @@
  */
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import com.google.firebase.dataconnect.gradle.plugin.UpdateDataConnectExecutableVersionsTask
 
 plugins {
   id("com.android.library")
@@ -109,3 +110,41 @@ tasks.withType<KotlinCompile>().all {
     }
   }
 }
+
+// Adds a Gradle task that updates the JSON file that stores the list of Data Connect
+// executable versions.
+//
+// Example 1: Add versions 1.4.3 and 1.4.4 to the JSON file, and set 1.4.4 as the default:
+//   ../../gradlew -Pversions=1.4.3,1.4.4 -PdefaultVersion=1.4.4 updateJson --info
+//
+// Example 2: Add version 1.2.3 to the JSON file, but do not change the default version:
+//   ../../gradlew -Pversion=1.2.3 updateJson --info
+//
+// The `--info` argument can be omitted; it merely controls the level of log output.
+tasks.register<UpdateDataConnectExecutableVersionsTask>("updateJson") {
+  outputs.upToDateWhen { false }
+  jsonFile.set(project.layout.projectDirectory.file(
+    "../gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/" +
+        "plugin/DataConnectExecutableVersions.json"))
+  workDirectory.set(project.layout.buildDirectory.dir("updateJson"))
+
+  val singleVersion: String? = project.providers.gradleProperty("version").orNull
+  val multipleVersions: List<String>? = project.providers.gradleProperty("versions").orNull?.split(',')
+  versions.set(buildList {
+    singleVersion?.let{add(it)}
+    multipleVersions?.let{addAll(it)}
+    if (isEmpty()) {
+      throw Exception("bm6d5ezxzd 'version' or 'versions' property must be specified")
+    }
+  })
+
+  updateMode.set(project.providers.gradleProperty("updateMode").map {
+    when (it) {
+      "overwrite" -> UpdateDataConnectExecutableVersionsTask.UpdateMode.Overwrite
+      "update" -> UpdateDataConnectExecutableVersionsTask.UpdateMode.Update
+      else -> throw Exception("ahe4zadcjs 'updateMode' must be 'overwrite' or 'update', but got: $it")
+    }
+  })
+
+  defaultVersion.set(project.providers.gradleProperty("defaultVersion"))
+}