Skip to content

Commit e3adad9

Browse files
committed
chore: apply updates to Kotlin, Compose, and some library dependencies, resolving associated build errors.
1 parent 1160798 commit e3adad9

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

gradle/libs.versions.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[versions]
22
agp = "8.2.0"
3-
kotlin = "1.9.20"
4-
compose = "1.5.4"
3+
kotlin = "2.2.21"
4+
compose = "1.9.5"
55
compose-compiler = "1.5.4"
6-
compose-material3 = "1.1.2"
7-
androidx-activityCompose = "1.8.0"
8-
kotlinxSerializationJson = "1.5.1"
6+
compose-material3 = "1.4.0"
7+
androidx-activityCompose = "1.12.0"
8+
kotlinxSerializationJson = "1.9.0"
99

1010
[libraries]
1111
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -22,4 +22,3 @@ androidApplication = { id = "com.android.application", version.ref = "agp" }
2222
androidLibrary = { id = "com.android.library", version.ref = "agp" }
2323
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
2424
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
25-
kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }

kotlin-json-patch/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ kotlin {
1414
js(IR) {
1515
//
1616
}
17-
ios()
1817
androidTarget {
1918
compilations.all {
20-
kotlinOptions {
21-
jvmTarget = "1.8"
19+
compilerOptions.configure {
20+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
2221
}
2322
}
2423
publishLibraryVariants("release", "debug")

kotlin-json-patch/src/commonMain/kotlin/com/reidsync/kxjsonpatch/Operations.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal open class Operations {
3030
TEST to TEST_name)
3131

3232
fun opFromName(rfcName: String): Int {
33-
val res=OPS.get(rfcName.toLowerCase())
33+
val res=OPS.get(rfcName.lowercase())
3434
if(res==null) throw InvalidJsonPatchException("unknown / unsupported operation $rfcName")
3535
return res
3636
}

0 commit comments

Comments
 (0)