Skip to content

Commit 1dbd5c4

Browse files
Bump kotlin from 2.0.21 to 2.1.0 (#215)
1 parent 6b56a26 commit 1dbd5c4

File tree

5 files changed

+45
-40
lines changed

5 files changed

+45
-40
lines changed

gradle.properties

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,9 @@ org.gradle.jvmargs=-Xmx1G
44
org.gradle.java.installations.auto-download=false
55
org.gradle.daemon=false
66

7-
version=0.3.2-SNAPSHOT
8-
group=io.github.optimumcode
7+
version=0.4.0-SNAPSHOT
8+
group=io.github.optimumcode
9+
10+
# Due to large amount of test cases the output for JS WEB exceeds 1MB limit for TeamCity reader
11+
# The whole output is printed as a single line and cannot be split by the parser
12+
#kotlin.ignore.tcsm.overflow=true

gradle/libs.versions.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlin = "2.0.21"
2+
kotlin = "2.1.0"
33
kotest = "6.0.0.M1"
44
detekt = "1.23.7"
55
ktlint = "1.1.0"
@@ -26,6 +26,7 @@ nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0
2626
kotlin-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" }
2727
kotlin-serialization-json-okio = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json-okio", version.ref = "serialization" }
2828
kotlin-benchmark = { group = "org.jetbrains.kotlinx", name = "kotlinx-benchmark-runtime", version.ref = "benchmark" }
29+
kotlin-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.10.1" }
2930
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
3031
kotest-framework-engine = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" }
3132
kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }

json-schema-validator/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@ kotlin {
105105
commonTest {
106106
dependencies {
107107
implementation(libs.kotest.assertions.core)
108+
implementation(libs.kotlin.coroutines.core.get().toString()) {
109+
// see "https://kotlinlang.slack.com/archives/CDFP59223/p1736191408326039?thread_ts=1734964013.996149&cid=CDFP59223"
110+
because(
111+
"there is a problem with linkage related to changes in kotlin 2.1.0: " +
112+
"wasmJs tests in browser does not work without updating coroutines to the version compiled with 2.1.0",
113+
)
114+
}
108115
implementation(libs.kotest.framework.engine)
109116
implementation(kotlin("test-common"))
110117
implementation(kotlin("test-annotations-common"))

kotlin-js-store/yarn.lock

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -87,33 +87,12 @@
8787
dependencies:
8888
"@types/node" "*"
8989

90-
"@types/eslint-scope@^3.7.3":
91-
version "3.7.4"
92-
resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
93-
integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
94-
dependencies:
95-
"@types/eslint" "*"
96-
"@types/estree" "*"
97-
98-
"@types/eslint@*":
99-
version "8.40.2"
100-
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.40.2.tgz#2833bc112d809677864a4b0e7d1de4f04d7dac2d"
101-
integrity sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==
102-
dependencies:
103-
"@types/estree" "*"
104-
"@types/json-schema" "*"
105-
106-
"@types/estree@*":
107-
version "1.0.1"
108-
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
109-
integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
110-
11190
"@types/estree@^1.0.5":
11291
version "1.0.5"
11392
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
11493
integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
11594

116-
"@types/json-schema@*", "@types/json-schema@^7.0.8":
95+
"@types/json-schema@^7.0.8":
11796
version "7.0.12"
11897
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
11998
integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
@@ -667,7 +646,7 @@ engine.io@~6.5.2:
667646
engine.io-parser "~5.2.1"
668647
ws "~8.11.0"
669648

670-
enhanced-resolve@^5.17.0:
649+
enhanced-resolve@^5.17.1:
671650
version "5.17.1"
672651
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
673652
integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -1130,10 +1109,10 @@ karma-webpack@5.0.1:
11301109
minimatch "^9.0.3"
11311110
webpack-merge "^4.1.5"
11321111

1133-
karma@6.4.3:
1134-
version "6.4.3"
1135-
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
1136-
integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
1112+
karma@6.4.4:
1113+
version "6.4.4"
1114+
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
1115+
integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
11371116
dependencies:
11381117
"@colors/colors" "1.5.0"
11391118
body-parser "^1.19.0"
@@ -1165,6 +1144,13 @@ kind-of@^6.0.2:
11651144
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
11661145
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
11671146

1147+
kotlin-web-helpers@2.0.0:
1148+
version "2.0.0"
1149+
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
1150+
integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
1151+
dependencies:
1152+
format-util "^1.0.5"
1153+
11681154
loader-runner@^4.2.0:
11691155
version "4.3.0"
11701156
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
@@ -1268,10 +1254,10 @@ mkdirp@^0.5.5:
12681254
dependencies:
12691255
minimist "^1.2.6"
12701256

1271-
mocha@10.7.0:
1272-
version "10.7.0"
1273-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
1274-
integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
1257+
mocha@10.7.3:
1258+
version "10.7.3"
1259+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
1260+
integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
12751261
dependencies:
12761262
ansi-colors "^4.1.3"
12771263
browser-stdout "^1.3.1"
@@ -1860,12 +1846,11 @@ webpack-sources@^3.2.3:
18601846
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
18611847
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
18621848

1863-
webpack@5.93.0:
1864-
version "5.93.0"
1865-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
1866-
integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
1849+
webpack@5.94.0:
1850+
version "5.94.0"
1851+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
1852+
integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
18671853
dependencies:
1868-
"@types/eslint-scope" "^3.7.3"
18691854
"@types/estree" "^1.0.5"
18701855
"@webassemblyjs/ast" "^1.12.1"
18711856
"@webassemblyjs/wasm-edit" "^1.12.1"
@@ -1874,7 +1859,7 @@ webpack@5.93.0:
18741859
acorn-import-attributes "^1.9.5"
18751860
browserslist "^4.21.10"
18761861
chrome-trace-event "^1.0.2"
1877-
enhanced-resolve "^5.17.0"
1862+
enhanced-resolve "^5.17.1"
18781863
es-module-lexer "^1.2.1"
18791864
eslint-scope "5.1.1"
18801865
events "^3.2.0"

test-suites/build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@ kotlin {
6060
implementation(kotlin("test-annotations-common"))
6161
implementation(libs.okio.common)
6262
implementation(libs.kotlin.serialization.json.okio)
63+
64+
implementation(libs.kotlin.coroutines.core.get().toString()) {
65+
// see "https://kotlinlang.slack.com/archives/CDFP59223/p1736191408326039?thread_ts=1734964013.996149&cid=CDFP59223"
66+
because(
67+
"there is a problem with linkage related to changes in kotlin 2.1.0: " +
68+
"wasmJs tests in browser does not work without updating coroutines to the version compiled with 2.1.0",
69+
)
70+
}
6371
}
6472
}
6573
jsTest {

0 commit comments

Comments
 (0)