Merge branch 'main' into dependabot/gradle/androidx.test.ext-truth-1.6.0

Author: rlazo

firebase-ai/api.txt

@@ -245,15 +245,15 @@ package com.google.firebase.ai.type {
   }
 
   public final class CountTokensResponse {
-    ctor public CountTokensResponse(int totalTokens, Integer? totalBillableCharacters = null, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> promptTokensDetails = emptyList());
+    ctor public CountTokensResponse(int totalTokens, @Deprecated Integer? totalBillableCharacters = null, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> promptTokensDetails = emptyList());
     method public operator int component1();
     method public operator Integer? component2();
     method public operator java.util.List<com.google.firebase.ai.type.ModalityTokenCount>? component3();
     method public java.util.List<com.google.firebase.ai.type.ModalityTokenCount> getPromptTokensDetails();
-    method public Integer? getTotalBillableCharacters();
+    method @Deprecated public Integer? getTotalBillableCharacters();
     method public int getTotalTokens();
     property public final java.util.List<com.google.firebase.ai.type.ModalityTokenCount> promptTokensDetails;
-    property public final Integer? totalBillableCharacters;
+    property @Deprecated public final Integer? totalBillableCharacters;
     property public final int totalTokens;
   }
 

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/Schema.kt

@@ -309,15 +309,13 @@ internal constructor(
      *
      * Example: A field that can hold either a simple userID or a more detailed user object.
      *
-     * Schema.anyOf( listOf( Schema.integer(description = "User ID"), Schema.obj(mapOf(
-     *
      * ```
+     * Schema.anyOf( listOf( Schema.integer(description = "User ID"), Schema.obj( mapOf(
      *     "userID" to Schema.integer(description = "User ID"),
      *     "username" to Schema.string(description = "Username")
+     * )))
      * ```
      *
-     * )) )
-     *
      * @param schemas The list of valid schemas which could be here
      */
     @JvmStatic

firebase-common/src/test/java/com/google/firebase/DataCollectionPreNDefaultEnabledTest.java

@@ -27,7 +27,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(AndroidJUnit4.class)
-@Config(sdk = 21)
+@Config(sdk = Config.OLDEST_SDK)
 public class DataCollectionPreNDefaultEnabledTest {
 
   @Test

firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java

@@ -87,7 +87,7 @@ public void test_auto_atHighEnoughApiLevel() {
   }
 
   @Test
-  @Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+  @Config(sdk = Config.OLDEST_SDK)
   public void test_auto_atNotHighEnoughApiLevel() {
     ShadowPackageManager shadowPackageManager =
         shadowOf(ApplicationProvider.getApplicationContext().getPackageManager());
@@ -98,7 +98,7 @@ public void test_auto_atNotHighEnoughApiLevel() {
         app -> {
           UserAgentPublisher ua = app.get(UserAgentPublisher.class);
 
-          assertThat(ua.getUserAgent()).containsMatch(Pattern.compile("android-platform/($|\\s)"));
+          assertThat(ua.getUserAgent()).containsMatch(Pattern.compile("android-installer/($|\\s)"));
         });
   }
 

gradle/libs.versions.toml

@@ -70,7 +70,7 @@ rxandroid = "2.0.2"
 rxjava = "2.1.14"
 serialization = "1.5.1"
 slf4jNop = "2.0.9"
-spotless = "7.0.0.BETA3"
+spotless = "7.0.4"
 testServices = "1.2.0"
 truth = "1.4.4"
 truthProtoExtension = "1.0"
@@ -216,7 +216,7 @@ turbine = { module = "app.cash.turbine:turbine", version = "1.2.0" }
 # correspondingly-named classes from the java.time package, which should be drop-in replacements.
 # Do not use three-ten-abp in production code (it's only for tests) because it has performance
 # issues.
-testonly-three-ten-abp = { module = "com.jakewharton.threetenabp:threetenabp", version = "1.4.7" }
+testonly-three-ten-abp = { module = "com.jakewharton.threetenabp:threetenabp", version = "1.4.9" }
 wiremock-standalone = { module = "com.github.tomakehurst:wiremock-standalone", version.ref = "wiremockStandalone" }
 
 [bundles]