From 490b58a5e93117db20ad37e9eb811e54bd3ccc0d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 11:03:32 +0000
Subject: [PATCH 1/2] Update dependency org.jetbrains.compose to v1.5.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1f62870..49fbe53 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ sdk-min = "24"
 agp = "8.1.1"
 kotlin = "1.9.0"
 versions = "0.47.0"
-compose-multiplatform = "1.4.3"
+compose-multiplatform = "1.5.0"
 androidx-core-ktx = "1.10.1"
 androidx-appcompat = "1.6.1"
 androidx-lifecycle = "2.6.1"

From 2cd343533ac2bd01d30613b0d5d184b4d83aac4b Mon Sep 17 00:00:00 2001
From: Jordon de Hoog <jordon.dehoog@gmail.com>
Date: Tue, 29 Aug 2023 11:00:16 -0400
Subject: [PATCH 2/2] fix build errors

---
 demo/composeApp/build.gradle.kts                             | 5 +----
 demo/composeApp/composeApp.podspec                           | 2 +-
 .../src/commonMain/kotlin/com/materialkolor/demo/App.kt      | 2 +-
 gradle.properties                                            | 1 -
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/demo/composeApp/build.gradle.kts b/demo/composeApp/build.gradle.kts
index 99581a8..b690fc9 100644
--- a/demo/composeApp/build.gradle.kts
+++ b/demo/composeApp/build.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UNUSED_VARIABLE")
-
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
@@ -41,7 +39,6 @@ kotlin {
             baseName = "ComposeApp"
             isStatic = true
         }
-        extraSpecAttributes["resources"] = "['src/commonMain/resources/**']"
     }
 
     sourceSets {
@@ -121,7 +118,7 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    packagingOptions {
+    packaging {
         resources.excludes.add("META-INF/**")
     }
 }
diff --git a/demo/composeApp/composeApp.podspec b/demo/composeApp/composeApp.podspec
index 889be0d..370db94 100644
--- a/demo/composeApp/composeApp.podspec
+++ b/demo/composeApp/composeApp.podspec
@@ -35,5 +35,5 @@ Pod::Spec.new do |spec|
             SCRIPT
         }
     ]
-    spec.resources = ['src/commonMain/resources/**']
+    spec.resources = ['build/compose/ios/ComposeApp/compose-resources']
 end
\ No newline at end of file
diff --git a/demo/composeApp/src/commonMain/kotlin/com/materialkolor/demo/App.kt b/demo/composeApp/src/commonMain/kotlin/com/materialkolor/demo/App.kt
index fcce95b..3fcaa45 100644
--- a/demo/composeApp/src/commonMain/kotlin/com/materialkolor/demo/App.kt
+++ b/demo/composeApp/src/commonMain/kotlin/com/materialkolor/demo/App.kt
@@ -124,7 +124,7 @@ internal fun App() {
                 modifier = Modifier.fillMaxWidth().wrapContentWidth(),
                 horizontalArrangement = Arrangement.spacedBy(8.dp),
             ) {
-                PaletteStyle.values().forEach { paletteStyle ->
+                PaletteStyle.entries.forEach { paletteStyle ->
                     FilterChip(
                         label = { Text(text = paletteStyle.name) },
                         selected = style == paletteStyle,
diff --git a/gradle.properties b/gradle.properties
index b5351d9..447c9a1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 org.jetbrains.compose.experimental.uikit.enabled=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true
-kotlin.native.cacheKind=none
 
 # Maven
 SONATYPE_HOST=S01