From 4e27ce488078255777bd44043b8157e24be96f7e Mon Sep 17 00:00:00 2001 From: Giovanni Ciatto Date: Sun, 31 Dec 2023 14:54:19 +0100 Subject: [PATCH] chore(build): use kt-mpp 4, and kt 1.9.22 --- build.gradle.kts | 13 +------------ gradle.properties | 2 +- gradle/libs.versions.toml | 5 ++--- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f9d511e..d480319 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,4 @@ -import io.github.gciatto.kt.mpp.log -import io.github.gciatto.kt.mpp.nodeVersion +import io.github.gciatto.kt.mpp.utils.log @Suppress("DSL_SCOPE_VIOLATION") plugins { @@ -27,11 +26,6 @@ repositories { } kotlin { - js { - nodejs { - binaries.library() - } - } sourceSets { commonMain { dependencies { @@ -40,8 +34,3 @@ kotlin { } } } - -project.findProperty("nodeVersion")?.let { it.toString() }?.takeIf { it.isNotBlank() }?.let { - nodeVersion(it) - log("override NodeJS version: $it", LogLevel.LIFECYCLE) -} diff --git a/gradle.properties b/gradle.properties index 0cc27dc..48afa66 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.console=plain systemProp.org.gradle.internal.http.connectionTimeout=180000 systemProp.org.gradle.internal.http.socketTimeout=180000 org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2g -ktCompilerArgs=-opt-in=kotlin.js.ExperimentalJsExport;-opt-in=kotlin.time.ExperimentalTime +ktCompilerArgs=-opt-in=kotlin.js.ExperimentalJsExport;-opt-in=kotlin.time.ExperimentalTime;-Xexpect-actual-classes ktCompilerArgsJvm=-Xjvm-default=all ktCompilerArgsJs= ktTargetJvmDisable=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index da09dc6..f4e9ffe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -kotlin = "1.8.22" +kotlin = "1.9.22" jvm = "1.8" node = "16-latest" -ktMpp = "2.2.1" +ktMpp = "4.0.1" [libraries] kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } @@ -19,4 +19,3 @@ ktMpp-jsOnly = { id = "io.github.gciatto.kt-mpp.js-only", version.ref = "ktMpp" ktMpp-jvmOnly = { id = "io.github.gciatto.kt-mpp.jvm-only", version.ref = "ktMpp" } ktMpp-multiplatform = { id = "io.github.gciatto.kt-mpp.multiplatform", version.ref = "ktMpp" } ktMpp-multiProjectHelper = { id = "io.github.gciatto.kt-mpp.multi-project-helper", version.ref = "ktMpp" } -nexusPublish = "de.marcphilipp.nexus-publish:0.4.0"