Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions build-logic/src/main/kotlin/JavaModules.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@

import me.champeau.mrjar.MultiReleaseExtension
import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.jvm.toolchain.JavaToolchainService
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.named
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile

Expand Down Expand Up @@ -55,5 +58,9 @@ fun Project.applyJavaModules(

classpath = compileKotlinTask.libraries
modularity.inferModulePath.set(true)

val javaToolchains = project.extensions.getByType<JavaToolchainService>()
val javaPluginExtension = project.extensions.getByType<JavaPluginExtension>()
javaCompiler.set(javaToolchains.compilerFor(javaPluginExtension.toolchain))
}
}
Loading