diff --git a/CHANGELOG.md b/CHANGELOG.md index b76dc90a82..bcf75c5cb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,7 +66,7 @@ - Use version catalog for gradle plugins - Update dependency org.jsoup:jsoup to v1.7.1 - Bump dependency com.github.tachiyomiorg:image-decoder revision to 41c059e540 -- Update dependency io.coil-kt.coil3 to v3.0.0-alpha08 +- Update dependency io.coil-kt.coil3 to v3.0.0-alpha10 - Update Android Gradle Plugin to v8.5.1 - Update gradle to v8.9 - Start using Voyager for navigation diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e30ac54b5a..f94ae44a58 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -170,12 +170,6 @@ dependencies { implementation(libs.compose.theme.adapter3) implementation(libs.accompanist.webview) - // Modified dependencies - implementation(libs.subsamplingscaleimageview) { - exclude(module = "image-decoder") - } - implementation(libs.image.decoder) - implementation(libs.flexbox) implementation(libs.material) @@ -228,7 +222,12 @@ dependencies { implementation(libs.conductor.support.preference) // Image library + implementation(platform(libs.coil3.bom)) implementation(libs.bundles.coil) + implementation(libs.subsamplingscaleimageview) { // modified + exclude(module = "image-decoder") + } + implementation(libs.image.decoder) // Sort implementation(libs.java.nat.sort) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52381b4faa..a832d49c27 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,6 @@ [versions] aboutlibraries = "11.2.2" chucker = "3.5.2" -coil3 = "3.0.0-alpha08" flexible-adapter = "c8013533" fast_adapter = "5.6.0" moko = "0.24.1" @@ -21,10 +20,11 @@ aboutlibraries = { module = "com.mikepenz:aboutlibraries-compose-m3", version.re accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version = "0.30.1" } chucker-library-no-op = { module = "com.github.ChuckerTeam.Chucker:library-no-op", version.ref = "chucker" } chucker-library = { module = "com.github.ChuckerTeam.Chucker:library", version.ref = "chucker" } -coil3 = { module = "io.coil-kt.coil3:coil", version.ref = "coil3" } -coil3-svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil3" } -coil3-gif = { module = "io.coil-kt.coil3:coil-gif", version.ref = "coil3" } -coil3-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil3" } +coil3-bom = { module = "io.coil-kt.coil3:coil", version = "3.0.0-alpha10" } +coil3 = { module = "io.coil-kt.coil3:coil" } +coil3-svg = { module = "io.coil-kt.coil3:coil-svg" } +coil3-gif = { module = "io.coil-kt.coil3:coil-gif" } +coil3-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp" } compose-theme-adapter3 = { module = "com.google.accompanist:accompanist-themeadapter-material3", version = "0.33.2-alpha" } conductor = { module = "com.bluelinelabs:conductor", version = "4.0.0-preview-4" } conductor-support-preference = { module = "com.github.tachiyomiorg:conductor-support-preference", version = "3.0.0" }