Merge pull request #49 from joreilly/dependency_updates

Initial changes to migrate to use Firebase AI Logic

Author: joreilly

README.md

@@ -1,6 +1,6 @@
 ![kotlin-version](https://img.shields.io/badge/kotlin-2.2.0-blue?logo=kotlin)
 
-# Vertex AI Compose/Kotlin Multiplatform Sample
+# Firebase AI Logic Compose/Kotlin Multiplatform Sample
 
 Compose/Kotlin Multiplatform sample that makes use of the [Firebase Vertex AI SDK](https://firebase.google.com/products/vertex-ai-in-firebase).
 The iOS and Android clients share the same Compose UI code but delegate to platform specific Swift and Kotlin code
@@ -41,4 +41,4 @@ The project uses the following multiplatform dependencies
 *  StarWars (https://github.com/joreilly/StarWars)
 *  WordMasterKMP (https://github.com/joreilly/WordMasterKMP)
 *  Chip-8 (https://github.com/joreilly/chip-8)
-*  Vertex-AI-KMP (https://github.com/joreilly/VertexAI-KMP-Sample)
+*  FirebaseAILogicKMPSample (https://github.com/joreilly/FirebaseAILogicKMPSample)

composeApp/build.gradle.kts

@@ -29,7 +29,7 @@ kotlin {
             implementation(libs.androidx.activity.compose)
 
             implementation(project.dependencies.platform(libs.firebase.bom))
-            implementation(libs.firebase.vertexai)
+            implementation(libs.firebase.ai)
         }
         commonMain.dependencies {
             implementation(libs.kotlinx.serialization)

composeApp/google-services.json

@@ -2,7 +2,7 @@
   "project_info": {
     "project_number": "1046936014894",
     "project_id": "vertex-ai-kmp",
-    "storage_bucket": "vertex-ai-kmp.appspot.com"
+    "storage_bucket": "vertex-ai-kmp.firebasestorage.app"
   },
   "client": [
     {

composeApp/src/androidMain/AndroidManifest.xml

@@ -7,7 +7,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:name=".VertexAIKMPApp"
+        android:name=".FirebaaseAILogicKMPApp"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@android:style/Theme.Material.Light.NoActionBar">

composeApp/src/androidMain/kotlin/dev/johnoreilly/vertexai/VertexAIKMPApp.kt renamed to composeApp/src/androidMain/kotlin/dev/johnoreilly/vertexai/FirebaaseAILogicKMPApp.kt

@@ -5,7 +5,7 @@ import com.google.firebase.FirebaseApp
 import dev.johnoreilly.vertexai.di.initialiseKoin
 
 
-class VertexAIKMPApp : Application() {
+class FirebaaseAILogicKMPApp : Application() {
     override fun onCreate() {
         super.onCreate()
         FirebaseApp.initializeApp(this)

composeApp/src/androidMain/kotlin/dev/johnoreilly/vertexai/GenerativeModel.android.kt

@@ -1,10 +1,11 @@
 package dev.johnoreilly.vertexai
 
 import com.google.firebase.Firebase
-import com.google.firebase.vertexai.type.PublicPreviewAPI
-import com.google.firebase.vertexai.type.Schema
-import com.google.firebase.vertexai.type.generationConfig
-import com.google.firebase.vertexai.vertexAI
+import com.google.firebase.ai.type.PublicPreviewAPI
+import com.google.firebase.ai.type.Schema
+import com.google.firebase.ai.type.generationConfig
+import com.google.firebase.ai.ai
+import com.google.firebase.ai.type.GenerativeBackend
 
 
 class GenerativeModelAndroid : GenerativeModel {
@@ -18,16 +19,16 @@ class GenerativeModelAndroid : GenerativeModel {
     )
 
     override suspend fun generateTextContent(prompt: String): String? {
-        val generativeModel = Firebase.vertexAI.generativeModel(
-            modelName = "gemini-1.5-flash"
+        val generativeModel = Firebase.ai(backend = GenerativeBackend.googleAI()).generativeModel(
+            modelName = "gemini-2.5-flash"
         )
 
         return generativeModel.generateContent(prompt).text
     }
 
     override suspend fun generateJsonContent(prompt: String): String? {
-        val generativeModel = Firebase.vertexAI.generativeModel(
-            modelName = "gemini-1.5-flash",
+        val generativeModel = Firebase.ai.generativeModel(
+            modelName = "gemini-2.5-flash",
             generationConfig = generationConfig {
                 responseMimeType = "application/json"
                 responseSchema = jsonSchema
@@ -39,7 +40,7 @@ class GenerativeModelAndroid : GenerativeModel {
 
     @OptIn(PublicPreviewAPI::class)
     override suspend fun generateImage(prompt: String): ByteArray? {
-        val imageModel = Firebase.vertexAI.imagenModel(
+        val imageModel = Firebase.ai.imagenModel(
             modelName = "imagen-3.0-generate-002"
         )
         val imageResponse = imageModel.generateImages(prompt)

composeApp/src/androidMain/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">VertexAIKMP</string>
+    <string name="app_name">FirebaseAILogicKMPSample</string>
 </resources>

composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/ui/App.kt

@@ -18,7 +18,7 @@ fun App() {
         Scaffold(
             topBar = {
                 CenterAlignedTopAppBar(title = {
-                    Text("VertexAI-KMP")
+                    Text("FirebaseAILogicKMPSampe")
                 })
             }
         ) {

composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/ui/HomeScreen.kt

@@ -43,11 +43,11 @@ import coil3.compose.AsyncImage
 import coil3.compose.LocalPlatformContext
 import coil3.request.ImageRequest
 import com.mikepenz.markdown.m3.Markdown
+import firebaseailogickmpsample.composeapp.generated.resources.Res
+import firebaseailogickmpsample.composeapp.generated.resources.generate_content
+import firebaseailogickmpsample.composeapp.generated.resources.generate_image
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
-import vertexai_kmp_sample.composeapp.generated.resources.Res
-import vertexai_kmp_sample.composeapp.generated.resources.generate_content
-import vertexai_kmp_sample.composeapp.generated.resources.generate_image
 
 @Composable
 fun HomeScreen() {

gradle/libs.versions.toml

@@ -1,25 +1,25 @@
 [versions]
-agp = "8.11.1"
+agp = "8.12.0"
 androidx-activityCompose = "1.10.1"
 androidx-ui-tooling = "1.8.3"
-coil = "3.2.0"
+coil = "3.3.0"
 compose-multiplatform = "1.8.2"
-firebaseBom = "33.16.0"
+firebaseBom = "34.1.0"
 googleServices = "4.4.3"
 koin = "4.1.0"
 kotlin = "2.2.0"
 kotlinx-serialization = "1.9.0"
 markdownRenderer = "0.35.0"
 composeLifecyleRuntime="2.9.1"
-skie = "0.10.4"
+skie = "0.10.5"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-ui-tooling" }
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
-firebase-vertexai = { module = "com.google.firebase:firebase-vertexai" }
+firebase-ai = { module = "com.google.firebase:firebase-ai" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koin" }
 kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinx-serialization" }