Merge pull request #546 from skydoves/kotlin/2.0.20

Bump Kotlin to 2.0.20, compose bom, and several dependencies
skydoves · Sep 11, 2024 · 4fb8802 · 4fb8802
2 parents 721f939 + e61c107
commit 4fb8802
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/app/src/main/kotlin/com/github/skydoves/landscapistdemo/ui/MainPosters.kt b/app/src/main/kotlin/com/github/skydoves/landscapistdemo/ui/MainPosters.kt
@@ -60,7 +60,6 @@ import com.kmpalette.palette.graphics.Palette
 import com.skydoves.landscapist.ImageOptions
 import com.skydoves.landscapist.animation.circular.CircularRevealPlugin
 import com.skydoves.landscapist.animation.crossfade.CrossfadePlugin
-import com.skydoves.landscapist.coil3.CoilImage
 import com.skydoves.landscapist.components.rememberImageComponent
 import com.skydoves.landscapist.fresco.FrescoImage
 import com.skydoves.landscapist.glide.GlideImage
@@ -78,9 +77,9 @@ fun DisneyPosters(
   val poster: Poster by vm.poster
 
   Column(
-    Modifier
-      .verticalScroll(rememberScrollState())
-      .padding(paddingValues),
+      Modifier
+          .verticalScroll(rememberScrollState())
+          .padding(paddingValues),
   ) {
     LazyRow {
       item {
@@ -117,8 +116,8 @@ private fun PosterItem(
     FrescoImage(
       imageUrl = poster.image,
       modifier = Modifier
-        .size(50.dp)
-        .clickable { vm.poster.value = poster },
+          .size(50.dp)
+          .clickable { vm.poster.value = poster },
       imageOptions = ImageOptions(contentScale = ContentScale.Crop),
       component = rememberImageComponent {
         +CrossfadePlugin()
@@ -134,7 +133,7 @@ private fun SelectedPoster(
 ) {
   var palette by rememberPaletteState(null)
 
-  CoilImage(
+  GlideImage(
     imageModel = { poster.image },
     modifier = Modifier.aspectRatio(0.8f),
     component = rememberImageComponent {
@@ -180,9 +179,9 @@ private fun SelectedPoster(
   GlideImage(
     imageModel = { poster.gif },
     modifier = Modifier
-      .fillMaxWidth()
-      .padding(8.dp)
-      .clip(RoundedCornerShape(8.dp)),
+        .fillMaxWidth()
+        .padding(8.dp)
+        .clip(RoundedCornerShape(8.dp)),
     previewPlaceholder = painterResource(id = R.drawable.poster),
   )
 
@@ -201,14 +200,14 @@ private fun ColorPalettes(palette: Palette?) {
       Crossfade(
         targetState = color,
         modifier = Modifier
-          .padding(horizontal = 8.dp)
-          .size(45.dp),
+            .padding(horizontal = 8.dp)
+            .size(45.dp),
         label = "ColorPalettes",
       ) {
         Box(
           modifier = Modifier
-            .background(color = Color(it))
-            .fillMaxSize(),
+              .background(color = Color(it))
+              .fillMaxSize(),
         )
       }
     }
@@ -221,8 +220,8 @@ private fun SelectedPosterPreview() {
   DisneyComposeTheme(darkTheme = false) {
     Column(
       modifier = Modifier
-        .fillMaxSize()
-        .verticalScroll(rememberScrollState()),
+          .fillMaxSize()
+          .verticalScroll(rememberScrollState()),
     ) {
       SelectedPoster(poster = MockUtil.getMockPoster())
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-kotlin = "2.0.0"
+kotlin = "2.0.20"
 dokka = "1.9.20"
 jvmTarget = "11"
 nexusPlugin = "0.29.0"
 kotlinxCoroutines = "1.8.1"
-kotlinBinaryCompatibility = "0.14.0"
+kotlinBinaryCompatibility = "0.16.3"
 androidGradlePlugin = "8.6.0"
 androidxActivity = "1.9.2"
 androidxMaterial = "1.12.0"
@@ -22,7 +22,7 @@ glide = "4.16.0"
 fresco = "3.2.0"
 coil = "2.7.0"
 coil3 = "3.0.0-alpha10"
-ktor = "2.3.11"
+ktor = "2.3.12"
 palette = "3.1.0"
 hilt = "2.52"
 spotless = "6.21.0"