Simplify module compilation

square · Jun 3, 2024 · ad45ec6 · ad45ec6
1 parent d9363fd
commit ad45ec6
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/okio/build.gradle.kts b/okio/build.gradle.kts
@@ -196,8 +196,10 @@ kotlin {
 
 val java9 by sourceSets.creating {
   java.srcDir("src/jvmMain/java9")
-  compileClasspath = objects.fileCollection()
-    .from(configurations.named("jvmCompileClasspath"))
+}
+
+configurations.named("java9CompileClasspath") {
+  extendsFrom(configurations["jvmCompileClasspath"])
 }
 
 testing {
@@ -220,14 +222,10 @@ testing {
 
 tasks {
   val compileJava9Java by getting(JavaCompile::class) {
-    val compileKotlinJvm = named<KotlinCompile>("compileKotlinJvm")
-      .flatMap { it.destinationDirectory }.map { it.asFile.absolutePath }
-    inputs.dir(compileKotlinJvm)
-    options.compilerArgumentProviders.plusAssign(
-      CommandLineArgumentProvider {
-        listOf("--patch-module", "okio=${compileKotlinJvm.get()}")
-      },
-    )
+    dependsOn("compileKotlinJvm")
+    options.compilerArgumentProviders.add(CommandLineArgumentProvider {
+      listOf("--patch-module", "okio=${sourceSets["main"].output.asPath}")
+    })
     options.release = 9
   }