Skip to content

Commit f1e52ab

Browse files
committed
Update Kotlin version to 2.3.0-Beta2
- Fix some test dependencies due to "Adding API dependency types to test source sets is not supported and will removed in a future version of Kotlin." warning. - Update BCV version
1 parent e607207 commit f1e52ab

File tree

8 files changed

+437
-381
lines changed

8 files changed

+437
-381
lines changed

buildSrc/src/main/kotlin/source-sets-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ kotlin {
8787

8888
commonTest {
8989
dependencies {
90-
api(versionCatalog().findLibrary("kotlin.test").get())
90+
implementation(versionCatalog().findLibrary("kotlin.test").get())
9191
}
9292
}
9393

formats/json-tests/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ kotlin {
3333
}
3434
val commonTest by getting {
3535
dependencies {
36-
api(project(":kotlinx-serialization-json"))
37-
api(project(":kotlinx-serialization-json-okio"))
38-
api(project(":kotlinx-serialization-json-io"))
36+
implementation(project(":kotlinx-serialization-json"))
37+
implementation(project(":kotlinx-serialization-json-okio"))
38+
implementation(project(":kotlinx-serialization-json-io"))
3939
implementation(libs.kotlinx.io)
4040
implementation(libs.okio)
4141
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
group=org.jetbrains.kotlinx
6-
version=1.9.1-SNAPSHOT
6+
version=1.10.0-SNAPSHOT
77
jdk_toolchain_version=11
88

99
# This version takes precedence if 'bootstrap' property passed to project

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[versions]
2-
kotlin = "2.2.0"
2+
kotlin = "2.3.0-Beta2"
33
kover = "0.8.2"
44
dokka = "2.0.0"
55
knit = "0.5.0"
6-
bcv = "0.16.2"
6+
bcv = "0.18.1"
77
animalsniffer = "1.7.1"
88
protobuf = "0.8.19"
99
shadow = "8.3.9"

integration-test/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ kotlin {
111111
}
112112
named("wasmJsTest") {
113113
dependencies {
114-
api("org.jetbrains.kotlin:kotlin-test-wasm-js")
114+
implementation("org.jetbrains.kotlin:kotlin-test-wasm-js")
115115
}
116116
}
117117
named("wasmWasiMain") {
@@ -121,11 +121,15 @@ kotlin {
121121
}
122122
named("wasmWasiTest") {
123123
dependencies {
124-
api("org.jetbrains.kotlin:kotlin-test-wasm-wasi")
124+
implementation("org.jetbrains.kotlin:kotlin-test-wasm-wasi")
125125
}
126126
}
127127
}
128128

129+
compilerOptions {
130+
freeCompilerArgs.add("-Xreturn-value-checker=check")
131+
}
132+
129133
targets.all {
130134
compilations.all {
131135
compileTaskProvider.configure {

integration-test/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Copyright 2017-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
#
44

5-
mainKotlinVersion=2.2.0
6-
mainLibVersion=1.9.1-SNAPSHOT
5+
mainKotlinVersion=2.3.0-Beta2
6+
mainLibVersion=1.10.0-SNAPSHOT
77

88
kotlin.code.style=official
99

0 commit comments

Comments
 (0)