Update dependency org.jetbrains.kotlin.multiplatform to v2.1.0 (#185)

* Update dependency org.jetbrains.kotlin.multiplatform to v2.1.0 * Fix toBooleanLenient --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: David Hoepelman <[email protected]>
konform-kt · Dec 25, 2024 · 5533752 · 5533752
1 parent 71b8303
commit 5533752
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 43 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.gradle.internal.extensions.stdlib.capitalized
-import org.jetbrains.kotlin.cli.common.toBooleanLenient
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -15,11 +14,11 @@ val projectLicenseUrl = "https://opensource.org/licenses/MIT"
 val projectScmUrl = "https://github.com/konform-kt/konform.git"
 val projectInceptionYear = 2018
 
-val kotlinApiTarget = "1.7"
+val kotlinApiTarget = "1.9"
 val jvm = JvmTarget.JVM_1_8
 
 /** The "CI" env var is a quasi-standard way to indicate that we're running on CI. */
-val onCI: Boolean = System.getenv("CI")?.toBooleanLenient() ?: false
+val onCI: Boolean = System.getenv("CI") == "true"
 
 plugins {
     alias(libs.plugins.kotest.multiplatform)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 kotest = "5.9.1"
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 ktlint = "1.5.0"
 
 [libraries]
 kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
 kotest-framework-datatest = { module = "io.kotest:kotest-framework-datatest", version.ref = "kotest" }
 kotest-framework-engine = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" }
 kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
-kotlincompiletesting = { module = "com.github.tschuchortdev:kotlin-compile-testing", version = "1.6.0" }
+kotlincompiletesting = { module = "dev.zacsweers.kctfork:core", version = "0.7.0" }
 
 # Not actually used as dependency, but cause renovate to update ktlint
 ktlint = { module = "com.pinterest.ktlint:ktlint-bom", version.ref = "ktlint" }

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/src/jvmTest/kotlin/io/konform/validation/ValidationSubTypingCompilerTest.kt b/src/jvmTest/kotlin/io/konform/validation/ValidationSubTypingCompilerTest.kt
@@ -58,7 +58,8 @@ class ValidationSubTypingCompilerTest {
                 }.compile()
 
         result.exitCode shouldBe KotlinCompilation.ExitCode.COMPILATION_ERROR
-        result.messages shouldContain "Type mismatch: inferred type is Validation<Int> but Validation<Number> was expected"
+        result.messages shouldContain "Initializer type mismatch: expected 'io.konform.validation.Validation<kotlin.Number>', " +
+            "actual 'io.konform.validation.Validation<kotlin.Int>'"
     }
 
     @Test
@@ -86,6 +87,7 @@ class ValidationSubTypingCompilerTest {
                 }.compile()
 
         result.exitCode shouldBe KotlinCompilation.ExitCode.COMPILATION_ERROR
-        result.messages shouldContain "Type mismatch: inferred type is Validation<Int> but Validation<Number> was expected"
+        result.messages shouldContain "Argument type mismatch: actual type is 'io.konform.validation.Validation<kotlin.Int>', " +
+            "but 'io.konform.validation.Validation<kotlin.Number>' was expected"
     }
 }