File tree 3 files changed +8
-8
lines changed
plugins/project/src/main/kotlin
3 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -49,9 +49,9 @@ kotlin-statistics = "0.4.0-RC1"
49
49
evas = " 1.2.0"
50
50
kopy = " 0.15.0+2.1.20"
51
51
poko = " 0.18.5"
52
- mappie = " 2.1.20-1.2.1 "
52
+ mappie = " 2.1.20-1.2.2 "
53
53
akkurate = " 0.11.0"
54
- kaml = " 0.75 .0"
54
+ kaml = " 0.76 .0"
55
55
snakeyaml-engine-kmp = " 3.1.1"
56
56
konsist = " 0.17.3"
57
57
decoroutinator = " 2.4.8"
Original file line number Diff line number Diff line change @@ -380,6 +380,7 @@ fun KotlinTarget.setTargetAttribute() {
380
380
fun JavaToolchainSpec.configureJvmToolchain (project : Project ) =
381
381
with (project) {
382
382
languageVersion = toolchainVersion
383
+ nativeImageCapable = pluginManager.hasPlugin(" org.graalvm.buildtools.native" )
383
384
// vendor = toolchainVendor
384
385
}
385
386
@@ -460,8 +461,8 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon(project: Project) =
460
461
fun KspAATask.configureKspConfig () =
461
462
with (project) {
462
463
kspConfig.apply {
463
- apiVersion = kotlinApiVersion.map { it.version }
464
464
jvmTarget = kotlinJvmTarget.map { it.target }
465
+ apiVersion = kotlinApiVersion.map { it.version }
465
466
languageVersion = kotlinLangVersion.map { it.version }
466
467
allWarningsAsErrors = false
467
468
}
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ import org.gradle.api.tasks.SourceSetContainer
7
7
import org.gradle.api.tasks.compile.JavaCompile
8
8
import org.gradle.jvm.toolchain.JavaLanguageVersion
9
9
import org.gradle.jvm.toolchain.JavaToolchainService
10
- import org.gradle.kotlin.dsl.get
10
+ import org.gradle.kotlin.dsl.*
11
11
import org.gradle.process.CommandLineArgumentProvider
12
12
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation
13
13
@@ -46,11 +46,10 @@ fun Project.configureJava9ModuleInfoCompilation(
46
46
targetCompatibility = " 9"
47
47
sourceCompatibility = " 9"
48
48
49
- javaCompiler.set(javaToolchains.compilerFor { languageVersion.set(toolchainVersion) })
50
-
49
+ javaCompiler = javaToolchains.compilerFor { languageVersion = toolchainVersion }
51
50
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" )
54
53
options.sourcepath = files(javaSourceSet.srcDirs)
55
54
val moduleFiles = objects.fileCollection().from(moduleOutputs)
56
55
val modulePath = javaCompileClasspath.filter { it !in moduleFiles.files }
You can’t perform that action at this time.
0 commit comments