Merge pull request #432 from skydoves/palette/3.1.0

Migrate kmp palette to 3.1.0
skydoves · Feb 12, 2024 · 6d08456 · 6d08456
2 parents 3f002fc + 90cdc8c
commit 6d08456
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 14 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
@@ -51,12 +51,12 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.palette.graphics.Palette
 import com.github.skydoves.landscapistdemo.R
 import com.github.skydoves.landscapistdemo.model.MockUtil
 import com.github.skydoves.landscapistdemo.model.Poster
 import com.github.skydoves.landscapistdemo.theme.DisneyComposeTheme
 import com.github.skydoves.landscapistdemo.theme.background
+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

diff --git a/app/src/main/kotlin/com/github/skydoves/landscapistdemo/ui/PaletteColorExtensions.kt b/app/src/main/kotlin/com/github/skydoves/landscapistdemo/ui/PaletteColorExtensions.kt
@@ -15,7 +15,7 @@
  */
 package com.github.skydoves.landscapistdemo.ui
 
-import androidx.palette.graphics.Palette
+import com.kmpalette.palette.graphics.Palette
 
 fun Palette?.paletteColorList(): List<Int> {
   return listOf(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ fresco = "3.1.3"
 coil = "2.5.0"
 coil3 = "3.0.0-alpha04"
 ktor = "2.3.8"
-palette = "2.2.0"
+palette = "3.1.0"
 hilt = "2.50"
 spotless = "6.21.0"
 

diff --git a/landscapist-palette/api/android/landscapist-palette.api b/landscapist-palette/api/android/landscapist-palette.api
@@ -1,9 +1,9 @@
 public abstract interface class com/skydoves/landscapist/palette/PaletteBuilderInterceptor {
-	public abstract fun intercept (Landroidx/palette/graphics/Palette$Builder;)Landroidx/palette/graphics/Palette$Builder;
+	public abstract fun intercept (Lcom/kmpalette/palette/graphics/Palette$Builder;)Lcom/kmpalette/palette/graphics/Palette$Builder;
 }
 
 public abstract interface class com/skydoves/landscapist/palette/PaletteLoadedListener {
-	public abstract fun onPaletteLoaded (Landroidx/palette/graphics/Palette;)V
+	public abstract fun onPaletteLoaded (Lcom/kmpalette/palette/graphics/Palette;)V
 }
 
 public final class com/skydoves/landscapist/palette/PalettePlugin : com/skydoves/landscapist/plugins/ImagePlugin$SuccessStatePlugin {
@@ -20,6 +20,6 @@ public final class com/skydoves/landscapist/palette/PalettePlugin : com/skydoves
 }
 
 public final class com/skydoves/landscapist/palette/RememberPaletteStateKt {
-	public static final fun rememberPaletteState (Landroidx/palette/graphics/Palette;Landroidx/compose/runtime/SnapshotMutationPolicy;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/MutableState;
+	public static final fun rememberPaletteState (Lcom/kmpalette/palette/graphics/Palette;Landroidx/compose/runtime/SnapshotMutationPolicy;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/MutableState;
 }
 
diff --git a/landscapist-palette/api/desktop/landscapist-palette.api b/landscapist-palette/api/desktop/landscapist-palette.api
@@ -1,9 +1,9 @@
 public abstract interface class com/skydoves/landscapist/palette/PaletteBuilderInterceptor {
-	public abstract fun intercept (Landroidx/palette/graphics/Palette$Builder;)Landroidx/palette/graphics/Palette$Builder;
+	public abstract fun intercept (Lcom/kmpalette/palette/graphics/Palette$Builder;)Lcom/kmpalette/palette/graphics/Palette$Builder;
 }
 
 public abstract interface class com/skydoves/landscapist/palette/PaletteLoadedListener {
-	public abstract fun onPaletteLoaded (Landroidx/palette/graphics/Palette;)V
+	public abstract fun onPaletteLoaded (Lcom/kmpalette/palette/graphics/Palette;)V
 }
 
 public final class com/skydoves/landscapist/palette/PalettePlugin : com/skydoves/landscapist/plugins/ImagePlugin$SuccessStatePlugin {
@@ -20,6 +20,6 @@ public final class com/skydoves/landscapist/palette/PalettePlugin : com/skydoves
 }
 
 public final class com/skydoves/landscapist/palette/RememberPaletteStateKt {
-	public static final fun rememberPaletteState (Landroidx/palette/graphics/Palette;Landroidx/compose/runtime/SnapshotMutationPolicy;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/MutableState;
+	public static final fun rememberPaletteState (Lcom/kmpalette/palette/graphics/Palette;Landroidx/compose/runtime/SnapshotMutationPolicy;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/MutableState;
 }
 
diff --git a/landscapist-palette/build.gradle.kts b/landscapist-palette/build.gradle.kts
@@ -69,7 +69,7 @@ android {
   compileSdk = Configuration.compileSdk
 
   defaultConfig {
-    minSdk = Configuration.minSdk24
+    minSdk = Configuration.minSdk
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 }

diff --git a/landscapist-palette/src/commonMain/kotlin/com/skydoves/landscapist/palette/BitmapPalette.kt b/landscapist-palette/src/commonMain/kotlin/com/skydoves/landscapist/palette/BitmapPalette.kt
@@ -18,7 +18,6 @@ package com.skydoves.landscapist.palette
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.graphics.ImageBitmap
-import androidx.palette.graphics.Palette
 import com.kmpalette.rememberPaletteState
 
 /**

diff --git a/...lette/src/commonMain/kotlin/com/skydoves/landscapist/palette/PaletteBuilderInterceptor.kt b/...lette/src/commonMain/kotlin/com/skydoves/landscapist/palette/PaletteBuilderInterceptor.kt
@@ -15,7 +15,7 @@
  */
 package com.skydoves.landscapist.palette
 
-import androidx.palette.graphics.Palette
+import com.kmpalette.palette.graphics.Palette
 
 /** A definition for intercepting [Palette.Builder] before loading. */
 public fun interface PaletteBuilderInterceptor {

diff --git a/...t-palette/src/commonMain/kotlin/com/skydoves/landscapist/palette/PaletteLoadedListener.kt b/...t-palette/src/commonMain/kotlin/com/skydoves/landscapist/palette/PaletteLoadedListener.kt
@@ -15,7 +15,7 @@
  */
 package com.skydoves.landscapist.palette
 
-import androidx.palette.graphics.Palette
+import com.kmpalette.palette.graphics.Palette
 
 /** A definition for listening to the palette loaded. */
 public fun interface PaletteLoadedListener {

diff --git a/...st-palette/src/commonMain/kotlin/com/skydoves/landscapist/palette/RememberPaletteState.kt b/...st-palette/src/commonMain/kotlin/com/skydoves/landscapist/palette/RememberPaletteState.kt
@@ -21,7 +21,7 @@ import androidx.compose.runtime.SnapshotMutationPolicy
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.structuralEqualityPolicy
-import androidx.palette.graphics.Palette
+import com.kmpalette.palette.graphics.Palette
 
 /**
  * Create a mutable state and remember the new instance of [Palette] that is wrapped by [MutableState]