Skip to content

Commit 5699d9c

Browse files
Aligned Kotlin, Ktor, and Coroutines versions with those used in IntelliJ IDEA to ensure compatibility
1 parent 54bd8d1 commit 5699d9c

File tree

4 files changed

+37
-9
lines changed

4 files changed

+37
-9
lines changed

build.gradle.kts

+22-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55

66
import org.gradle.internal.os.OperatingSystem
77
import org.gradle.jvm.tasks.Jar
8-
import org.jetbrains.kotlin.gradle.dsl.*
8+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
9+
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
10+
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
11+
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
912
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
1013
import java.io.FileNotFoundException
1114
import java.util.*
@@ -373,10 +376,15 @@ subprojects {
373376
freeCompilerArgs.addAll(
374377
// Suppress expect/actual classes are in Beta warning.
375378
"-Xexpect-actual-classes",
379+
376380
// Non-public primary constructor is exposed via the generated 'copy()' method of the 'data' class.
377-
"-Xconsistent-data-class-copy-visibility",
381+
// Kotlin 2.0 feature.
382+
//"-Xconsistent-data-class-copy-visibility",
383+
378384
// Enable all warnings as errors.
379-
"-Werror"
385+
// Disabled because even with the Suppress("unused") the warnings may still happen:
386+
// (https://github.com/JetBrains/lets-plot/blob/f5af69befdd2fa963672d3b1d9992f3635f64840/plot-base/src/commonMain/kotlin/org/jetbrains/letsPlot/core/interact/mouse/MouseDragInteraction.kt#L70)
387+
//"-Werror"
380388
)
381389
}
382390
plugins.withId("org.jetbrains.kotlin.multiplatform") {
@@ -391,8 +399,18 @@ subprojects {
391399
}
392400
}
393401

402+
// Koltin 2.0
403+
//plugins.withId("org.jetbrains.kotlin.jvm") {
404+
// extensions.configure<KotlinJvmExtension> {
405+
// compilerOptions {
406+
// configCompilerWarnings()
407+
// jvmTarget.set(JvmTarget.JVM_1_8)
408+
// }
409+
// }
410+
//}
411+
394412
plugins.withId("org.jetbrains.kotlin.jvm") {
395-
extensions.configure<KotlinJvmExtension> {
413+
extensions.configure<KotlinJvmProjectExtension> {
396414
compilerOptions {
397415
configCompilerWarnings()
398416
jvmTarget.set(JvmTarget.JVM_1_8)

demo/common-livemap/build.gradle.kts

+10
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ plugins {
77
kotlin("multiplatform")
88
}
99

10+
val ktorVersion = project.extra["ktor_version"] as String
11+
1012
kotlin {
1113
jvm()
1214
js {
@@ -21,6 +23,7 @@ kotlin {
2123
commonMain {
2224
dependencies {
2325
implementation(kotlin("stdlib-common"))
26+
implementation("io.ktor:ktor-client-websockets:${ktorVersion}")
2427

2528
implementation(project(":commons"))
2629
implementation(project(":datamodel"))
@@ -34,5 +37,12 @@ kotlin {
3437
implementation(project(":demo-and-test-shared"))
3538
}
3639
}
40+
41+
jsMain {
42+
dependencies {
43+
implementation("io.ktor:ktor-client-js:${ktorVersion}")
44+
implementation("io.ktor:ktor-client-websockets-js:${ktorVersion}")
45+
}
46+
}
3747
}
3848
}

gis/src/commonMain/kotlin/org/jetbrains/letsPlot/gis/tileprotocol/http/HttpTileTransport.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class HttpTileTransport {
2121

2222
myClient.launch {
2323
try {
24-
val response = myClient.get(url).readRawBytes()
24+
val response = myClient.get(url).readBytes()
2525
async.success(response)
2626
} catch (c: ResponseException) {
2727
async.failure(Exception(c.response.status.toString()))

gradle.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ kotlin.jvm.target.validation.mode=error
2020
kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
2121

2222
# Versions
23-
kotlin_version=2.1.0
23+
kotlin_version=1.9.25
2424
kotlinLogging_version=2.0.5
2525
slf4j_version=1.7.29
2626
assertj_version=3.26.3
@@ -32,10 +32,10 @@ mockk_version=1.9.3
3232
# ktor: 2.3.13 (https://github.com/JetBrains/intellij-community/blob/master/.idea/libraries/ktor_client.xml)
3333
# kotlinx-coroutines: 1.8.0-intellij-11 (https://github.com/JetBrains/intellij-community/blob/master/.idea/libraries/kotlinx_coroutines_core.xml)
3434
# kotlinx-html: 0.11.0 (https://github.com/JetBrains/intellij-community/blob/master/.idea/libraries/kotlinx_html_jvm.xml)
35-
ktor_version=3.0.3
35+
ktor_version=2.3.13
3636
# ktor 3.0.3 depends on kotlinx-coroutines :1.9.0
37-
kotlinx_coroutines_version=1.9.0
38-
kotlinx_html_version=0.7.3
37+
kotlinx_coroutines_version=1.8.0
38+
kotlinx_html_version=0.11.0
3939

4040
# IDEA platform Batik: 1.16.0-35 (https://jetbrains.team/p/ij/repositories/ultimate/files/master/.idea/libraries/batik_transcoder.xml)
4141
batik_version=1.17

0 commit comments

Comments
 (0)