Merge branch 'main' into daymon-migrate-tests-to-junit4

Author: daymxn

firebase-dataconnect/connectors/connectors.gradle.kts

@@ -70,6 +70,8 @@ dependencies {
 
   testImplementation(project(":firebase-dataconnect:testutil"))
   testImplementation(libs.androidx.test.junit)
+  testImplementation(libs.kotest.assertions)
+  testImplementation(libs.kotest.property)
   testImplementation(libs.kotlin.coroutines.test)
   testImplementation(libs.mockk)
   testImplementation(libs.robolectric)
@@ -84,6 +86,7 @@ dependencies {
   androidTestImplementation(libs.kotest.assertions)
   androidTestImplementation(libs.kotest.property)
   androidTestImplementation(libs.kotlin.coroutines.test)
+  androidTestImplementation(libs.testonly.three.ten.abp)
   androidTestImplementation(libs.truth)
   androidTestImplementation(libs.truth.liteproto.extension)
   androidTestImplementation(libs.turbine)
@@ -127,29 +130,77 @@ tasks.register<UpdateDataConnectExecutableVersionsTask>("updateJson") {
   )
   workDirectory.set(project.layout.buildDirectory.dir("updateJson"))
 
-  val singleVersion: String? = project.providers.gradleProperty("version").orNull
+  val propertyNames =
+    object {
+      val version = "version"
+      val versions = "versions"
+      val updateMode = "updateMode"
+      val defaultVersion = "defaultVersion"
+    }
+
+  val singleVersion: String? = project.providers.gradleProperty(propertyNames.version).orNull
   val multipleVersions: List<String>? =
-    project.providers.gradleProperty("versions").orNull?.split(',')
+    project.providers.gradleProperty(propertyNames.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")
-      }
     }
   )
 
+  doFirst {
+    if (versions.get().isEmpty()) {
+      logger.warn(
+        "WARNING: no '${propertyNames.version}' or '${propertyNames.versions}' specified " +
+          "for task '$name'; no versions will be added to ${jsonFile.get()}. " +
+          "Try specifying something like '-P${propertyNames.version}=1.2.3' or " +
+          "'-P${propertyNames.versions}=1.2.3,4.5.6' on the gradle command line " +
+          "if you want to add versions (warning code bm6d5ezxzd)"
+      )
+    }
+  }
+
   updateMode.set(
-    project.providers.gradleProperty("updateMode").map {
+    project.providers.gradleProperty(propertyNames.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")
+          throw Exception(
+            "Invalid '${propertyNames.updateMode}' specified for task '$name': $it. " +
+              "Valid values are 'update' and 'overwrite'. " +
+              "Try specifying '-P${propertyNames.updateMode}=update' or " +
+              "'-P${propertyNames.updateMode}=overwrite' on the gradle command line. " +
+              "(error code v2e3cfqbnf)"
+          )
       }
     }
   )
 
-  defaultVersion.set(project.providers.gradleProperty("defaultVersion"))
+  doFirst {
+    if (!updateMode.isPresent) {
+      logger.warn(
+        "WARNING: no '${propertyNames.updateMode}' specified for task '$name'; " +
+          "the default update mode of 'update' will be used when updating ${jsonFile.get()}. " +
+          "Try specifying '-P${propertyNames.updateMode}=update' or " +
+          "'-P${propertyNames.updateMode}=overwrite' on the gradle command line " +
+          "if you want a different update mode, or just want to be explicit about " +
+          "which update mode is in effect (warning code tjyscqmdne)"
+      )
+    }
+  }
+
+  defaultVersion.set(project.providers.gradleProperty(propertyNames.defaultVersion))
+
+  doFirst {
+    if (!defaultVersion.isPresent) {
+      logger.warn(
+        "WARNING: no '${propertyNames.defaultVersion}' specified for task '$name'; " +
+          "the default version will not be updated in ${jsonFile.get()}. " +
+          "Try specifying something like '-P${propertyNames.defaultVersion}=1.2.3' " +
+          "on the gradle command line if you want to update the default version " +
+          "(warning code vqrbrktx9f)"
+      )
+    }
+  }
 }

firebase-dataconnect/firebase-dataconnect.gradle.kts

@@ -100,6 +100,7 @@ dependencies {
   implementation("com.google.firebase:firebase-components:18.0.0")
 
   compileOnly(libs.javax.annotation.jsr250)
+  compileOnly(libs.kotlinx.datetime)
   implementation(libs.grpc.android)
   implementation(libs.grpc.kotlin.stub)
   implementation(libs.grpc.okhttp)
@@ -117,6 +118,7 @@ dependencies {
   testImplementation(libs.kotest.property)
   testImplementation(libs.kotest.property.arbs)
   testImplementation(libs.kotlin.coroutines.test)
+  testImplementation(libs.kotlinx.datetime)
   testImplementation(libs.kotlinx.serialization.json)
   testImplementation(libs.mockk)
   testImplementation(libs.robolectric)
@@ -136,6 +138,7 @@ dependencies {
   androidTestImplementation(libs.kotest.property)
   androidTestImplementation(libs.kotest.property.arbs)
   androidTestImplementation(libs.kotlin.coroutines.test)
+  androidTestImplementation(libs.kotlinx.datetime)
   androidTestImplementation(libs.mockk)
   androidTestImplementation(libs.mockk.android)
   androidTestImplementation(libs.truth)

firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json

@@ -216,6 +216,42 @@
       "os": "linux",
       "size": 25129112,
       "sha512DigestHex": "6ae87788e55d3c79dc8558fe899c06aed21237b2ab332593d05c02d6db98fc94c3e7861dbb58af1fbb69a0dfa639c005539fe3006d4f001af69b8532a7f175b0"
+    },
+    {
+      "version": "1.5.1",
+      "os": "windows",
+      "size": 25720320,
+      "sha512DigestHex": "c53e7225186fa16b890992705a1aca49e63d6b910f2150c6a64a6ce62d56f01781a2f24a93058595e8eba84cd9bc68aa076b6197c6dacd7e9c04f808efa32172"
+    },
+    {
+      "version": "1.5.1",
+      "os": "macos",
+      "size": 25289472,
+      "sha512DigestHex": "1922e64aecfb70db1bf73a8b45e8eca08f0ff5e0bc49ef8ef386cfe5b3d92b3a8e54f9f296f991bf9dabedb90cfb3dc89e2f0d058818444f8b1f5f44dcae7ec9"
+    },
+    {
+      "version": "1.5.1",
+      "os": "linux",
+      "size": 25202840,
+      "sha512DigestHex": "23fc6ee16d70af1c9cff71ebd5a8b4c171cb2992f27bf8defb267701fb6b7e650ccf6745ad17aac14f6b9208929bac4c4a25d0b0b42437c1f91c474d779e20c4"
+    },
+    {
+      "version": "1.6.0",
+      "os": "windows",
+      "size": 25731072,
+      "sha512DigestHex": "33f59b28649eae190e8b54e181efb5d0db675f4dbd104cbd635302b6db7ebcedb430f99106a5181ec328a02cacc79dbf2e73aec878e74c3eb17b2e554cc24d27"
+    },
+    {
+      "version": "1.6.0",
+      "os": "macos",
+      "size": 25301760,
+      "sha512DigestHex": "ac147e24eee3611b186dd89e7b2829d843544552708d7fbce54cf340fa87fa073ae0c32332659519c16eabd0bf5d3e4fa85311aed5e2a5b7de1ee770f50a329b"
+    },
+    {
+      "version": "1.6.0",
+      "os": "linux",
+      "size": 25219224,
+      "sha512DigestHex": "1ac47fee5ef0a06f2f4acb9d464da21d9df1e17df5768cd73fdb69c839048c30fd57d330881ef6e1c78b5cc37e3fe92378dac22aed0d3d0a8d0a1fa77a045f0d"
     }
   ]
 }

firebase-dataconnect/testutil/testutil.gradle.kts

@@ -55,13 +55,15 @@ dependencies {
   implementation("com.google.firebase:firebase-auth:22.3.1")
 
   implementation(libs.androidx.test.junit)
+  implementation(libs.kotest.assertions)
   implementation(libs.kotest.property)
   implementation(libs.kotlin.coroutines.test)
   implementation(libs.kotlinx.coroutines.core)
   implementation(libs.kotlinx.serialization.core)
   implementation(libs.mockk)
   implementation(libs.protobuf.java.lite)
   implementation(libs.robolectric)
+  implementation(libs.testonly.three.ten.abp)
   implementation(libs.truth)
 }
 

firebase-functions/firebase-functions.gradle.kts

@@ -112,7 +112,7 @@ dependencies {
   implementation(libs.playservices.basement)
   api(libs.playservices.tasks)
 
-  annotationProcessor(libs.autovalue)
+  kapt(libs.autovalue)
   annotationProcessor(libs.dagger.compiler)
 
   testImplementation(libs.androidx.test.core)

firebase-messaging/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+* [deprecated] Deprecated additional FCM upstream messaging methods. See the
+  [FAQ](https://firebase.google.com/support/faq#fcm-23-deprecation) for more
+  details.
 
 
 # 24.0.3

firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java

@@ -60,8 +60,7 @@
 
 /**
  * Top level <a href="https://firebase.google.com/docs/cloud-messaging/">Firebase Cloud
- * Messaging</a> singleton that provides methods for subscribing to topics and sending upstream
- * messages.
+ * Messaging</a> singleton that provides methods for generating tokens and subscribing to topics.
  *
  * <p>In order to receive messages, declare an implementation of <br>
  * {@link FirebaseMessagingService} in the app manifest. To process messages, override base class
@@ -515,9 +514,9 @@ public Task<Void> unsubscribeFromTopic(@NonNull String topic) {
    * <p>When there is an active connection the message will be sent immediately, otherwise the
    * message will be queued up to the time to live (TTL) set in the message.
    *
-   * @deprecated FCM upstream messaging is deprecated and will be decommissioned in June 2024. Learn
-   *     more in the <a href="https://firebase.google.com/support/faq#fcm-23-deprecation">FAQ about
-   *     FCM features deprecated in June 2023</a>.
+   * @deprecated FCM upstream messaging is decommissioned. Learn more in the
+   * <a href="https://firebase.google.com/support/faq#fcm-23-deprecation">FAQ about FCM features
+   * deprecated in June 2023</a>.
    */
   @Deprecated
   public void send(@NonNull RemoteMessage message) {

firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java

@@ -35,8 +35,7 @@
  * Base class for receiving messages from Firebase Cloud Messaging.
  *
  * <p>Extending this class is required to be able to handle downstream messages. It also provides
- * functionality to automatically display notifications, and has methods that are invoked to give
- * the status of upstream messages.
+ * functionality to automatically display notifications.
  *
  * <p>Override base class methods to handle any events required by the application. All methods are
  * invoked on a background thread, and <em>may be called when the app is in the background or not
@@ -127,7 +126,12 @@ public void onDeletedMessages() {}
    * Called when an upstream message has been successfully sent to the GCM connection server.
    *
    * @param msgId of the upstream message sent using {@link FirebaseMessaging#send}.
+   *
+   * @deprecated FCM upstream messaging is decommissioned. Learn more in the
+   * <a href="https://firebase.google.com/support/faq#fcm-23-deprecation">FAQ about FCM features
+   * deprecated in June 2023</a>.
    */
+  @Deprecated
   @WorkerThread
   public void onMessageSent(@NonNull String msgId) {}
 
@@ -136,7 +140,12 @@ public void onMessageSent(@NonNull String msgId) {}
    *
    * @param msgId of the upstream message sent using {@link FirebaseMessaging#send}.
    * @param exception description of the error, typically a {@link SendException}.
+   *
+   * @deprecated FCM upstream messaging is decommissioned. Learn more in the
+   * <a href="https://firebase.google.com/support/faq#fcm-23-deprecation">FAQ about FCM features
+   * deprecated in June 2023</a>.
    */
+  @Deprecated
   @WorkerThread
   public void onSendError(@NonNull String msgId, @NonNull Exception exception) {}
 

firebase-messaging/src/main/java/com/google/firebase/messaging/RemoteMessage.java

@@ -40,15 +40,10 @@
 /**
  * A remote Firebase Message.
  *
- * <p>Messages will be received via {@link
- * FirebaseMessagingService#onMessageReceived(RemoteMessage)} and can be sent via {@link
- * FirebaseMessaging#send(RemoteMessage)}.
+ * <p>Messages will be received via {@link FirebaseMessagingService#onMessageReceived(RemoteMessage)}.
  *
  * <p>Messages may have a {@link Notification} instance if they are received while the application
  * is in the foreground, otherwise they will be automatically posted to the notification tray.
- *
- * <p>Use the {@link Builder} class for building message instances to send via {@link
- * FirebaseMessaging#send(RemoteMessage)}.
  */
 @SafeParcelable.Reserved({1 /* version field removed by bot go/versionless-safeparcelable */})
 @SafeParcelable.Class(creator = "RemoteMessageCreator")
@@ -115,11 +110,11 @@ public String getFrom() {
   /**
    * Gets the message destination.
    *
-   * <ul>
-   *   <li>For upstream messages, this will be of the form {@code [email protected]}.
-   *   <li>For downstream messages, this will be the Firebase installations ID (FID).
-   * </ul>
+   * @deprecated FCM upstream messaging is decommissioned. Learn more in the
+   * <a href="https://firebase.google.com/support/faq#fcm-23-deprecation">FAQ about FCM features
+   * deprecated in June 2023</a>.
    */
+  @Deprecated
   @Nullable
   public String getTo() {
     return bundle.getString(MessagePayloadKeys.TO);
@@ -373,13 +368,13 @@ public String getMessageType() {
     /** @hide */
     @Nullable
     public String getCollapseKey() {
-      return bundle.getString(MessagePayloadKeys.MESSAGE_TYPE);
+      return bundle.getString(MessagePayloadKeys.COLLAPSE_KEY);
     }
 
     /** @hide */
     @IntRange(from = 0, to = 86400)
     public int getTtl() {
-      return Integer.parseInt(bundle.getString(MessagePayloadKeys.MESSAGE_TYPE, "0"));
+      return Integer.parseInt(bundle.getString(MessagePayloadKeys.TTL, "0"));
     }
 
     /** @hide */

firebase-vertexai/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Unreleased
 * [fixed] Fixed issue where Firebase App Check error tokens were unintentionally missing from the requests. (#6409)
-
+* [fixed] Clarified in the documentation that `Schema.integer` and `Schema.float` only provide hints to the model. (#6420)
 
 # 16.0.1
 * [fixed] Fixed issue where authorization headers weren't correctly formatted and were ignored by the backend. (#6400)