build: consistently use toolchains

GW2ToolBelt · Jul 22, 2022 · 3d64797 · 3d64797
1 parent 684da9e
commit 3d64797
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -46,6 +46,10 @@ java {
 }
 
 tasks {
+    withType<JavaCompile> {
+        javaCompiler.set(project.javaToolchains.compilerFor(project.java.toolchain))
+    }
+
     compileJava {
         /* Java 8 is the minimum supported version. */
         options.release.set(8)
@@ -203,16 +207,10 @@ tasks {
         source = nativeModuleInfoSource
         options.sourcepath = files(nativeModuleInfoSource.dir)
 
-        classpath = files()
+        classpath = files(compileJava.get().classpath, jar.get().outputs)
 
         options.release.set(9)
-
-        afterEvaluate {
-            options.compilerArgs.add("--module-path")
-            options.compilerArgs.add(compileJava.get().classpath.asPath + ";" + jar.get().outputs.files.asPath)
-            options.compilerArgs.add("--module-version")
-            options.compilerArgs.add("$version")
-        }
+        options.javaModuleVersion.set("$version")
     }
 
     create<Jar>("nativeWinJar") {