Skip to content

Commit 5b1d038

Browse files
authored
Bump Kotlin to 1.8 (#302)
1 parent 1f4e0c0 commit 5b1d038

File tree

3 files changed

+43
-33
lines changed

3 files changed

+43
-33
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import java.util.*
22
import io.gitlab.arturbosch.detekt.*
33

44
plugins {
5-
kotlin("js") version "1.7.20"
5+
kotlin("js") version "1.8.0"
66
id("org.jetbrains.compose") version "1.3.0"
77
`maven-publish`
88
signing
@@ -25,7 +25,7 @@ kotlin {
2525
useCommonJs()
2626
commonWebpackConfig {
2727
scssSupport {
28-
enabled = true
28+
enabled.set(true)
2929
}
3030
}
3131
}

kotlin-js-store/yarn.lock

Lines changed: 40 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -389,11 +389,16 @@ acorn-import-assertions@^1.7.6:
389389
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
390390
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
391391

392-
acorn@^8.4.1, acorn@^8.5.0:
392+
acorn@^8.5.0:
393393
version "8.8.0"
394394
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
395395
integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
396396

397+
acorn@^8.7.1:
398+
version "8.8.2"
399+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
400+
integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
401+
397402
ajv-formats@^2.1.1:
398403
version "2.1.1"
399404
resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
@@ -709,10 +714,10 @@ concat-map@0.0.1:
709714
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
710715
integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
711716

712-
connect-history-api-fallback@^1.6.0:
713-
version "1.6.0"
714-
resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
715-
integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
717+
connect-history-api-fallback@^2.0.0:
718+
version "2.0.0"
719+
resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
720+
integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
716721

717722
connect@^3.7.0:
718723
version "3.7.0"
@@ -934,10 +939,10 @@ engine.io@~6.2.0:
934939
engine.io-parser "~5.0.3"
935940
ws "~8.2.3"
936941

937-
enhanced-resolve@^5.9.3:
938-
version "5.10.0"
939-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
940-
integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
942+
enhanced-resolve@^5.10.0:
943+
version "5.12.0"
944+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
945+
integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
941946
dependencies:
942947
graceful-fs "^4.2.4"
943948
tapable "^2.2.0"
@@ -2217,18 +2222,18 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
22172222
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
22182223
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
22192224

2220-
sass-loader@13.0.0:
2221-
version "13.0.0"
2222-
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.0.0.tgz#0b4bff0289951ed21240bca54453eca3dbda1713"
2223-
integrity sha512-IHCFecI+rbPvXE2zO/mqdVFe8MU7ElGrwga9hh2H65Ru4iaBJAMRteum1c4Gsxi9Cq1FOtTEDd6+/AEYuQDM4Q==
2225+
sass-loader@13.0.2:
2226+
version "13.0.2"
2227+
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.0.2.tgz#e81a909048e06520e9f2ff25113a801065adb3fe"
2228+
integrity sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==
22242229
dependencies:
22252230
klona "^2.0.4"
22262231
neo-async "^2.6.2"
22272232

2228-
sass@1.52.3:
2229-
version "1.52.3"
2230-
resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.3.tgz#b7cc7ffea2341ccc9a0c4fd372bf1b3f9be1b6cb"
2231-
integrity sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==
2233+
sass@1.54.3:
2234+
version "1.54.3"
2235+
resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.3.tgz#37baa2652f7f1fdadb73240ee9a2b9b81fabb5c4"
2236+
integrity sha512-fLodey5Qd41Pxp/Tk7Al97sViYwF/TazRc5t6E65O7JOk4XF8pzwIW7CvCxYVOfJFFI/1x5+elDyBIixrp+zrw==
22322237
dependencies:
22332238
chokidar ">=3.0.0 <4.0.0"
22342239
immutable "^4.0.0"
@@ -2595,6 +2600,11 @@ typescript@3.9.5:
25952600
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
25962601
integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
25972602

2603+
typescript@4.7.4:
2604+
version "4.7.4"
2605+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
2606+
integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
2607+
25982608
ua-parser-js@^0.7.30:
25992609
version "0.7.31"
26002610
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
@@ -2650,7 +2660,7 @@ void-elements@^2.0.0:
26502660
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
26512661
integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
26522662

2653-
watchpack@^2.3.1:
2663+
watchpack@^2.4.0:
26542664
version "2.4.0"
26552665
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
26562666
integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
@@ -2694,10 +2704,10 @@ webpack-dev-middleware@^5.3.1:
26942704
range-parser "^1.2.1"
26952705
schema-utils "^4.0.0"
26962706

2697-
webpack-dev-server@4.9.2:
2698-
version "4.9.2"
2699-
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz#c188db28c7bff12f87deda2a5595679ebbc3c9bc"
2700-
integrity sha512-H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q==
2707+
webpack-dev-server@4.9.3:
2708+
version "4.9.3"
2709+
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.3.tgz#2360a5d6d532acb5410a668417ad549ee3b8a3c9"
2710+
integrity sha512-3qp/eoboZG5/6QgiZ3llN8TUzkSpYg1Ko9khWX1h40MIEUNS2mDoIa8aXsPfskER+GbTvs/IJZ1QTBBhhuetSw==
27012711
dependencies:
27022712
"@types/bonjour" "^3.5.9"
27032713
"@types/connect-history-api-fallback" "^1.3.5"
@@ -2711,7 +2721,7 @@ webpack-dev-server@4.9.2:
27112721
chokidar "^3.5.3"
27122722
colorette "^2.0.10"
27132723
compression "^1.7.4"
2714-
connect-history-api-fallback "^1.6.0"
2724+
connect-history-api-fallback "^2.0.0"
27152725
default-gateway "^6.0.3"
27162726
express "^4.17.3"
27172727
graceful-fs "^4.2.6"
@@ -2749,21 +2759,21 @@ webpack-sources@^3.2.3:
27492759
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
27502760
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
27512761

2752-
webpack@5.73.0:
2753-
version "5.73.0"
2754-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38"
2755-
integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
2762+
webpack@5.74.0:
2763+
version "5.74.0"
2764+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
2765+
integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
27562766
dependencies:
27572767
"@types/eslint-scope" "^3.7.3"
27582768
"@types/estree" "^0.0.51"
27592769
"@webassemblyjs/ast" "1.11.1"
27602770
"@webassemblyjs/wasm-edit" "1.11.1"
27612771
"@webassemblyjs/wasm-parser" "1.11.1"
2762-
acorn "^8.4.1"
2772+
acorn "^8.7.1"
27632773
acorn-import-assertions "^1.7.6"
27642774
browserslist "^4.14.5"
27652775
chrome-trace-event "^1.0.2"
2766-
enhanced-resolve "^5.9.3"
2776+
enhanced-resolve "^5.10.0"
27672777
es-module-lexer "^0.9.0"
27682778
eslint-scope "5.1.1"
27692779
events "^3.2.0"
@@ -2776,7 +2786,7 @@ webpack@5.73.0:
27762786
schema-utils "^3.1.0"
27772787
tapable "^2.1.1"
27782788
terser-webpack-plugin "^5.1.3"
2779-
watchpack "^2.3.1"
2789+
watchpack "^2.4.0"
27802790
webpack-sources "^3.2.3"
27812791

27822792
websocket-driver@>=0.5.1, websocket-driver@^0.7.4:

showcase/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ kotlin {
1717
useCommonJs()
1818
commonWebpackConfig {
1919
scssSupport {
20-
enabled = true
20+
enabled.set(true)
2121
}
2222
}
2323
}

0 commit comments

Comments
 (0)