Merge branch 'main' into dl/url-context

Author: dlarocque

firebase-ai/CHANGELOG.md

@@ -47,7 +47,7 @@
 
 - [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).
+- [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.
 - [changed] require at least one argument for `generateContent()`, `generateContentStream()` and

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

@@ -307,7 +307,7 @@ public class FinishReason private constructor(public val name: String, public va
 /**
  * Metadata returned to the client when grounding is enabled.
  *
- * If using Grounding with Google Search, you are required to comply with the "Grounding with Google
+ * If using grounding with Google Search, you are required to comply with the "Grounding with Google
  * Search" usage requirements for your chosen API provider:
  * [Gemini Developer API](https://ai.google.dev/gemini-api/terms#grounding-with-google-search) or
  * Vertex AI Gemini API (see [Service Terms](https://cloud.google.com/terms/service-terms) section

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

@@ -22,7 +22,7 @@ import kotlinx.serialization.Serializable
  * A tool that allows the generative model to connect to Google Search to access and incorporate
  * up-to-date information from the web into its responses.
  *
- * When using this feature, you are required to comply with the "Grounding with Google Search" usage
+ * When using this feature, you are required to comply with the "grounding with Google Search" usage
  * requirements for your chosen API provider:
  * [Gemini Developer API](https://ai.google.dev/gemini-api/terms#grounding-with-google-search) or
  * Vertex AI Gemini API (see [Service Terms](https://cloud.google.com/terms/service-terms) section

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

@@ -71,31 +71,34 @@ public class HarmCategory private constructor(public val ordinal: Int) {
     /** A new and not yet supported value. */
     @JvmField public val UNKNOWN: HarmCategory = HarmCategory(0)
 
-    /** Harassment content. */
+    /** Represents the harm category for content that is classified as harassment. */
     @JvmField public val HARASSMENT: HarmCategory = HarmCategory(1)
 
-    /** Hate speech and content. */
+    /** Represents the harm category for content that is classified as hate speech. */
     @JvmField public val HATE_SPEECH: HarmCategory = HarmCategory(2)
 
-    /** Sexually explicit content. */
+    /** Represents the harm category for content that is classified as sexually explicit content. */
     @JvmField public val SEXUALLY_EXPLICIT: HarmCategory = HarmCategory(3)
 
-    /** Dangerous content. */
+    /** Represents the harm category for content that is classified as dangerous content. */
     @JvmField public val DANGEROUS_CONTENT: HarmCategory = HarmCategory(4)
 
-    /** Content that may be used to harm civic integrity. */
+    /**
+     * Represents the harm category for content that is classified as content that may be used to
+     * harm civic integrity.
+     */
     @JvmField public val CIVIC_INTEGRITY: HarmCategory = HarmCategory(5)
 
-    /** Content that is image hate. */
+    /** Represents the harm category for image content that is classified as hateful. */
     @JvmField public val IMAGE_HATE: HarmCategory = HarmCategory(6)
 
-    /** Image dangerous content. */
+    /** Represents the harm category for image content that is classified as dangerous. */
     @JvmField public val IMAGE_DANGEROUS_CONTENT: HarmCategory = HarmCategory(7)
 
-    /** Content is image harassment. */
+    /** Represents the harm category for image content that is classified as harassment. */
     @JvmField public val IMAGE_HARASSMENT: HarmCategory = HarmCategory(8)
 
-    /** Image sexually explicit content. */
+    /** Represents the harm category for image content that is classified as sexually explicit. */
     @JvmField public val IMAGE_SEXUALLY_EXPLICIT: HarmCategory = HarmCategory(9)
   }
 }

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

@@ -65,13 +65,14 @@ internal constructor(
       @OptIn(PublicPreviewAPI::class) return Tool(functionDeclarations, null, null, null)
     }
 
-    /** Creates a [Tool] instance that allows the model to use Code Execution. */
+    /** Creates a [Tool] instance that allows the model to use code execution. */
     @JvmStatic
     public fun codeExecution(): Tool {
       return codeExecutionInstance
     }
 
     /**
+<<<<<<< HEAD
      * Creates a [Tool] instance that allows you to provide additional context to the models in the
      * form of public web URLs. By including URLs in your request, the Gemini model will access the
      * content from those pages to inform and enhance its response.
@@ -91,7 +92,7 @@ internal constructor(
      * Grounding with Google Search can be used to allow the model to connect to Google Search to
      * access and incorporate up-to-date information from the web into it's responses.
      *
-     * When using this feature, you are required to comply with the "Grounding with Google Search"
+     * When using this feature, you are required to comply with the "grounding with Google Search"
      * usage requirements for your chosen API provider:
      * [Gemini Developer API](https://ai.google.dev/gemini-api/terms#grounding-with-google-search)
      * or Vertex AI Gemini API (see [Service Terms](https://cloud.google.com/terms/service-terms)

firebase-firestore/CHANGELOG.md

@@ -1,10 +1,5 @@
 # Unreleased
 
-# 26.0.1
-
-- [changed] Bumped internal dependencies.
-- [changed] Improve the performance of queries in collections that contain many deleted documents.
-  [#7295](//github.com/firebase/firebase-android-sdk/issues/7295)
 - [changed] Improve query performance in large result sets by replacing the deprecated AsyncTask
   thread pool with a self-managed thread pool.
   [#7376](//github.com/firebase/firebase-android-sdk/issues/7376)
@@ -15,6 +10,12 @@
 - [changed] Improve query performance by using an unsorted HashMap instead of a sorted TreeMap.
   [#7389](//github.com/firebase/firebase-android-sdk/pull/7389)
 
+# 26.0.1
+
+- [changed] Bumped internal dependencies.
+- [changed] Improve the performance of queries in collections that contain many deleted documents.
+  [#7295](//github.com/firebase/firebase-android-sdk/issues/7295)
+
 # 26.0.0
 
 - [changed] **Breaking Change**: Updated minSdkVersion to API level 23 or higher.

firebase-functions/firebase-functions.gradle.kts

@@ -15,6 +15,7 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
+  id("LicenseResolverPlugin")
   id("firebase-library")
   id("kotlin-android")
   id("firebase-vendor")
@@ -61,6 +62,8 @@ kotlin {
   explicitApi()
 }
 
+thirdPartyLicenses { add("dagger2", "${projectDir}/third_party/dagger2/LICENSE") }
+
 dependencies {
   javadocClasspath("org.codehaus.mojo:animal-sniffer-annotations:1.21")
   javadocClasspath(libs.autovalue.annotations)

firebase-functions/third_party/dagger2/LICENSE

@@ -0,0 +1,13 @@
+Copyright 2012 The Dagger Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

firebase-sessions/firebase-sessions.gradle.kts

@@ -19,6 +19,7 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
+  id("LicenseResolverPlugin")
   id("firebase-library")
   id("firebase-vendor")
   id("kotlin-android")
@@ -66,6 +67,8 @@ kotlin {
   compilerOptions { jvmTarget = JvmTarget.JVM_1_8 }
 }
 
+thirdPartyLicenses { add("dagger2", "${projectDir}/third_party/dagger2/LICENSE") }
+
 dependencies {
   api(libs.firebase.common)
 

firebase-sessions/third_party/dagger2/LICENSE

@@ -0,0 +1,13 @@
+Copyright 2012 The Dagger Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.