Unverified Commit ae95464c authored by Nikolay Igotti's avatar Nikolay Igotti Committed by GitHub

Move Skiko to Kotlin 1.6.10 (#441)

parent 195c74df
plugins {
kotlin("multiplatform") version "1.5.31"
kotlin("multiplatform") version "1.6.10"
}
repositories {
mavenLocal()
mavenCentral()
maven("https://dl.bintray.com/kotlin/kotlin-eap")
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
}
......@@ -53,10 +52,6 @@ kotlin {
}
}
// a temporary workaround for a bug in jsRun invocation - see https://youtrack.jetbrains.com/issue/KT-48273
afterEvaluate {
extensions.configure<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension> {
versions.webpackDevServer.version = "4.0.0"
}
rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.0.0"
}
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.5.31"
kotlin("jvm") version "1.6.10"
application
}
......
plugins {
kotlin("multiplatform") version "1.6.0"
kotlin("multiplatform") version "1.6.10"
}
val coroutinesVersion = "1.5.2"
......@@ -262,11 +262,6 @@ if (hostOs == "macos") {
}
}
// a temporary workaround for a bug in jsRun invocation - see https://youtrack.jetbrains.com/issue/KT-48273
afterEvaluate {
extensions.configure<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension> {
versions.webpackDevServer.version = "4.0.0"
versions.webpackCli.version = "4.9.0"
nodeVersion = "16.0.0"
}
rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.0.0"
}
......@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
plugins {
kotlin("multiplatform") version "1.5.31"
kotlin("multiplatform") version "1.6.10"
`maven-publish`
signing
id("org.gradle.crypto.checksum") version "1.1.0"
......@@ -1214,3 +1214,7 @@ tasks.withType<AbstractTestTask> {
showStackTraces = true
}
}
rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.0.0"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment