Merge branch 'main' into ep/minsdk-23

Author: emilypgoogle

.github/workflows/ci_tests.yml

@@ -169,5 +169,6 @@ jobs:
 
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
+        if: always()
         with:
           files: "artifacts/**/*.xml"

.github/workflows/plugins-check.yml

@@ -30,6 +30,7 @@ jobs:
           ./gradlew plugins:check
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
+        if: always()
         with:
           files: "**/build/test-results/**/*.xml"
           check_name: "plugins test results"

appcheck/firebase-appcheck/firebase-appcheck.gradle

@@ -70,7 +70,6 @@ dependencies {
     testImplementation libs.junit
     testImplementation libs.junit
     testImplementation libs.mockito.core
-    testImplementation libs.mockito.mockito.inline
     testImplementation libs.robolectric
 
     androidTestImplementation project(':appcheck:firebase-appcheck')
@@ -85,5 +84,4 @@ dependencies {
     androidTestImplementation libs.truth
     androidTestImplementation libs.junit
     androidTestImplementation libs.mockito.core
-    androidTestImplementation libs.mockito.mockito.inline
 }

ci/fireci/fireciplugins/macrobenchmark/run/runner.py

@@ -119,7 +119,6 @@ def _process_changed_modules(path: Path) -> List[str]:
     ":firebase-components": ["Firebase", "ComponentDiscovery", "Runtime"],
     ":firebase-database": ["fire-rtdb"],
     ":firebase-datatransport": ["fire-transport"],
-    ":firebase-dynamic-links": ["fire-dl"],
     ":firebase-crashlytics": ["fire-cls"],
     ":firebase-crashlytics-ndk": ["fire-cls"],
     ":firebase-firestore": ["fire-fst"],

docs/README.md

@@ -26,7 +26,6 @@ in your app:
 
   * [`firebase-common`](ktx/common.md)
   * [`firebase-crashlytics`](ktx/crashlytics.md)
-  * [`firebase-dynamic-links`](ktx/dynamic-links.md)
   * [`firebase-firestore`](ktx/firestore.md)
   * [`firebase-functions`](ktx/functions.md)
   * [`firebase-inappmessaging`](ktx/inappmessaging.md)

docs/ktx/dynamic-links.md

@@ -1,5 +1,8 @@
 # Unreleased
-
+* [feature] Added support for configuring the "thinking" budget when using Gemini
+  2.5 series models. (#6990)
+* [feature] **Breaking Change**: Add support for Grounding with Google Search (#7042).
+    * **Action Required:** Update all references of `groundingAttributions`, `webSearchQueries`, `retrievalQueries` in `GroundingMetadata` to be non-optional.
 
 # 16.2.0
 * [changed] Deprecate the `totalBillableCharacters` field (only usable with pre-2.0 models). (#7042)
@@ -31,4 +34,3 @@
 
  Note: This feature is in Public Preview, which means that it is not subject to any SLA or
  deprecation policy and could change in backwards-incompatible ways.
-