Skip to content

Commit 4c6200e

Browse files
sureshgsureshg
committed
chore: gradle and dep updates
1 parent 11bb405 commit 4c6200e

File tree

9 files changed

+78
-51
lines changed

9 files changed

+78
-51
lines changed

‎gradle/build-logic/src/main/kotlin/common/Multiplatform.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ fun KotlinMultiplatformExtension.wasmJsTarget(project: Project) =
239239
wasmJsMain {
240240
dependencies {
241241
api(libs.ktor.client.js)
242-
// kotlinx-browser is only supported for WasmJs.
243242
api(libs.kotlinx.browser)
243+
api(libs.kotlin.wrappers.browser)
244244
// api(npm("@js-joda/timezone", libs.versions.npm.jsjoda.tz.get()))
245245
}
246246
}

‎gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ fun KotlinTarget.setTargetAttribute() {
380380
fun JavaToolchainSpec.configureJvmToolchain(project: Project) =
381381
with(project) {
382382
languageVersion = toolchainVersion
383+
nativeImageCapable = toolchainVendor.map { it == JvmVendorSpec.GRAAL_VM }
383384
// vendor = toolchainVendor
384385
}
385386

‎gradle/build-logic/src/main/kotlin/tasks/MultiReleaseJar.kt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import org.gradle.api.tasks.SourceSetContainer
77
import org.gradle.api.tasks.compile.JavaCompile
88
import org.gradle.jvm.toolchain.JavaLanguageVersion
99
import org.gradle.jvm.toolchain.JavaToolchainService
10-
import org.gradle.kotlin.dsl.get
10+
import org.gradle.kotlin.dsl.*
1111
import org.gradle.process.CommandLineArgumentProvider
1212
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation
1313

1414
private val Project.sourceSets: SourceSetContainer
15-
get() = this.extensions.getByName("sourceSets") as SourceSetContainer
15+
get() = extensions.getByName("sourceSets") as SourceSetContainer
1616

1717
private val Project.javaToolchains: JavaToolchainService
18-
get() = this.extensions.getByName("javaToolchains") as JavaToolchainService
18+
get() = extensions.getByName("javaToolchains") as JavaToolchainService
1919

2020
/**
2121
* Setup tasks to compile `module-info.java` file for a module named [moduleName] from a source set
@@ -46,11 +46,10 @@ fun Project.configureJava9ModuleInfoCompilation(
4646
targetCompatibility = "9"
4747
sourceCompatibility = "9"
4848

49-
javaCompiler.set(javaToolchains.compilerFor { languageVersion.set(toolchainVersion) })
50-
49+
javaCompiler = javaToolchains.compilerFor { languageVersion = toolchainVersion }
5150
val javaSourceSet = sourceSets[sourceSetName].java
52-
destinationDirectory.set(
53-
javaSourceSet.destinationDirectory.asFile.get().resolve("META-INF/versions/9"))
51+
destinationDirectory =
52+
javaSourceSet.destinationDirectory.asFile.get().resolve("META-INF/versions/9")
5453
options.sourcepath = files(javaSourceSet.srcDirs)
5554
val moduleFiles = objects.fileCollection().from(moduleOutputs)
5655
val modulePath = javaCompileClasspath.filter { it !in moduleFiles.files }

‎gradle/kotlin-js-store/package-lock.json‎

Lines changed: 45 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradle/libs.versions.toml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kotlin-jvmtarget = "21"
66
kotlin-dsl-jvmtarget = "21"
77
kotlin-api-version = "2.1"
88
kotlin-lang-version = "2.1"
9-
gradle = "8.13"
9+
gradle = "8.14-rc-1"
1010
java-vendor = "Oracle"
1111
java-jvmArguments = "--enable-preview"
1212
java-addModules = "jdk.incubator.vector"
@@ -20,7 +20,7 @@ org-name = "suresh.dev"
2020
org-url = "https://suresh.dev"
2121

2222
# Dependency Versions
23-
bc-plugins = "1.25.0"
23+
bc-plugins = "1.27.0"
2424
kotlinx-kover = "0.9.1"
2525
kotlinx-bcv = "0.17.0"
2626
kotlin-dokka = "2.0.0"
@@ -32,14 +32,14 @@ kotlinx-datetime-zoneinfo = "2025a-spi.0.6.2"
3232
kotlinx-serialization = "1.8.1"
3333
kotlinx-rpc = "0.6.0"
3434
kotlinx-collections-immutable = "0.3.8"
35-
kotlinx-lincheck = "2.38"
35+
kotlinx-lincheck = "2.39"
3636
kotlinx-html = "0.12.0"
3737
kotlinx-browser = "0.3"
3838
kotlinx-benchmark = "0.4.13"
3939
kotlinx-fuzz = "0.2.2"
4040
kotlinx-metadata = "0.9.0"
4141
kotlinx-reflect-lite = "1.1.0"
42-
kotlin-wrappers = "2025.4.6"
42+
kotlin-wrappers = "2025.4.10"
4343
kotlin-redacted = "1.13.0"
4444
kotlin-serviceloader = "0.0.15"
4545
kotlinx-multik = "0.2.3"
@@ -49,9 +49,9 @@ kotlin-statistics = "0.4.0-RC1"
4949
evas = "1.2.0"
5050
kopy = "0.15.0+2.1.20"
5151
poko = "0.18.5"
52-
mappie = "2.1.20-1.2.1"
52+
mappie = "2.1.20-1.2.2"
5353
akkurate = "0.11.0"
54-
kaml = "0.75.0"
54+
kaml = "0.76.0"
5555
snakeyaml-engine-kmp = "3.1.1"
5656
konsist = "0.17.3"
5757
decoroutinator = "2.4.8"
@@ -60,15 +60,15 @@ spring-depmgmt = "1.1.7"
6060
ktor = "3.1.2"
6161
ktor-cohort = "2.6.2"
6262
otel = "1.49.0"
63-
otel-instr = "2.14.0"
64-
otel-instr-alpha = "2.14.0-alpha"
63+
otel-instr = "2.15.0"
64+
otel-instr-alpha = "2.15.0-alpha"
6565
otel-semconv = "1.32.0"
66-
otel-samplers = "1.45.0-alpha"
66+
otel-samplers = "1.46.0-alpha"
6767
elastic-otel = "0.4.0"
6868
okio = "3.10.2"
6969
sslcontext-kickstart = "9.1.0"
7070
ksp-auto-service = "1.2.0"
71-
gradle-kotlin-dsl = "5.2.0"
71+
gradle-kotlin-dsl = "6.0.0"
7272
zip-prefixer = "0.3.1"
7373
ajalt-mordant = "3.0.2"
7474
ajalt-clikt = "5.0.3"
@@ -83,14 +83,14 @@ jte = "3.2.0"
8383
jimfs = "1.3.0"
8484
sshj = "0.39.0"
8585
jsch = "0.2.24"
86-
pty4j = "0.13.3"
86+
pty4j = "0.13.4"
8787
oshi = "6.8.0"
8888
junit = "5.13.0-M2"
8989
koin = "4.1.0-Beta7"
9090
koin-annotations = "2.0.0"
9191
metro = "0.1.2"
9292
kotest = "6.0.0.M3"
93-
mockk = "1.13.17"
93+
mockk = "1.14.0"
9494
mokkery = "2.7.2"
9595
wiremock = "3.12.1"
9696
wiremock-kotlin = "2.1.1"
@@ -103,7 +103,7 @@ jmh = "1.37"
103103
mrjar = "0.1.1"
104104
ktfmt = "0.54"
105105
google-javaformat = "1.26.0"
106-
palantir-javaformat = "2.62.0"
106+
palantir-javaformat = "2.63.0"
107107
google-auto-service = "1.1.1"
108108
google-tink = "1.17.0"
109109
graalvm = "24.2.0"
@@ -136,7 +136,7 @@ java-keyring = "1.0.4"
136136
java-keychain = "1.1.0"
137137
webjars-xterm = "5.1.0"
138138
arrow-suspendapp = "0.5.0"
139-
exposed = "0.60.0"
139+
exposed = "0.61.0"
140140
postgresql = "42.7.5"
141141
hikariCP = "6.3.0"
142142
h2 = "2.3.232"
@@ -191,10 +191,10 @@ rwmutex = "1.0.0"
191191
bluesky-ozone = "0.3.2"
192192

193193
# Compose
194-
jetbrains-compose = "1.8.0-beta01"
195-
jetbrains-compose-viewmodel = "2.9.0-alpha05"
196-
jetbrains-compose-nav = "2.9.0-alpha15"
197-
jetbrains-compose-adaptive = "1.1.0-beta01"
194+
jetbrains-compose = "1.8.0-beta02"
195+
jetbrains-compose-viewmodel = "2.9.0-alpha06"
196+
jetbrains-compose-nav = "2.9.0-alpha16"
197+
jetbrains-compose-adaptive = "1.1.0-beta02"
198198
kobweb = "0.21.1"
199199
detekt = "1.23.8"
200200
detekt-compose-rules = "0.4.22"
@@ -215,8 +215,8 @@ swagger-style = "https://unpkg.com/[email protected]/them
215215

216216
# Plugin versions
217217
benmanes = "0.52.0"
218-
foojay-resolver = "0.9.0"
219-
gradle-develocity = "3.19.2"
218+
foojay-resolver = "0.10.0"
219+
gradle-develocity = "4.0"
220220
nmcp = "0.0.9"
221221
nexus-publish = "2.0.0"
222222
vanniktech-publish = "0.31.0"

‎gradle/wrapper/gradle-wrapper.jar‎

59 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)