Merge branch 'main' into davidmotson.golden_files_fix

Author: davidmotson

firebase-dataconnect/demo/build.gradle.kts

@@ -19,12 +19,12 @@ import java.nio.charset.StandardCharsets
 
 plugins {
   // Use whichever versions of these dependencies suit your application.
-  // The versions shown here were the latest versions as of December 03, 2024.
+  // The versions shown here were the latest versions as of March 05, 2025.
   // Note, however, that the version of kotlin("plugin.serialization") _must_,
   // in general, match the version of kotlin("android").
-  id("com.android.application") version "8.7.3"
+  id("com.android.application") version "8.9.0"
   id("com.google.gms.google-services") version "4.4.2"
-  val kotlinVersion = "2.1.0"
+  val kotlinVersion = "2.1.10"
   kotlin("android") version kotlinVersion
   kotlin("plugin.serialization") version kotlinVersion
 
@@ -35,19 +35,19 @@ plugins {
 
 dependencies {
   // Use whichever versions of these dependencies suit your application.
-  // The versions shown here were the latest versions as of December 03, 2024.
-  implementation("com.google.firebase:firebase-dataconnect:16.0.0-beta03")
-  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
-  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
-  implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3")
+  // The versions shown here were the latest versions as of March 05, 2025.
+  implementation("com.google.firebase:firebase-dataconnect:16.0.0-beta04")
+  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
+  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
+  implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0")
   implementation("androidx.appcompat:appcompat:1.7.0")
-  implementation("androidx.activity:activity-ktx:1.9.3")
+  implementation("androidx.activity:activity-ktx:1.10.1")
   implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
   implementation("com.google.android.material:material:1.12.0")
 
   // The following code in this "dependencies" block can be omitted from customer
   // facing documentation as it is an implementation detail of this application.
-  coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
+  coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
   implementation("io.kotest:kotest-property:5.9.1")
   implementation("io.kotest.extensions:kotest-property-arbs:2.1.2")
 }

firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MyApplication.kt

@@ -61,7 +61,7 @@ class MyApplication : Application() {
         }
     )
 
-  private val initialLogLevel = FirebaseDataConnect.logLevel
+  private val initialLogLevel = FirebaseDataConnect.logLevel.value
   private val connectorMutex = Mutex()
   private var connector: Ctry3q3tp6kzxConnector? = null
 
@@ -70,7 +70,7 @@ class MyApplication : Application() {
 
     coroutineScope.launch {
       if (getDataConnectDebugLoggingEnabled()) {
-        FirebaseDataConnect.logLevel = LogLevel.DEBUG
+        FirebaseDataConnect.logLevel.value = LogLevel.DEBUG
       }
     }
   }
@@ -102,7 +102,7 @@ class MyApplication : Application() {
     getSharedPreferences().all[SharedPrefsKeys.IS_DATA_CONNECT_LOGGING_ENABLED] as? Boolean ?: false
 
   suspend fun setDataConnectDebugLoggingEnabled(enabled: Boolean) {
-    FirebaseDataConnect.logLevel = if (enabled) LogLevel.DEBUG else initialLogLevel
+    FirebaseDataConnect.logLevel.value = if (enabled) LogLevel.DEBUG else initialLogLevel
     editSharedPreferences { putBoolean(SharedPrefsKeys.IS_DATA_CONNECT_LOGGING_ENABLED, enabled) }
   }
 

firebase-functions/firebase-functions.gradle.kts

@@ -112,7 +112,7 @@ dependencies {
   implementation(libs.okhttp)
   implementation(libs.playservices.base)
   implementation(libs.playservices.basement)
-  implementation(libs.reactive.streams)
+  api(libs.reactive.streams)
 
   api(libs.playservices.tasks)
 

firebase-functions/src/androidTest/java/com/google/firebase/functions/StreamTests.kt

@@ -143,6 +143,26 @@ class StreamTests {
     assertThat(subscriber.throwable).isInstanceOf(FirebaseFunctionsException::class.java)
   }
 
+  @Test
+  fun nonExistentFunction_receivesError() = runBlocking {
+    val function =
+      functions.getHttpsCallable("nonexistentFunction").withTimeout(2000, TimeUnit.MILLISECONDS)
+    val subscriber = StreamSubscriber()
+
+    function.stream().subscribe(subscriber)
+
+    withTimeout(2000) {
+      while (subscriber.throwable == null) {
+        delay(100)
+      }
+    }
+
+    assertThat(subscriber.throwable).isNotNull()
+    assertThat(subscriber.throwable).isInstanceOf(FirebaseFunctionsException::class.java)
+    assertThat((subscriber.throwable as FirebaseFunctionsException).code)
+      .isEqualTo(FirebaseFunctionsException.Code.NOT_FOUND)
+  }
+
   @Test
   fun genStreamWeather_receivesWeatherForecasts() = runBlocking {
     val inputData = listOf(mapOf("name" to "Toronto"), mapOf("name" to "London"))

firebase-functions/src/main/java/com/google/firebase/functions/PublisherStream.kt

@@ -300,10 +300,12 @@ internal class PublisherStream(
     val errorMessage: String
     if (response.code() == 404 && response.header("Content-Type") == htmlContentType) {
       errorMessage = """URL not found. Raw response: ${response.body()?.string()}""".trimMargin()
-      throw FirebaseFunctionsException(
-        errorMessage,
-        FirebaseFunctionsException.Code.fromHttpStatus(response.code()),
-        null
+      notifyError(
+        FirebaseFunctionsException(
+          errorMessage,
+          FirebaseFunctionsException.Code.fromHttpStatus(response.code()),
+          null
+        )
       )
     }
 
@@ -313,16 +315,17 @@ internal class PublisherStream(
       val json = JSONObject(text)
       error = serializer.decode(json.opt("error"))
     } catch (e: Throwable) {
-      throw FirebaseFunctionsException(
-        "${e.message} Unexpected Response:\n$text ",
-        FirebaseFunctionsException.Code.INTERNAL,
-        e
+      notifyError(
+        FirebaseFunctionsException(
+          "${e.message} Unexpected Response:\n$text ",
+          FirebaseFunctionsException.Code.INTERNAL,
+          e
+        )
       )
+      return
     }
-    throw FirebaseFunctionsException(
-      error.toString(),
-      FirebaseFunctionsException.Code.INTERNAL,
-      error
+    notifyError(
+      FirebaseFunctionsException(error.toString(), FirebaseFunctionsException.Code.INTERNAL, error)
     )
   }
 }