Support Compose version 1.6.X

LakeLab · LakeLab · commit cf015822aa9e · 2024-07-25T22:58:19.000+09:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,22 +5,10 @@
  */
 
 
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "7.1.2" apply false
-    id("com.android.library") version "7.1.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.20" apply false
-}
-
-buildscript {
-    dependencies {
-        classpath("com.vanniktech:gradle-maven-publish-plugin:0.21.0")
-    }
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlin.RequiresOptIn"
-    }
+    id("com.android.application") version "8.5.1" apply false
+    id("com.android.library") version "8.5.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
 }
 
diff --git a/buildSrc/src/main/kotlin/io/github/naverz/pinocchio/Dependencies.kt b/buildSrc/src/main/kotlin/io/github/naverz/pinocchio/Dependencies.kt
@@ -7,7 +7,7 @@ object Dependencies {
         const val ESPRESSO_CORE = "androidx.test.espresso:espresso-core:3.4.0"
     }
 
-    object Material{
+    object Material {
         const val STANDARD = "com.google.android.material:material:1.4.0"
     }
     object AndroidX {
@@ -17,7 +17,7 @@ object Dependencies {
 
         object Compose {
             const val UI_TOOLING = "androidx.compose.ui:ui-tooling:${Versions.COMPOSE_VERSION}"
-            const val ACTIVITY_COMPOSE = "androidx.activity:activity-compose:1.4.0"
+            const val ACTIVITY_COMPOSE = "androidx.activity:activity-compose:1.9.1"
             const val COMPOSE_FOUNDATION =
                 "androidx.compose.foundation:foundation:${Versions.COMPOSE_VERSION}"
         }
diff --git a/buildSrc/src/main/kotlin/io/github/naverz/pinocchio/Versions.kt b/buildSrc/src/main/kotlin/io/github/naverz/pinocchio/Versions.kt
@@ -2,6 +2,5 @@ package io.github.naverz.pinocchio
 
 object Versions {
     const val ANDROID_COMPILE_SDK_NO = 34
-    const val ANDROID_TARGET_SDK_NO = 34
-    const val COMPOSE_VERSION = "1.5.4"
+    const val COMPOSE_VERSION = "1.6.8"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jun 22 22:38:28 KST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/hsvpicker/compose/build.gradle.kts b/hsvpicker/compose/build.gradle.kts
@@ -7,7 +7,8 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("com.vanniktech.maven.publish")
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
+    id("com.vanniktech.maven.publish") version "0.29.0"
 }
 
 android {
@@ -16,7 +17,6 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = io.github.naverz.pinocchio.Versions.ANDROID_TARGET_SDK_NO
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
diff --git a/hsvpicker/compose/gradle.properties b/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.4.0
+VERSION_NAME=1.5.0
diff --git a/hsvpicker/sample/build.gradle.kts b/hsvpicker/sample/build.gradle.kts
@@ -7,7 +7,7 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
-
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
 }
 android {
     namespace = "io.github.naverz.hsvpicker.sample"
@@ -16,7 +16,7 @@ android {
     defaultConfig {
         applicationId = "io.github.naverz.hsvpicker.sample"
         minSdk = 21
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
 
diff --git a/hsvpicker/view/build.gradle.kts b/hsvpicker/view/build.gradle.kts
@@ -7,7 +7,7 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("com.vanniktech.maven.publish")
+    id("com.vanniktech.maven.publish") version "0.29.0"
 }
 
 android {
@@ -16,8 +16,6 @@ android {
 
     defaultConfig {
         minSdk = 19
-        targetSdk = io.github.naverz.pinocchio.Versions.ANDROID_TARGET_SDK_NO
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
diff --git a/slidercompose/README.md b/slidercompose/README.md
@@ -22,6 +22,9 @@
  <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/slider-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/slider-compose?versionPrefix=1.5"></td>
+ </tr>
 </table>
 
 ## Download
diff --git a/slidercompose/build.gradle.kts b/slidercompose/build.gradle.kts
@@ -7,7 +7,8 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("com.vanniktech.maven.publish")
+    id("com.vanniktech.maven.publish") version "0.29.0"
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
 }
 
 android {
@@ -16,8 +17,6 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = io.github.naverz.pinocchio.Versions.ANDROID_TARGET_SDK_NO
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
diff --git a/slidercompose/gradle.properties b/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.4.0
+VERSION_NAME=1.5.0
diff --git a/slidercompose/src/main/kotlin/io/github/naverz/pinocchio/slider/compose/SlidePanel.kt b/slidercompose/src/main/kotlin/io/github/naverz/pinocchio/slider/compose/SlidePanel.kt
@@ -7,8 +7,8 @@
 package io.github.naverz.pinocchio.slider.compose
 
 import androidx.annotation.FloatRange
+import androidx.compose.foundation.gestures.awaitEachGesture
 import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.foundation.gestures.forEachGesture
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -18,12 +18,12 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicText
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
@@ -41,7 +41,6 @@ import io.github.naverz.pinocchio.slider.compose.data.Stroke
 import io.github.naverz.pinocchio.slider.compose.palette.PanelPalette
 import io.github.naverz.pinocchio.slider.compose.palette.ThumbPalette
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun SlidePanel(
     modifier: Modifier = Modifier,
@@ -68,44 +67,42 @@ fun SlidePanel(
     val isRtl = isRtl()
     Layout(contents = listOf(thumb, panel),
         modifier = modifier.pointerInput(Unit) {
-            forEachGesture {
-                awaitPointerEventScope {
-                    awaitFirstDown()
-                    val halfThumbWidth = thumbSize.width.toFloat() / 2
-                    val halfThumbHeight = thumbSize.height.toFloat() / 2
-                    val panelRect = Rect(
-                        halfThumbWidth,
-                        halfThumbHeight,
-                        containerSize.width - halfThumbWidth,
-                        containerSize.height - halfThumbHeight
-                    )
-                    var nextTouchPoint: Offset? = null
-                    do {
-                        val event: PointerEvent = awaitPointerEvent()
-                        event.changes.forEach { pointerInputChange: PointerInputChange ->
-                            findNextValue(
-                                isRtl = isRtl,
-                                containerSize = containerSize,
-                                panelRect = panelRect,
-                                touchPoint = Offset(
-                                    x = pointerInputChange.position.x,
-                                    y = pointerInputChange.position.y
-                                ),
-                                halfThumbWidth = halfThumbWidth,
-                                halfThumbHeight = halfThumbHeight
-                            ).let {
-                                nextTouchPoint = it
-                                updatedOnValueChanged?.invoke(it.x, it.y)
-                            }
-                            if (pointerInputChange.positionChange() != Offset.Zero)
-                                pointerInputChange.consume()
+            awaitEachGesture {
+                awaitFirstDown()
+                val halfThumbWidth = thumbSize.width.toFloat() / 2
+                val halfThumbHeight = thumbSize.height.toFloat() / 2
+                val panelRect = Rect(
+                    halfThumbWidth,
+                    halfThumbHeight,
+                    containerSize.width - halfThumbWidth,
+                    containerSize.height - halfThumbHeight
+                )
+                var nextTouchPoint: Offset? = null
+                do {
+                    val event: PointerEvent = awaitPointerEvent()
+                    event.changes.forEach { pointerInputChange: PointerInputChange ->
+                        findNextValue(
+                            isRtl = isRtl,
+                            containerSize = containerSize,
+                            panelRect = panelRect,
+                            touchPoint = Offset(
+                                x = pointerInputChange.position.x,
+                                y = pointerInputChange.position.y
+                            ),
+                            halfThumbWidth = halfThumbWidth,
+                            halfThumbHeight = halfThumbHeight
+                        ).let {
+                            nextTouchPoint = it
+                            updatedOnValueChanged?.invoke(it.x, it.y)
                         }
-                    } while (event.changes.any { it.pressed })
-                    nextTouchPoint?.let { stableNextTouchPoint ->
-                        updatedOnValueConfirmed?.invoke(
-                            stableNextTouchPoint.x, stableNextTouchPoint.y
-                        )
+                        if (pointerInputChange.positionChange() != Offset.Zero)
+                            pointerInputChange.consume()
                     }
+                } while (event.changes.any { it.pressed })
+                nextTouchPoint?.let { stableNextTouchPoint ->
+                    updatedOnValueConfirmed?.invoke(
+                        stableNextTouchPoint.x, stableNextTouchPoint.y
+                    )
                 }
             }
         }) { (thumbMeasurable, panelMeasurable), constraints ->
@@ -242,10 +239,10 @@ private fun findNextValue(
 @Preview
 private fun PreviewSliderPanel() {
     var x by remember {
-        mutableStateOf(0f)
+        mutableFloatStateOf(0f)
     }
     var y by remember {
-        mutableStateOf(0f)
+        mutableFloatStateOf(0f)
     }
     Column {
         SlidePanel(
diff --git a/slidercompose/src/main/kotlin/io/github/naverz/pinocchio/slider/compose/Slider.kt b/slidercompose/src/main/kotlin/io/github/naverz/pinocchio/slider/compose/Slider.kt
@@ -9,8 +9,8 @@ package io.github.naverz.pinocchio.slider.compose
 import androidx.annotation.FloatRange
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.awaitEachGesture
 import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.foundation.gestures.forEachGesture
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -24,21 +24,22 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicText
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.input.pointer.PointerEvent
 import androidx.compose.ui.input.pointer.PointerInputChange
-import androidx.compose.ui.input.pointer.consumePositionChange
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.input.pointer.positionChange
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.DpSize
@@ -50,7 +51,6 @@ import io.github.naverz.pinocchio.slider.compose.palette.SliderPalette
 import io.github.naverz.pinocchio.slider.compose.palette.ThumbPalette
 import io.github.naverz.pinocchio.slider.compose.palette.property.NarrowSliderProperty
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun Slider(
     modifier: Modifier = Modifier,
@@ -75,29 +75,28 @@ fun Slider(
                 Modifier.fillMaxWidth()
             }
                 .pointerInput(isVertical) {
-                    forEachGesture {
-                        awaitPointerEventScope {
-                            awaitFirstDown()
-                            var nextValue: Float? = null
-                            do {
-                                val event: PointerEvent = awaitPointerEvent()
-                                event.changes.forEach { pointerInputChange: PointerInputChange ->
-                                    findNextValue(
-                                        isRtl = isRtl,
-                                        isVertical = isVertical,
-                                        touchOffset = if (isVertical) pointerInputChange.position.y else pointerInputChange.position.x,
-                                        maxOffset = (if (isVertical) containerSize.height else containerSize.width).toFloat(),
-                                        thumbStandardLength = (if (isVertical) thumbSize.height else thumbSize.width).toFloat()
-                                    ).let {
-                                        nextValue = it
-                                        updatedOnValueChanged?.invoke(it)
-                                    }
-                                    pointerInputChange.consumePositionChange()
+                    awaitEachGesture {
+                        awaitFirstDown()
+                        var nextValue: Float? = null
+                        do {
+                            val event: PointerEvent = awaitPointerEvent()
+                            event.changes.forEach { pointerInputChange: PointerInputChange ->
+                                findNextValue(
+                                    isRtl = isRtl,
+                                    isVertical = isVertical,
+                                    touchOffset = if (isVertical) pointerInputChange.position.y else pointerInputChange.position.x,
+                                    maxOffset = (if (isVertical) containerSize.height else containerSize.width).toFloat(),
+                                    thumbStandardLength = (if (isVertical) thumbSize.height else thumbSize.width).toFloat()
+                                ).let {
+                                    nextValue = it
+                                    updatedOnValueChanged?.invoke(it)
                                 }
-                            } while (event.changes.any { it.pressed })
-                            nextValue?.let { stableNextValue ->
-                                updatedOnValueConfirmed?.invoke(stableNextValue)
+                                if (pointerInputChange.positionChange() != Offset.Zero)
+                                    pointerInputChange.consume()
                             }
+                        } while (event.changes.any { it.pressed })
+                        nextValue?.let { stableNextValue ->
+                            updatedOnValueConfirmed?.invoke(stableNextValue)
                         }
                     }
                 }
@@ -216,7 +215,7 @@ private fun findNextValue(
 @Composable
 private fun PreviewSlider() {
     var value by remember {
-        mutableStateOf(0f)
+        mutableFloatStateOf(0f)
     }
     Column {
         Spacer(modifier = Modifier.height(10.dp))
@@ -390,7 +389,7 @@ private fun PreviewSlider() {
 @Preview
 @Composable
 private fun PreviewBalancingSlider() {
-    var value by remember { mutableStateOf(0.5f) }
+    var value by remember { mutableFloatStateOf(0.5f) }
     Column {
         Spacer(modifier = Modifier.height(15.dp))
         Slider(

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ object Dependencies {`
`7`	`7`	`const val ESPRESSO_CORE = "androidx.test.espresso:espresso-core:3.4.0"`
`8`	`8`	`}`
`9`	`9`
`10`		`- object Material{`
	`10`	`+ object Material {`
`11`	`11`	`const val STANDARD = "com.google.android.material:material:1.4.0"`
`12`	`12`	`}`
`13`	`13`	`object AndroidX {`
`@@ -17,7 +17,7 @@ object Dependencies {`
`17`	`17`
`18`	`18`	`object Compose {`
`19`	`19`	`const val UI_TOOLING = "androidx.compose.ui:ui-tooling:${Versions.COMPOSE_VERSION}"`
`20`		`- const val ACTIVITY_COMPOSE = "androidx.activity:activity-compose:1.4.0"`
	`20`	`+ const val ACTIVITY_COMPOSE = "androidx.activity:activity-compose:1.9.1"`
`21`	`21`	`const val COMPOSE_FOUNDATION =`
`22`	`22`	`"androidx.compose.foundation:foundation:${Versions.COMPOSE_VERSION}"`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,5 @@ package io.github.naverz.pinocchio`
`2`	`2`
`3`	`3`	`object Versions {`
`4`	`4`	`const val ANDROID_COMPILE_SDK_NO = 34`
`5`		`- const val ANDROID_TARGET_SDK_NO = 34`
`6`		`- const val COMPOSE_VERSION = "1.5.4"`
	`5`	`+ const val COMPOSE_VERSION = "1.6.8"`
`7`	`6`	`}`