Skip to content

Commit 1b594a2

Browse files
committed
chore: native image toolchain support
1 parent d3f0320 commit 1b594a2

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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"

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

Lines changed: 2 additions & 1 deletion
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 = pluginManager.hasPlugin("org.graalvm.buildtools.native")
383384
// vendor = toolchainVendor
384385
}
385386

@@ -460,8 +461,8 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon(project: Project) =
460461
fun KspAATask.configureKspConfig() =
461462
with(project) {
462463
kspConfig.apply {
463-
apiVersion = kotlinApiVersion.map { it.version }
464464
jvmTarget = kotlinJvmTarget.map { it.target }
465+
apiVersion = kotlinApiVersion.map { it.version }
465466
languageVersion = kotlinLangVersion.map { it.version }
466467
allWarningsAsErrors = false
467468
}

plugins/project/src/main/kotlin/tasks/MultiReleaseJar.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ 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

@@ -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 }

0 commit comments

Comments
 (0)