Skip to content

Commit 8371373

Browse files
committed
feat: use kotlin 1.8 and also bump all other dependencies
1 parent 8a7fa7d commit 8371373

File tree

8 files changed

+34
-28
lines changed

8 files changed

+34
-28
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
plugins {
3-
kotlin("multiplatform") version "1.7.21" apply false
4-
kotlin("plugin.serialization") version "1.7.21" apply false
3+
kotlin("multiplatform") apply false
4+
kotlin("plugin.serialization") apply false
55
`maven-publish`
66
id("com.palantir.git-version") version "0.13.0"
77
id("org.jlleitschuh.gradle.ktlint") version "10.3.0" apply false

gradle.properties

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
systemProp.org.gradle.internal.http.socketTimeout=120000
22

3-
kotlinVersion=1.7.21
3+
kotlinVersion=1.8.10
44
kotlinCoroutinesVersion=1.6.4
5-
ktorVersion=2.0.3
6-
kotlinLoggingVersion=2.1.23
5+
ktorVersion=2.2.4
6+
kotlinLoggingVersion=3.0.5
77
kotlinxHtmlVersion=0.8.0
8-
kotlinxSerializationVersion=1.4.1
9-
modelixIncrementalVersion=0.1.2
8+
kotlinxSerializationVersion=1.5.0
9+
modelixIncrementalVersion=0.1.4
10+
kotlinCollectionsImmutableVersion=0.3.5

kotlin-js-store/yarn.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,12 @@ acorn-walk@^8.0.2:
307307
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
308308
integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
309309

310-
acorn@^8.1.0, acorn@^8.8.0:
310+
acorn@^8.1.0, acorn@^8.7.1, acorn@^8.8.0:
311311
version "8.8.2"
312312
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
313313
integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
314314

315-
acorn@^8.4.1, acorn@^8.5.0:
315+
acorn@^8.5.0:
316316
version "8.8.0"
317317
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
318318
integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
@@ -750,10 +750,10 @@ engine.io@~6.2.0:
750750
engine.io-parser "~5.0.3"
751751
ws "~8.2.3"
752752

753-
enhanced-resolve@^5.9.3:
754-
version "5.10.0"
755-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
756-
integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
753+
enhanced-resolve@^5.10.0:
754+
version "5.12.0"
755+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
756+
integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
757757
dependencies:
758758
graceful-fs "^4.2.4"
759759
tapable "^2.2.0"
@@ -2117,7 +2117,7 @@ w3c-xmlserializer@^3.0.0:
21172117
dependencies:
21182118
xml-name-validator "^4.0.0"
21192119

2120-
watchpack@^2.3.1:
2120+
watchpack@^2.4.0:
21212121
version "2.4.0"
21222122
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
21232123
integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
@@ -2173,21 +2173,21 @@ webpack-sources@^3.2.3:
21732173
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
21742174
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
21752175

2176-
webpack@5.73.0:
2177-
version "5.73.0"
2178-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38"
2179-
integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
2176+
webpack@5.74.0:
2177+
version "5.74.0"
2178+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
2179+
integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
21802180
dependencies:
21812181
"@types/eslint-scope" "^3.7.3"
21822182
"@types/estree" "^0.0.51"
21832183
"@webassemblyjs/ast" "1.11.1"
21842184
"@webassemblyjs/wasm-edit" "1.11.1"
21852185
"@webassemblyjs/wasm-parser" "1.11.1"
2186-
acorn "^8.4.1"
2186+
acorn "^8.7.1"
21872187
acorn-import-assertions "^1.7.6"
21882188
browserslist "^4.14.5"
21892189
chrome-trace-event "^1.0.2"
2190-
enhanced-resolve "^5.9.3"
2190+
enhanced-resolve "^5.10.0"
21912191
es-module-lexer "^0.9.0"
21922192
eslint-scope "5.1.1"
21932193
events "^3.2.0"
@@ -2200,7 +2200,7 @@ [email protected]:
22002200
schema-utils "^3.1.0"
22012201
tapable "^2.1.1"
22022202
terser-webpack-plugin "^5.1.3"
2203-
watchpack "^2.3.1"
2203+
watchpack "^2.4.0"
22042204
webpack-sources "^3.2.3"
22052205

22062206
whatwg-encoding@^2.0.0:

metamodel-gradle-test/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ repositories {
2121
}
2222

2323
plugins {
24-
kotlin("jvm") version "1.7.21"
24+
kotlin("jvm") version "1.8.10"
2525
id("base")
2626
id("org.modelix.metamodel.gradle")
2727
}

metamodel-runtime/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ val mpsExtensionsVersion: String by rootProject
99

1010
kotlin {
1111
jvm()
12-
js(BOTH) {
12+
js(IR) {
1313
browser {
1414
}
1515
nodejs {

model-api/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ tasks.named("check") {
3333
}
3434

3535
tasks.named("sourcesJar") {
36-
dependsOn("jsIrGenerateExternalsIntegrated")
36+
dependsOn("jsGenerateExternalsIntegrated")
3737
}
3838

3939
val kotlinLoggingVersion: String by rootProject
4040
val kotlinxSerializationVersion: String by rootProject
4141

4242
kotlin {
4343
jvm()
44-
js(BOTH) {
44+
js(IR) {
4545
nodejs {
4646
testTask {
4747
useMocha {
@@ -90,9 +90,9 @@ kotlin {
9090
}
9191

9292
tasks.named("runKtlintCheckOverJsMainSourceSet") {
93-
dependsOn("jsIrGenerateExternalsIntegrated")
93+
dependsOn("jsGenerateExternalsIntegrated")
9494
}
9595

9696
tasks.named("jsSourcesJar") {
97-
dependsOn("jsIrGenerateExternalsIntegrated")
97+
dependsOn("jsGenerateExternalsIntegrated")
9898
}

model-client/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ val ktorVersion: String by rootProject
3737

3838
kotlin {
3939
jvm()
40-
js(BOTH) {
40+
js(IR) {
4141
// browser {}
4242
nodejs {
4343
testTask {

settings.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
pluginManagement {
2+
val kotlinVersion: String by settings
3+
plugins {
4+
kotlin("multiplatform") version kotlinVersion apply false
5+
kotlin("plugin.serialization") version kotlinVersion apply false
6+
}
27
repositories {
38
mavenLocal()
49
gradlePluginPortal()

0 commit comments

Comments
 (0)