Skip to content

Commit

Permalink
chore(build): use kt-mpp 4, and kt 1.9.22
Browse files Browse the repository at this point in the history
  • Loading branch information
gciatto committed Dec 31, 2023
1 parent 5b89adc commit 4e27ce4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 16 deletions.
13 changes: 1 addition & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -27,11 +26,6 @@ repositories {
}

kotlin {
js {
nodejs {
binaries.library()
}
}
sourceSets {
commonMain {
dependencies {
Expand All @@ -40,8 +34,3 @@ kotlin {
}
}
}

project.findProperty("nodeVersion")?.let { it.toString() }?.takeIf { it.isNotBlank() }?.let {
nodeVersion(it)
log("override NodeJS version: $it", LogLevel.LIFECYCLE)
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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" }
Expand All @@ -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"

0 comments on commit 4e27ce4

Please sign in to comment.