Merge branch 'main' into td/record-exception

Author: tejasd

.github/workflows/build-src-check.yml

@@ -1,4 +1,4 @@
-name: build-src-check
+name: Check buildSrc
 
 on:
   pull_request:

.github/workflows/changelog.yml

@@ -1,4 +1,4 @@
-name: Changelog
+name: Verify changelog update
 
 on:
   pull_request

.github/workflows/fireci.yml

@@ -1,4 +1,4 @@
-name: fireci
+name: Run fireci tests
 
 on:
   pull_request:

.github/workflows/update-cpp-sdk-on-release.yml

@@ -2,7 +2,7 @@
 # *another* workflow on the Firebase C++ SDK, which will check for the Android
 # version update and create a PR updating its dependencies if any version
 # numbers changed.
-name: update-cpp-sdk-on-release
+name: Update C++ SDKs on release
 on:
   push:
     branches:

firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts

@@ -49,8 +49,8 @@ android {
 }
 
 dependencies {
-  implementation("com.google.android.play:feature-delivery:2.0.0")
+  implementation(libs.feature.delivery)
   implementation(libs.kotlin.stdlib.jdk8)
-  api("com.google.firebase:firebase-common:21.0.0")
-  api("com.google.firebase:firebase-components:18.0.0")
+  api(libs.firebase.common)
+  api(libs.firebase.components)
 }

firebase-functions/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+* [fixed] Fixed HttpsCallableResult.data resolution in Kotlin
+
+# 21.1.0
 * [changed] Migrated to Kotlin
 
 # 21.0.0

firebase-functions/api.txt

@@ -110,6 +110,7 @@ package com.google.firebase.functions {
 
   public final class HttpsCallableResult {
     method @Nullable public Object getData();
+    field @Nullable public final Object data;
   }
 
   public final class Serializer {

firebase-functions/src/androidTest/java/com/google/firebase/functions/ktx/CallTests.kt

@@ -64,7 +64,7 @@ class CallTests {
       )
 
     var function = functions.getHttpsCallable("dataTest")
-    val actual = Tasks.await(function.call(input)).getData()
+    val actual = Tasks.await(function.call(input)).data
 
     assertThat(actual).isInstanceOf(Map::class.java)
     @Suppress("UNCHECKED_CAST") val map = actual as Map<String, *>
@@ -77,7 +77,7 @@ class CallTests {
   fun testNullDataCall() {
     val functions = Firebase.functions(app)
     var function = functions.getHttpsCallable("nullTest")
-    val actual = Tasks.await(function.call(null)).getData()
+    val actual = Tasks.await(function.call(null)).data
 
     assertThat(actual).isNull()
   }
@@ -86,7 +86,7 @@ class CallTests {
   fun testEmptyDataCall() {
     val functions = Firebase.functions(app)
     var function = functions.getHttpsCallable("nullTest")
-    val actual = Tasks.await(function.call()).getData()
+    val actual = Tasks.await(function.call()).data
 
     assertThat(actual).isNull()
   }

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

@@ -16,13 +16,21 @@ package com.google.firebase.functions
 /** The result of calling a HttpsCallableReference function. */
 public class HttpsCallableResult
 internal constructor( // The actual result data, as generic types decoded from JSON.
-private val data: Any?) {
+  /**
+   * The data that was returned from the Callable HTTPS trigger.
+   *
+   * The data is in the form of native Java objects. For example, if your trigger returned an array,
+   * this object would be a `List<Object>`. If your trigger returned a JavaScript object with keys
+   * and values, this object would be a `Map<String, Object>`.
+   */
+  @JvmField public val data: Any?
+) {
   /**
    * Returns the data that was returned from the Callable HTTPS trigger.
    *
    * The data is in the form of native Java objects. For example, if your trigger returned an array,
-   * this object would be a List<Object>. If your trigger returned a JavaScript object with keys and
-   * values, this object would be a Map<String, Object>.
+   * this object would be a `List<Object>`. If your trigger returned a JavaScript object with keys
+   * and values, this object would be a `Map<String, Object>`.
    */
   public fun getData(): Any? {
     return data

gradle/libs.versions.toml

@@ -7,6 +7,9 @@ android-lint = "31.3.2"
 autovalue = "1.10.1"
 coroutines = "1.7.3"
 dagger = "2.43.2"
+featureDelivery = "2.1.0"
+firebaseCommon = "21.0.0"
+firebaseComponents = "18.0.0"
 grpc = "1.62.2"
 grpcKotlin = "1.4.1"
 javalite = "3.25.5"
@@ -45,7 +48,10 @@ autovalue-annotations = { module = "com.google.auto.value:auto-value-annotations
 dagger-dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
 errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version = "2.26.0" }
+feature-delivery = { module = "com.google.android.play:feature-delivery", version.ref = "featureDelivery" }
 findbugs-jsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
+firebase-common = { module = "com.google.firebase:firebase-common", version.ref = "firebaseCommon" }
+firebase-components = { module = "com.google.firebase:firebase-components", version.ref = "firebaseComponents" }
 grpc-android = { module = "io.grpc:grpc-android", version.ref = "grpc" }
 grpc-kotlin-stub = { module = "io.grpc:grpc-kotlin-stub", version.ref = "grpcKotlin" }
 grpc-okhttp = { module = "io.grpc:grpc-okhttp", version.ref = "grpc" }