Skip to content

Commit 936fe2d

Browse files
Kotlin 1.5.31, serialization 1.3.0, Ktor 1.6.5, Wrappers pre.265
Include taskNames in production vs development artifact generation decision
1 parent 42cc0da commit 936fe2d

File tree

3 files changed

+24
-14
lines changed

3 files changed

+24
-14
lines changed

build.gradle.kts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
22

3-
val kotlinVersion = "1.5.20"
4-
val serializationVersion = "1.2.1"
5-
val ktorVersion = "1.6.1"
3+
val kotlinVersion = "1.5.31"
4+
val serializationVersion = "1.3.0"
5+
val ktorVersion = "1.6.5"
66
val logbackVersion = "1.2.3"
7-
val kmongoVersion = "4.2.7"
8-
val reactWrappersVersion = "17.0.2-pre.214-kotlin-1.5.20"
7+
val reactVersion = "17.0.2-pre.265-kotlin-1.5.31"
8+
val kmongoVersion = "4.3.0"
99

1010
plugins {
11-
kotlin("multiplatform") version "1.5.20"
11+
kotlin("multiplatform") version "1.5.31"
1212
application //to run JVM part
13-
kotlin("plugin.serialization") version "1.5.20"
13+
kotlin("plugin.serialization") version "1.5.31"
1414
}
1515

1616
group = "org.example"
1717
version = "1.0-SNAPSHOT"
1818

1919
repositories {
20-
maven("https://dl.bintray.com/kotlin/kotlin-eap")
2120
mavenCentral()
2221
}
2322

@@ -60,8 +59,8 @@ kotlin {
6059
implementation("io.ktor:ktor-client-json:$ktorVersion")
6160
implementation("io.ktor:ktor-client-serialization:$ktorVersion")
6261

63-
implementation("org.jetbrains.kotlin-wrappers:kotlin-react:$reactWrappersVersion")
64-
implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:$reactWrappersVersion")
62+
implementation("org.jetbrains.kotlin-wrappers:kotlin-react:$reactVersion")
63+
implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:$reactVersion")
6564
}
6665
}
6766
}
@@ -73,7 +72,9 @@ application {
7372

7473
// include JS artifacts in any JAR we generate
7574
tasks.getByName<Jar>("jvmJar") {
76-
val taskName = if (project.hasProperty("isProduction")) {
75+
val taskName = if (project.hasProperty("isProduction")
76+
|| project.gradle.startParameter.taskNames.contains("installDist")
77+
) {
7778
"jsBrowserProductionWebpack"
7879
} else {
7980
"jsBrowserDevelopmentWebpack"

settings.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
pluginManagement {
22
repositories {
3-
maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") }
4-
53
mavenCentral()
6-
74
maven { setUrl("https://plugins.gradle.org/m2/") }
85
}
96
}

src/jvmMain/resources/logback.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<configuration>
2+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
<root level="trace">
8+
<appender-ref ref="STDOUT"/>
9+
</root>
10+
<logger name="org.eclipse.jetty" level="INFO"/>
11+
<logger name="io.netty" level="INFO"/>
12+
</configuration>

0 commit comments

Comments
 (0)