Skip to content

Commit 8162803

Browse files
committed
Update Kotlin to 2.1.20
1 parent 91860f3 commit 8162803

File tree

5 files changed

+31
-15
lines changed

5 files changed

+31
-15
lines changed

gradle/build-logic/build-logic.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2024 Björn Kautler
2+
* Copyright 2020-2025 Björn Kautler
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ dependencies {
3535
implementation(libs.build.inject)
3636
implementation(libs.build.github.api)
3737
implementation(libs.build.snakeyaml)
38-
implementation(embeddedKotlin("compiler-embeddable"))
38+
compileOnly(embeddedKotlin("compiler-embeddable"))
3939
}
4040

4141
tasks.withType<KotlinCompile>().configureEach {

gradle/build-logic/src/main/kotlin/net/kautler/ncc_packer.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2024 Björn Kautler
2+
* Copyright 2020-2025 Björn Kautler
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@ package net.kautler
1818

1919
import org.gradle.accessors.dm.LibrariesForLibs
2020
import org.gradle.accessors.dm.LibrariesForKotlinWrappers
21+
import org.gradle.kotlin.dsl.configure
2122
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalMainFunctionArgumentsDsl
23+
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsEnvSpec
2224
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsExec
2325
import org.jetbrains.kotlin.gradle.tasks.IncrementalSyncTask
2426

@@ -57,6 +59,10 @@ tasks.withType<IncrementalSyncTask>().configureEach {
5759
}
5860
}
5961

62+
configure<NodeJsEnvSpec> {
63+
downloadBaseUrl.set(provider { null })
64+
}
65+
6066
// work-around for missing feature in dependencies block added in Gradle 8.3
6167
//val setupWsl by configurations.registering {
6268
val setupWslExecutable by configurations.creating {

gradle/build-logic/src/main/kotlin/net/kautler/node.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import net.kautler.dao.action.GitHubAction
2020
import net.kautler.util.npm
2121
import org.gradle.accessors.dm.LibrariesForLibs
2222
import org.gradle.accessors.dm.LibrariesForKotlinWrappers
23+
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsEnvSpec
2324
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsExec
24-
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
25-
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
25+
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootEnvSpec
2626
import org.jetbrains.kotlin.gradle.tasks.IncrementalSyncTask
2727
import org.yaml.snakeyaml.Yaml
2828

@@ -113,13 +113,13 @@ tasks.withType<NodeJsExec>().configureEach {
113113
}
114114
}
115115

116-
configure<NodeJsRootExtension> {
117-
version = libs.versions.build.node.get()
118-
downloadBaseUrl = null
116+
configure<NodeJsEnvSpec> {
117+
version.set(libs.versions.build.node.get())
118+
downloadBaseUrl.set(provider { null })
119119
}
120120

121-
configure<YarnRootExtension> {
122-
downloadBaseUrl = null
121+
configure<YarnRootEnvSpec> {
122+
downloadBaseUrl.set(provider { null })
123123
}
124124

125125
val executable by configurations.registering {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ build-inject = "1"
2525
build-kotlinx-serialization = "1.5.0"
2626
build-node = "20.11.0"
2727
build-snakeyaml = "2.0"
28-
kotlin = "2.0.21"
28+
kotlin = "2.1.20"
2929
kotlinx-coroutines = "1.6.4"
3030
ktor = "3.0.0"
3131
workflows-kotlin = "2.1.20"

kotlin-js-store/yarn.lock

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,6 +1229,13 @@ jwt-decode@^3.1.2:
12291229
resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59"
12301230
integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==
12311231

1232+
1233+
version "2.0.0"
1234+
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
1235+
integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
1236+
dependencies:
1237+
format-util "^1.0.5"
1238+
12321239
lazystream@^1.0.0:
12331240
version "1.0.1"
12341241
resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
@@ -1311,10 +1318,10 @@ mkdirp@^0.5.1:
13111318
dependencies:
13121319
minimist "^1.2.6"
13131320

1314-
1315-
version "10.7.0"
1316-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
1317-
integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
1321+
1322+
version "10.7.3"
1323+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
1324+
integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
13181325
dependencies:
13191326
ansi-colors "^4.1.3"
13201327
browser-stdout "^1.3.1"
@@ -1556,6 +1563,7 @@ streamx@^2.15.0:
15561563
bare-events "^2.2.0"
15571564

15581565
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0:
1566+
name string-width-cjs
15591567
version "4.2.3"
15601568
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
15611569
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -1588,6 +1596,7 @@ string_decoder@~1.1.1:
15881596
safe-buffer "~5.1.0"
15891597

15901598
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
1599+
name strip-ansi-cjs
15911600
version "6.0.1"
15921601
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
15931602
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -1753,6 +1762,7 @@ workerpool@^6.5.1:
17531762
integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
17541763

17551764
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
1765+
name wrap-ansi-cjs
17561766
version "7.0.0"
17571767
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
17581768
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

0 commit comments

Comments
 (0)