diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 2b8a50fc..148fdd24 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index a4147911..2fbd66cb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,6 +35,7 @@ kotlin {
implementation(compose.desktop.currentOs)
implementation(kotlin("reflect"))
implementation(kotlin("stdlib"))
+ implementation(compose.components.resources)
implementation("co.touchlab:kermit:1.0.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.6.0")
@@ -171,6 +172,10 @@ tasks.withType {
}
}
+compose.resources {
+ generateResClass = always
+}
+
compose.desktop {
application {
val distributionVersion = "^(\\d+\\.\\d+\\.\\d+).*".toRegex().matchEntire(project.version.toString())!!.groupValues[1]
diff --git a/gradle.properties b/gradle.properties
index 9a89a351..bdbf9d1e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
kotlin.code.style=official
-kotlin.version=1.8.0
+kotlin.version=1.9.24
agp.version=7.3.0
compose.version=1.6.11
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 068cdb2d..da1db5f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/DropDownView.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/DropDownView.kt
index a09df957..c4d7533b 100644
--- a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/DropDownView.kt
+++ b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/DropDownView.kt
@@ -45,6 +45,7 @@ fun DropDownView(
maxLines: Int = 1,
isLabelFillMaxWidth: Boolean = false,
isShowLabel: Boolean = true,
+ testTagParts: Array? = null,
contentView: @Composable (RowScope.(it: T?, isLabel: Boolean, isSelected: Boolean, isClickable: Boolean) -> Unit) = {it, isLabel, isSelected, isClickable ->
AppText(
text = it?.displayText.emptyToNull() ?: "--",
@@ -68,7 +69,6 @@ fun DropDownView(
)
},
arrowPadding: PaddingValues = PaddingValues(0.dp),
- testTagParts: Array? = null,
selectedItem: T? = null,
onClickItem: (T) -> Boolean,
) {
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigTextTransformerImpl.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigTextTransformerImpl.kt
index 16a3f9b5..a20ac552 100644
--- a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigTextTransformerImpl.kt
+++ b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigTextTransformerImpl.kt
@@ -31,7 +31,7 @@ class BigTextTransformerImpl(override val originalText: BigText) : BigTextImpl(
override fun computeWhenLeftRotate(x: BigTextTransformNodeValue, y: BigTextTransformNodeValue) {}
override fun computeWhenRightRotate(x: BigTextTransformNodeValue, y: BigTextTransformNodeValue) {}
}
- )
+ ) as LengthTree
private fun BigTextNodeValue.toBigTextTransformNodeValue() : BigTextTransformNodeValue {
return BigTextTransformNodeValue().also {
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/LengthTree.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/LengthTree.kt
index 415d699e..d62b6917 100644
--- a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/LengthTree.kt
+++ b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/LengthTree.kt
@@ -2,7 +2,7 @@ package com.sunnychung.application.multiplatform.hellohttp.ux.bigtext
import com.williamfiset.algorithms.datastructures.balancedtree.RedBlackTree
-open class LengthTree(computations: RedBlackTreeComputations) : RedBlackTree2<@UnsafeVariance V>(computations)
+open class LengthTree(computations: RedBlackTreeComputations) : RedBlackTree2<@UnsafeVariance V>(computations)
where V : LengthNodeValue, V : Comparable<@UnsafeVariance V>, V : DebuggableNode {
fun findNodeByCharIndex(index: Int, isIncludeMarkerNodes: Boolean = true, isExact: Boolean = false): RedBlackTree.Node? {