diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d08c06de0..a035b311a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,8 +9,7 @@ agp = "8.7.2" anvil = "0.4.0" atomicfu = "0.26.0" benchmark = "1.3.3" -coil = "2.7.0" -coil3 = "3.0.3" +coil = "3.0.3" compose-animation = "1.7.5" compose-foundation = "1.7.5" compose-material = "1.7.5" @@ -166,14 +165,11 @@ baselineProfilePlugin = { module = "androidx.benchmark:benchmark-baseline-profil clikt = "com.github.ajalt.clikt:clikt:5.0.1" -coil = { module = "io.coil-kt:coil", version.ref = "coil" } -coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } -coil-test = { module = "io.coil-kt:coil-test", version.ref = "coil" } -coil3 = { module = "io.coil-kt.coil3:coil", version.ref = "coil3" } -coil3-compose = { module = "io.coil-kt.coil3:coil-compose-core", version.ref = "coil3" } -coil3-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil3" } -coil3-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil3" } -coil3-test = { module = "io.coil-kt.coil3:coil-test", version.ref = "coil3" } +coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" } +coil-compose = { module = "io.coil-kt.coil3:coil-compose-core", version.ref = "coil" } +coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" } +coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" } +coil-test = { module = "io.coil-kt.coil3:coil-test", version.ref = "coil" } compose-compiler = { module = "org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable", version.ref = "kotlin" } compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose-jb" } diff --git a/samples/star/build.gradle.kts b/samples/star/build.gradle.kts index 0c784113b..127b5e44a 100644 --- a/samples/star/build.gradle.kts +++ b/samples/star/build.gradle.kts @@ -69,9 +69,9 @@ kotlin { commonMain { dependencies { implementation(libs.androidx.datastore.preferences) - implementation(libs.coil3) - implementation(libs.coil3.compose) - implementation(libs.coil3.network.ktor) + implementation(libs.coil) + implementation(libs.coil.compose) + implementation(libs.coil.network.ktor) implementation(libs.compose.foundation) implementation(libs.compose.material.material) implementation(libs.compose.material.material3) @@ -120,7 +120,7 @@ kotlin { implementation(libs.compose.material.icons) implementation(libs.dagger) implementation(libs.jsoup) - implementation(libs.coil3.network.okhttp) + implementation(libs.coil.network.okhttp) implementation(libs.ktor.client.engine.okhttp) implementation(libs.okhttp) implementation(libs.okhttp.loggingInterceptor) diff --git a/samples/star/coil-rule/build.gradle.kts b/samples/star/coil-rule/build.gradle.kts index fce5f7d40..ceeceb17f 100644 --- a/samples/star/coil-rule/build.gradle.kts +++ b/samples/star/coil-rule/build.gradle.kts @@ -1,6 +1,5 @@ // Copyright (C) 2023 Slack Technologies, LLC // SPDX-License-Identifier: Apache-2.0 -import org.jetbrains.compose.ExperimentalComposeLibrary import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi plugins { @@ -21,10 +20,10 @@ kotlin { commonMain { dependencies { api(libs.junit) - api(libs.coil3) - api(libs.coil3.test) + api(libs.coil) + api(libs.coil.test) implementation(libs.compose.runtime) // Required for the compose compiler - @OptIn(ExperimentalComposeLibrary::class) implementation(compose.components.resources) + implementation(compose.components.resources) } } androidMain { dependencies { implementation(libs.androidx.test.monitor) } }