Skip to content

Commit f8fe1c9

Browse files
committed
chore: kotlin 2.1.20 updates
1 parent b0b274d commit f8fe1c9

File tree

5 files changed

+48
-41
lines changed

5 files changed

+48
-41
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon(project: Project) =
432432
suppressWarnings = false
433433
verbose = false
434434
freeCompilerArgs.addAll(
435+
"-Xcontext-parameters",
435436
"-Xexpect-actual-classes",
436437
"-Xskip-prerelease-check",
437438
"-Xwhen-guards",

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.jvm.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ tasks {
143143
}
144144

145145
pluginManager.withPlugin("com.gradleup.shadow") {
146+
val shadowJar by existing(Jar::class)
146147
val buildExecutable by
147148
registering(ReallyExecJar::class) {
148-
val shadowJar by existing(Jar::class)
149149
jarFile = shadowJar.flatMap { it.archiveFile }
150150
// javaOpts = application.applicationDefaultJvmArgs
151151
javaOpts = named<JavaExec>("run").get().jvmArgs
@@ -159,7 +159,6 @@ tasks {
159159
description = "Print Java Platform Module dependencies of the application."
160160
group = LifecycleBasePlugin.BUILD_GROUP
161161

162-
val shadowJar by existing(Jar::class)
163162
doLast {
164163
val jarFile = shadowJar.get().archiveFile.get().asFile
165164

@@ -193,7 +192,6 @@ tasks {
193192

194193
val jdepExtn = extensions.create<JdeprscanExtension>("jdeprscan")
195194
register<Jdeprscan>("jdeprscan", jdepExtn).configure {
196-
val shadowJar by existing(Jar::class)
197195
jarFile = shadowJar.flatMap { it.archiveFile }
198196
}
199197
}

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.mpp.gradle.kts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
55
import com.google.devtools.ksp.gradle.KspAATask
66
import com.javiersc.kotlin.kopy.args.KopyFunctions
77
import common.*
8-
import java.util.jar.Attributes
98
import kotlinx.validation.*
109
import org.gradle.internal.os.OperatingSystem
1110
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
@@ -135,14 +134,8 @@ tasks {
135134
}
136135

137136
pluginManager.withPlugin("com.gradleup.shadow") {
138-
val shadowJar by
139-
existing(ShadowJar::class) {
140-
// https://gradleup.com/shadow/kmp-plugin/
141-
manifest {
142-
attributes[Attributes.Name.MAIN_CLASS.toString()] = libs.versions.app.mainclass
143-
}
144-
}
145-
137+
// https://gradleup.com/shadow/kmp-plugin/
138+
val shadowJar by existing(ShadowJar::class)
146139
val buildExecutable by
147140
registering(ReallyExecJar::class) {
148141
jarFile = shadowJar.flatMap { it.archiveFile }
@@ -163,7 +156,6 @@ tasks {
163156
configurations = listOf(runtimeDepConfig)
164157
archiveClassifier = "jvm-all"
165158
mergeServiceFiles()
166-
manifest { attributes[Attributes.Name.MAIN_CLASS.toString()] = libs.versions.app.mainclass }
167159
duplicatesStrategy = DuplicatesStrategy.INCLUDE
168160
}
169161
}

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

Lines changed: 34 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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
java = "25"
3-
kotlin = "2.1.20-RC3"
4-
kotlin-ksp = "2.1.20-RC3-1.0.31"
3+
kotlin = "2.1.20"
4+
kotlin-ksp = "2.1.20-1.0.31"
55
kotlin-jvmtarget = "21"
66
kotlin-dsl-jvmtarget = "21"
77
kotlin-api-version = "2.1"
@@ -20,7 +20,7 @@ org-name = "suresh.dev"
2020
org-url = "https://suresh.dev"
2121

2222
# Dependency Versions
23-
bc-plugins = "1.19.0"
23+
bc-plugins = "1.20.0"
2424
kotlinx-kover = "0.9.1"
2525
kotlinx-bcv = "0.17.0"
2626
kotlin-dokka = "2.0.0"
@@ -39,7 +39,7 @@ 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.3.16"
42+
kotlin-wrappers = "2025.3.17"
4343
kotlin-redacted = "1.12.1"
4444
kotlin-serviceloader = "0.0.15"
4545
kotlinx-multik = "0.2.3"
@@ -51,7 +51,7 @@ kopy = "0.14.0+2.1.10"
5151
poko = "0.18.2"
5252
mappie = "1.1.1"
5353
akkurate = "0.11.0"
54-
kaml = "0.72.0"
54+
kaml = "0.73.0"
5555
snakeyaml-engine-kmp = "3.1.1"
5656
konsist = "0.17.3"
5757
spring-boot = "3.4.3"
@@ -100,7 +100,7 @@ jmh = "1.37"
100100
mrjar = "0.1.1"
101101
ktfmt = "0.54"
102102
google-javaformat = "1.25.2"
103-
palantir-javaformat = "2.60.0"
103+
palantir-javaformat = "2.61.0"
104104
google-auto-service = "1.1.1"
105105
google-tink = "1.17.0"
106106
graalvm = "24.1.2"
@@ -187,10 +187,10 @@ rwmutex = "1.0.0"
187187
bluesky-ozone = "0.3.2"
188188

189189
# Compose
190-
jetbrains-compose = "1.8.0-alpha04"
191-
jetbrains-compose-viewmodel = "2.9.0-alpha04"
192-
jetbrains-compose-nav = "2.9.0-alpha14"
193-
jetbrains-compose-adaptive = "1.1.0-alpha04"
190+
jetbrains-compose = "1.8.0-beta01"
191+
jetbrains-compose-viewmodel = "2.9.0-alpha05"
192+
jetbrains-compose-nav = "2.9.0-alpha15"
193+
jetbrains-compose-adaptive = "1.1.0-beta01"
194194
kobweb = "0.20.4"
195195
detekt = "1.23.8"
196196
detekt-compose-rules = "0.4.22"

0 commit comments

Comments
 (0)