Skip to content

Commit 0ddfaee

Browse files
Bump kotlin from 2.0.21 to 2.1.0 (#18)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Oleg Smirnov <[email protected]>
1 parent a5a184b commit 0ddfaee

File tree

3 files changed

+37
-34
lines changed

3 files changed

+37
-34
lines changed

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
serialization = "1.7.3"
55
graphql = "8.3.0"
@@ -15,6 +15,7 @@ publication = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
1515

1616
[libraries]
1717
kotlin-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" }
18+
kotlin-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.10.1" }
1819
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
1920
kotest-framework-engine = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" }
2021
kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }

kotlin-js-store/yarn.lock

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -69,28 +69,12 @@
6969
dependencies:
7070
"@types/node" "*"
7171

72-
"@types/eslint-scope@^3.7.3":
73-
version "3.7.7"
74-
resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
75-
integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
76-
dependencies:
77-
"@types/eslint" "*"
78-
"@types/estree" "*"
79-
80-
"@types/eslint@*":
81-
version "9.6.0"
82-
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.0.tgz#51d4fe4d0316da9e9f2c80884f2c20ed5fb022ff"
83-
integrity sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==
84-
dependencies:
85-
"@types/estree" "*"
86-
"@types/json-schema" "*"
87-
88-
"@types/estree@*", "@types/estree@^1.0.5":
72+
"@types/estree@^1.0.5":
8973
version "1.0.5"
9074
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
9175
integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
9276

93-
"@types/json-schema@*", "@types/json-schema@^7.0.8":
77+
"@types/json-schema@^7.0.8":
9478
version "7.0.15"
9579
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
9680
integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -643,7 +627,7 @@ engine.io@~6.5.2:
643627
engine.io-parser "~5.2.1"
644628
ws "~8.17.1"
645629

646-
enhanced-resolve@^5.17.0:
630+
enhanced-resolve@^5.17.1:
647631
version "5.17.1"
648632
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
649633
integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -1118,10 +1102,10 @@ [email protected]:
11181102
minimatch "^9.0.3"
11191103
webpack-merge "^4.1.5"
11201104

1121-
1122-
version "6.4.3"
1123-
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
1124-
integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
1105+
1106+
version "6.4.4"
1107+
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
1108+
integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
11251109
dependencies:
11261110
"@colors/colors" "1.5.0"
11271111
body-parser "^1.19.0"
@@ -1153,6 +1137,13 @@ kind-of@^6.0.2:
11531137
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
11541138
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
11551139

1140+
1141+
version "2.0.0"
1142+
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
1143+
integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
1144+
dependencies:
1145+
format-util "^1.0.5"
1146+
11561147
loader-runner@^4.2.0:
11571148
version "4.3.0"
11581149
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
@@ -1256,10 +1247,10 @@ mkdirp@^0.5.5:
12561247
dependencies:
12571248
minimist "^1.2.6"
12581249

1259-
1260-
version "10.7.0"
1261-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
1262-
integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
1250+
1251+
version "10.7.3"
1252+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
1253+
integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
12631254
dependencies:
12641255
ansi-colors "^4.1.3"
12651256
browser-stdout "^1.3.1"
@@ -1864,12 +1855,11 @@ webpack-sources@^3.2.3:
18641855
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
18651856
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
18661857

1867-
webpack@5.93.0:
1868-
version "5.93.0"
1869-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
1870-
integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
1858+
webpack@5.94.0:
1859+
version "5.94.0"
1860+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
1861+
integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
18711862
dependencies:
1872-
"@types/eslint-scope" "^3.7.3"
18731863
"@types/estree" "^1.0.5"
18741864
"@webassemblyjs/ast" "^1.12.1"
18751865
"@webassemblyjs/wasm-edit" "^1.12.1"
@@ -1878,7 +1868,7 @@ [email protected]:
18781868
acorn-import-attributes "^1.9.5"
18791869
browserslist "^4.21.10"
18801870
chrome-trace-event "^1.0.2"
1881-
enhanced-resolve "^5.17.0"
1871+
enhanced-resolve "^5.17.1"
18821872
es-module-lexer "^1.2.1"
18831873
eslint-scope "5.1.1"
18841874
events "^3.2.0"

library/build.gradle.kts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,18 @@ kotlin {
5757
dependencies {
5858
implementation(kotlin("test-common"))
5959
implementation(kotlin("test-annotations-common"))
60+
61+
implementation(
62+
libs.kotlin.coroutines.core
63+
.get()
64+
.toString(),
65+
) {
66+
// see "https://kotlinlang.slack.com/archives/CDFP59223/p1736191408326039?thread_ts=1734964013.996149&cid=CDFP59223"
67+
because(
68+
"there is a problem with linkage related to changes in kotlin 2.1.0: " +
69+
"wasmJs tests in browser does not work without updating coroutines to the version compiled with 2.1.0",
70+
)
71+
}
6072
}
6173
}
6274
val nonWasmWasiTest by creating {

0 commit comments

Comments
 (0)