Skip to content

Commit e7b1b2a

Browse files
authored
chore(ai, fdc): upgrade to Coil 3 (#2765)
This should remove Coil 2 from our codebase and keep Coil 3 only :)
1 parent 0da91fe commit e7b1b2a

6 files changed

Lines changed: 10 additions & 12 deletions

File tree

dataconnect/app/src/main/java/com/google/firebase/example/dataconnect/feature/actordetail/ActorDetailScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import androidx.compose.ui.layout.ContentScale
2525
import androidx.compose.ui.res.stringResource
2626
import androidx.compose.ui.unit.dp
2727
import androidx.lifecycle.viewmodel.compose.viewModel
28-
import coil.compose.AsyncImage
28+
import coil3.compose.AsyncImage
2929
import com.google.firebase.dataconnect.movies.GetActorByIdQuery
3030
import com.google.firebase.example.dataconnect.R
3131
import com.google.firebase.example.dataconnect.ui.components.ErrorCard

dataconnect/app/src/main/java/com/google/firebase/example/dataconnect/feature/moviedetail/MovieDetailScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import androidx.compose.ui.layout.ContentScale
3838
import androidx.compose.ui.res.stringResource
3939
import androidx.compose.ui.unit.dp
4040
import androidx.lifecycle.viewmodel.compose.viewModel
41-
import coil.compose.AsyncImage
41+
import coil3.compose.AsyncImage
4242
import com.google.firebase.dataconnect.movies.GetMovieByIdQuery
4343
import com.google.firebase.example.dataconnect.R
4444
import com.google.firebase.example.dataconnect.ui.components.Actor

dataconnect/app/src/main/java/com/google/firebase/example/dataconnect/ui/components/ActorsList.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import androidx.compose.ui.draw.clip
2222
import androidx.compose.ui.layout.ContentScale
2323
import androidx.compose.ui.text.style.TextOverflow
2424
import androidx.compose.ui.unit.dp
25-
import coil.compose.AsyncImage
25+
import coil3.compose.AsyncImage
2626

2727
val ACTOR_CARD_SIZE = 64.dp
2828

dataconnect/app/src/main/java/com/google/firebase/example/dataconnect/ui/components/MoviesList.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import androidx.compose.ui.layout.ContentScale
1717
import androidx.compose.ui.text.style.TextOverflow
1818
import androidx.compose.ui.unit.Dp
1919
import androidx.compose.ui.unit.dp
20-
import coil.compose.AsyncImage
20+
import coil3.compose.AsyncImage
2121

2222
/**
2323
* Used to represent a movie in a list UI

firebase-ai/app/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
plugins {
3-
id("com.android.application")
4-
id("org.jetbrains.kotlin.plugin.compose")
5-
id("org.jetbrains.kotlin.plugin.serialization")
6-
id("com.google.gms.google-services")
3+
alias(libs.plugins.android.application)
4+
alias(libs.plugins.compose.compiler)
5+
alias(libs.plugins.kotlin.serialization)
6+
alias(libs.plugins.google.services)
77
}
88

99
android {
@@ -75,7 +75,7 @@ dependencies {
7575
implementation(libs.firebase.ai)
7676

7777
// Image loading
78-
implementation(libs.coil3.coil.compose)
78+
implementation(libs.coil.compose)
7979
implementation(libs.coil.network.okhttp)
8080
implementation(libs.coil.svg)
8181

gradle/libs.versions.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
activityCompose = "1.12.1"
33
agp = "9.0.0"
44
camerax = "1.5.2"
5-
coilCompose = "2.7.0"
65
coil3Compose = "3.3.0"
76
composeBom = "2025.12.00"
87
composeNavigation = "2.9.6"
@@ -48,10 +47,9 @@ androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-man
4847
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
4948
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
5049
androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "webkit" }
51-
coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" }
50+
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3Compose" }
5251
coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil3Compose" }
5352
coil-svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil3Compose" }
54-
coil3-coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3Compose" }
5553
compose-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "composeNavigation"}
5654
firebase-ai = { module = "com.google.firebase:firebase-ai" }
5755
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }

0 commit comments

Comments
 (0)