[1.198.*] Pre-release merge (#659)

msasikanth · Jul 25, 2024 · 1bcdcfa · 1bcdcfa
2 parents e886688 + c571fcd
commit 1bcdcfa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,14 +18,14 @@ essenty = "2.1.0"
 androidx_activity = "1.9.1"
 androidx_appcompat = "1.7.0"
 androidx_core = "1.13.1"
-androidx_collection = "1.4.1"
+androidx_collection = "1.4.2"
 androidx_test_runner = "1.6.1"
 androidx_test_rules = "1.6.1"
 androidx_work = "2.9.0"
 androidx_datastore = "1.1.1"
 androidx_browser = "1.8.0"
 androidx_annotation = "1.8.1"
-coil = "3.0.0-alpha04"
+coil = "3.0.0-alpha09"
 spotless = "6.25.0"
 ktfmt = "0.44"
 kotlininject = "0.7.1"
@@ -92,7 +92,7 @@ androidx_datastore_preferences = { module = "androidx.datastore:datastore-prefer
 androidx_browser = { module = "androidx.browser:browser", version.ref = "androidx_browser" }
 androidx_annotation= { module = "androidx.annotation:annotation", version.ref = "androidx_annotation" }
 coil_compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
-coil_network = { module = "io.coil-kt.coil3:coil-network-ktor", version.ref = "coil" }
+coil_network = { module = "io.coil-kt.coil3:coil-network-ktor2", version.ref = "coil" }
 coil_svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil" }
 kotlininject-compiler = { module = 'me.tatarka.inject:kotlin-inject-compiler-ksp', version.ref = 'kotlininject' }
 kotlininject-runtime = { module = 'me.tatarka.inject:kotlin-inject-runtime', version.ref = 'kotlininject' }

diff --git a/shared/src/androidMain/kotlin/dev/sasikanth/rss/reader/utils/CoilExt.android.kt b/shared/src/androidMain/kotlin/dev/sasikanth/rss/reader/utils/CoilExt.android.kt
@@ -22,6 +22,7 @@ import androidx.core.graphics.drawable.toBitmap
 import coil3.Image
 import coil3.PlatformContext
 import coil3.annotation.ExperimentalCoilApi
+import coil3.asDrawable
 
 @OptIn(ExperimentalCoilApi::class)
 actual fun Image.toComposeImageBitmap(context: PlatformContext): ImageBitmap {

diff --git a/shared/src/iosMain/kotlin/dev/sasikanth/rss/reader/utils/CoilExt.ios.kt b/shared/src/iosMain/kotlin/dev/sasikanth/rss/reader/utils/CoilExt.ios.kt
@@ -21,8 +21,9 @@ import androidx.compose.ui.graphics.asComposeImageBitmap
 import coil3.Image
 import coil3.PlatformContext
 import coil3.annotation.ExperimentalCoilApi
+import coil3.toBitmap
 
 @OptIn(ExperimentalCoilApi::class)
 actual fun Image.toComposeImageBitmap(context: PlatformContext): ImageBitmap {
-  return asBitmap().asComposeImageBitmap()
+  return toBitmap().asComposeImageBitmap()
 }