Skip to content

build: Kotlin 2.4.20; actualize the Kotlin/JS yarn.lock; drop the webpack pin #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michalharakal merged 1 commit into from
Sep 24, 2026
Merged

build: Kotlin 2.4.20; actualize the Kotlin/JS yarn.lock; drop the webpack pin #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-logic/convention/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
`kotlin-dsl`
kotlin("jvm") version "2.4.10"
kotlin("plugin.serialization") version "2.4.10"
kotlin("jvm") version "2.4.20"
kotlin("plugin.serialization") version "2.4.20"
}

repositories {
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ skainet {
pin("qs", libs.versions.npm.qs, NpmPinTarget.JS)
pin("brace-expansion", libs.versions.npm.brace.expansion, NpmPinTarget.JS)
pin("diff", libs.versions.npm.diff, NpmPinTarget.JS)
pin("webpack", libs.versions.npm.webpack, NpmPinTarget.JS)
}
}

Expand Down
12 changes: 3 additions & 9 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jsonSchemaValidator = "3.0.7"
jsonSchemaValidatorVersion = "0.5.5"
junit = "4.13.2"
junitJupiter = "6.1.3"
kotlin = "2.4.10"
kotlin = "2.4.20"
kotlinxCoroutines = "1.11.0"
kotlinBrowser = "0.5.0"
android-minSdk = "24"
Expand Down Expand Up @@ -44,9 +44,9 @@ kotest = "6.2.5"
# A pin lands in BOTH lockfiles by default, because Yarn writes an entry for every
# `resolutions` key whether or not that graph requests the package. Scope the pin
# when only one graph has it:
# pin("webpack", libs.versions.npm.webpack, NpmPinTarget.JS)
# pin("diff", libs.versions.npm.diff, NpmPinTarget.JS)
# Check which graph holds a package before deciding:
# grep -c '^webpack@' kotlin-js-store/yarn.lock kotlin-js-store/wasm/yarn.lock
# grep -c '^diff@' kotlin-js-store/yarn.lock kotlin-js-store/wasm/yarn.lock
npm-ws = "8.21.1" # GHSA-96hv-2xvq-fx4p
npm-js-yaml = "4.3.2" # GHSA-5p4m-2wfm-xmqj, GHSA-2883-xcg3-v3hh
npm-socketio-parser = "4.2.7" # GHSA-2m8v-j782-fhvr
Expand All @@ -60,12 +60,6 @@ npm-qs = "6.16.0" # GHSA-4mjr-xmp4-gh2g, GHSA-x5fp-wj9c-mxmx
# between the two majors, so the 3.x consumer is unaffected.
npm-brace-expansion = "2.1.4" # GHSA-rgw5-rvv9-x895, GHSA-mh99-v99m-4gvg
npm-diff = "8.0.3" # GHSA-73rr-hh4g-fpgx
# KGP pins webpack to an exact version (5.101.3 for Kotlin 2.4.10), so this
# resolution deliberately overrides the Kotlin toolchain's own choice. 5.104.1 is
# the first release clearing both advisories. Re-check this pin on every Kotlin
# upgrade: once KGP's own webpack moves past 5.104.1, drop the pin rather than
# holding the bundler behind the version KGP was tested against.
npm-webpack = "5.104.1" # GHSA-8fgc-7cc6-rx7x, GHSA-38r7-794h-5758

[libraries]
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jacksonDatabind" }
Expand Down
Loading
Loading