Skip to content

Commit 9237a95

Browse files
committed
chore: new kotlin dsl, atomic api support
1 parent 8cc0a7b commit 9237a95

File tree

3 files changed

+14
-33
lines changed

3 files changed

+14
-33
lines changed

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
java = "25"
33
kotlin = "2.1.20-Beta2"
4-
kotlin-ksp = "2.1.20-Beta1-1.0.29"
4+
kotlin-ksp = "2.1.20-Beta2-1.0.29"
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
# Gradle Dependencies Versions
23-
bc-plugins = "0.28.0"
23+
bc-plugins = "0.29.0"
2424
kotlinx-kover = "0.9.1"
2525
kotlinx-bcv = "0.17.0"
2626
kotlin-dokka = "2.0.0"
@@ -49,7 +49,7 @@ kopy = "0.14.0+2.1.10"
4949
poko = "0.18.2"
5050
mappie = "0.10.0"
5151
akkurate = "0.11.0"
52-
kaml = "0.67.0"
52+
kaml = "0.67.1"
5353
snakeyaml-engine-kmp = "3.1.0"
5454
konsist = "0.17.3"
5555
spring-boot = "3.4.2"
@@ -171,7 +171,7 @@ kmp-process = "0.1.2"
171171
langchain4j = "1.0.0-alpha1"
172172
jlama = "0.8.4"
173173
mcp-kotlin = "0.3.0"
174-
mcp4k = "0.3.4"
174+
mcp4k = "0.3.3"
175175
dflib = "1.1.0"
176176
ldaptive = "2.4.0"
177177
chicory = "1.0.0"

plugins/project/src/main/kotlin/common/Multiplatform.kt

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,14 @@ fun KotlinMultiplatformExtension.jvmTarget(project: Project) =
100100
// val test by testRuns.existing
101101
testRuns.configureEach { executionTask.configure { configureJavaTest() } }
102102

103+
// binaries {
104+
// executable {
105+
// mainClass = libs.versions.app.mainclass
106+
// applicationDefaultJvmArgs = jvmRunArgs
107+
// applicationDistribution.duplicatesStrategy = DuplicatesStrategy.WARN
108+
// }
109+
// }
110+
103111
// Register a task to execute a class using jvm runtime dependencies.
104112
// compilations.getByName("test") {
105113
// tasks.register<JavaExec>("ktExec") {
@@ -108,35 +116,7 @@ fun KotlinMultiplatformExtension.jvmTarget(project: Project) =
108116
// }
109117
// }
110118

111-
// attributes.attribute(mppTargetAttr, platformType.name)
112119
// attributes.attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm)
113-
114-
// https://youtrack.jetbrains.com/issue/KT-41409
115-
// binaries {
116-
// // Configures JavaExec task with name "runJvm" and Gradle distrbition for the
117-
// "main" compilation in this target
118-
// executable {
119-
// mainClass = "foo.MainKt"
120-
// }
121-
//
122-
// // Configures JavaExec task with name "runJvmAnother" and Gradle distribution
123-
// for the "main" compilation
124-
// executable(KotlinCompilation.MAIN_COMPILATION_NAME, "another") {
125-
// mainClass = "foo.MainAnotherKt" // Class to run is different from above
126-
// }
127-
//
128-
// // Configures JavaExec task with name "runJvmTest" and Gradle distribution for
129-
// the "test" compilation
130-
// executable(KotlinCompilation.TEST_COMPILATION_NAME) {
131-
// mainClass = "foo.MainTestKt"
132-
// }
133-
//
134-
// // Configures JavaExec task with name "runJvmTestAnother" and Gradle
135-
// distribution for the "test" compilation
136-
// executable(KotlinCompilation.TEST_COMPILATION_NAME, "another") {
137-
// mainClass = "foo.MainAnotherTestKt"
138-
// }
139-
// }
140120
}
141121

142122
sourceSets {

plugins/project/src/main/kotlin/common/ProjectExtns.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,9 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon(project: Project) =
418418
"kotlin.ExperimentalMultiplatform",
419419
"kotlin.js.ExperimentalJsExport",
420420
"kotlin.uuid.ExperimentalUuidApi",
421+
"kotlin.concurrent.atomics.ExperimentalAtomicApi"
421422
// "org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi",
422-
)
423+
)
423424
}
424425

425426
fun KspAATask.configureKspConfig() =

0 commit comments

Comments
 (0)