Merge branch 'main' into daymon-align-proto

google-gemini · Jul 3, 2024 · c60b20d · c60b20d
2 parents 97ee570 + f0559c8
commit c60b20d
Show file tree

Hide file tree

Showing 9 changed files with 2,068 additions and 6 deletions.
diff --git a/.changes/common/angle-carpenter-beam-clock.json b/.changes/common/angle-carpenter-beam-clock.json
diff --git a/.changes/generativeai/beef-collar-burn-aftermath.json b/.changes/generativeai/beef-collar-burn-aftermath.json
diff --git a/.changes/generativeai/direction-bee-brass-aftermath.json b/.changes/generativeai/direction-bee-brass-aftermath.json
diff --git a/api/common/0.8.0.api b/api/common/0.8.0.api
diff --git a/api/generativeai/0.9.0.api b/api/generativeai/0.9.0.api
diff --git a/common/gradle.properties b/common/gradle.properties
@@ -1 +1 @@
-version=0.7.1
+version=0.8.0
diff --git a/common/src/test/java/com/google/ai/client/generativeai/common/UnarySnapshotTests.kt b/common/src/test/java/com/google/ai/client/generativeai/common/UnarySnapshotTests.kt
@@ -84,7 +84,13 @@ internal class UnarySnapshotTests {
       withTimeout(testTimeout) {
         val response = apiController.generateContent(textGenerateContentRequest("prompt"))
 
+<<<<<<< daymon-align-proto
         response.candidates.first { it.safetyRatings.any { it.category == HarmCategory.UNKNOWN } }
+=======
+        response.candidates?.isNullOrEmpty() shouldBe false
+        val candidate = response.candidates?.first()
+        candidate?.safetyRatings?.any { it.category == HarmCategory.UNKNOWN } shouldBe true
+>>>>>>> main
       }
     }
 

diff --git a/generativeai-android-sample/app/build.gradle.kts b/generativeai-android-sample/app/build.gradle.kts
@@ -75,5 +75,5 @@ dependencies {
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 
-    implementation("com.google.ai.client.generativeai:generativeai:0.7.0")
+    implementation("com.google.ai.client.generativeai:generativeai:0.9.0")
 }
diff --git a/generativeai/gradle.properties b/generativeai/gradle.properties
@@ -1 +1 @@
-version=0.8.0
+version=0.9.0