Skip to content

Commit c28fdcc

Browse files
JSMonkSebastianAigner
authored andcommitted
Bumpt version to 1.9.10 with the relevant changes
1 parent 6fcd4c1 commit c28fdcc

File tree

4 files changed

+301
-560
lines changed

4 files changed

+301
-560
lines changed

build.gradle.kts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1+
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.distsDirectory
12
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
23

3-
val kotlinVersion = "1.8.21"
4-
val serializationVersion = "1.5.1"
5-
val ktorVersion = "2.3.0"
4+
val kotlinVersion = "1.9.10"
5+
val serializationVersion = "1.6.0"
6+
val ktorVersion = "2.3.3"
67
val logbackVersion = "1.2.11"
7-
val kotlinWrappersVersion = "1.0.0-pre.561"
8+
val kotlinWrappersVersion = "1.0.0-pre.621"
89
val kmongoVersion = "4.5.0"
910

1011
plugins {
11-
kotlin("multiplatform") version "1.8.21"
12+
kotlin("multiplatform") version "1.9.10"
1213
application //to run JVM part
13-
kotlin("plugin.serialization") version "1.8.21"
14+
kotlin("plugin.serialization") version "1.9.10"
1415
}
1516

1617
group = "org.example"
@@ -85,7 +86,9 @@ tasks.named<Jar>("jvmJar").configure {
8586
"jsBrowserDevelopmentWebpack"
8687
}
8788
val webpackTask = tasks.named<KotlinWebpack>(taskName)
88-
from(webpackTask.map { File(it.destinationDirectory, it.outputFileName) }) // bring output file along into the JAR
89+
dependsOn(webpackTask)
90+
from(webpackTask.map { it.mainOutputFile.get().asFile }) // bring output file along into the JAR
91+
into("static")
8992
}
9093

9194
tasks {

gradle.properties

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
kotlin.code.style=official
2-
kotlin.js.compiler=ir
2+
kotlin.js.compiler=ir
3+
kotlin.incremental=true
4+
kotlin.incremental.js=true
5+
kotlin.incremental.js.ir=true
6+
kotlin.incremental.js.klib=true

0 commit comments

Comments
 (0)