Support Compose version 1.7.X

Author: LakeLab

build.gradle.kts

@@ -6,8 +6,8 @@
 
 
 plugins {
-    id("com.android.application") version "8.5.1" apply false
-    id("com.android.library") version "8.5.1" apply false
+    id("com.android.application") version "8.5.2" apply false
+    id("com.android.library") version "8.5.2" apply false
     id("org.jetbrains.kotlin.android") version "2.0.0" apply false
     id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
 }

buildSrc/src/main/kotlin/io/github/naverz/pinocchio/Dependencies.kt

@@ -16,10 +16,10 @@ object Dependencies {
         const val CONSTRAINT_LAYOUT = "androidx.constraintlayout:constraintlayout:2.1.1"
 
         object Compose {
-            const val UI_TOOLING = "androidx.compose.ui:ui-tooling:${Versions.COMPOSE_VERSION}"
-            const val ACTIVITY_COMPOSE = "androidx.activity:activity-compose:1.9.1"
-            const val COMPOSE_FOUNDATION =
-                "androidx.compose.foundation:foundation:${Versions.COMPOSE_VERSION}"
+            const val BOM = "androidx.compose:compose-bom:${Versions.COMPOSE_BOM}"
+            const val UI_TOOLING = "androidx.compose.ui:ui-tooling"
+            const val ACTIVITY_COMPOSE = "androidx.activity:activity-compose"
+            const val COMPOSE_FOUNDATION = "androidx.compose.foundation:foundation"
         }
     }
 }

buildSrc/src/main/kotlin/io/github/naverz/pinocchio/Versions.kt

@@ -2,5 +2,5 @@ package io.github.naverz.pinocchio
 
 object Versions {
     const val ANDROID_COMPILE_SDK_NO = 34
-    const val COMPOSE_VERSION = "1.6.8"
+    const val COMPOSE_BOM = "2024.12.01"
 }

hsvpicker/compose/README.md

@@ -26,6 +26,12 @@ HSVPicker is an easy and highly customizable HSV picker library for Android.
  <tr>
   <td>Compose UI 1.5 (1.5.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.naverz.pinocchio/hsvpicker-compose?versionPrefix=1.4"></td>
  </tr>
+ <tr>
+  <td>Compose UI 1.6 (1.6.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.naverz.pinocchio/hsvpicker-compose?versionPrefix=1.5"></td>
+ </tr>
+ <tr>
+  <td>Compose UI 1.7 (1.7.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.naverz.pinocchio/hsvpicker-compose?versionPrefix=1.6"></td>
+ </tr>
 </table>
 
 ## Download

hsvpicker/compose/build.gradle.kts

@@ -42,14 +42,11 @@ android {
         jvmTarget = "1.8"
         freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = io.github.naverz.pinocchio.Versions.COMPOSE_VERSION
-    }
 }
 
 dependencies {
     api(project(":slidercompose"))
-    implementation(io.github.naverz.pinocchio.Dependencies.AndroidX.Compose.ACTIVITY_COMPOSE)
+    implementation(platform(io.github.naverz.pinocchio.Dependencies.AndroidX.Compose.BOM))
     implementation(io.github.naverz.pinocchio.Dependencies.AndroidX.Compose.UI_TOOLING)
     implementation(io.github.naverz.pinocchio.Dependencies.AndroidX.Compose.COMPOSE_FOUNDATION)
     testImplementation(io.github.naverz.pinocchio.Dependencies.Test.JUNIT)

hsvpicker/compose/gradle.properties

@@ -3,4 +3,4 @@ POM_DESCRIPTION=A library that provides HSVPicker from Jetpack Compose. (Recomme
 POM_INCEPTION_YEAR=2022
 POM_URL=https://github.com/naverz/Pinocchio/tree/master/hsvpicker/compose
 POM_ARTIFACT_ID=hsvpicker-compose
-VERSION_NAME=1.5.0
+VERSION_NAME=1.6.0

hsvpicker/sample/build.gradle.kts

@@ -43,9 +43,6 @@ android {
         jvmTarget = "1.8"
         freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = io.github.naverz.pinocchio.Versions.COMPOSE_VERSION
-    }
 }
 
 dependencies {

slidercompose/README.md

@@ -25,6 +25,9 @@
  <tr>
   <td>Compose UI 1.6 (1.6.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.naverz.pinocchio/slider-compose?versionPrefix=1.5"></td>
  </tr>
+ <tr>
+  <td>Compose UI 1.7 (1.7.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.naverz.pinocchio/slider-compose?versionPrefix=1.6"></td>
+ </tr>
 </table>
 
 ## Download

slidercompose/build.gradle.kts

@@ -41,13 +41,10 @@ android {
         jvmTarget = "1.8"
         freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = io.github.naverz.pinocchio.Versions.COMPOSE_VERSION
-    }
 }
 
 dependencies {
-    implementation(io.github.naverz.pinocchio.Dependencies.AndroidX.Compose.ACTIVITY_COMPOSE)
+    implementation(platform(io.github.naverz.pinocchio.Dependencies.AndroidX.Compose.BOM))
     implementation(io.github.naverz.pinocchio.Dependencies.AndroidX.Compose.UI_TOOLING)
     implementation(io.github.naverz.pinocchio.Dependencies.AndroidX.Compose.COMPOSE_FOUNDATION)
     testImplementation(io.github.naverz.pinocchio.Dependencies.Test.JUNIT)

slidercompose/gradle.properties

@@ -3,4 +3,4 @@ POM_DESCRIPTION=Slider UI for Compose
 POM_INCEPTION_YEAR=2022
 POM_URL=https://github.com/naverz/Pinocchio/tree/master/slidercompose
 POM_ARTIFACT_ID=slider-compose
-VERSION_NAME=1.5.0
+VERSION_NAME=1.6.0