File tree Expand file tree Collapse file tree 1 file changed +9
-10
lines changed
Expand file tree Collapse file tree 1 file changed +9
-10
lines changed Original file line number Diff line number Diff line change @@ -196,8 +196,10 @@ kotlin {
196196
197197val java9 by sourceSets.creating {
198198 java.srcDir(" src/jvmMain/java9" )
199- compileClasspath = objects.fileCollection()
200- .from(configurations.named(" jvmCompileClasspath" ))
199+ }
200+
201+ configurations.named(" java9CompileClasspath" ) {
202+ extendsFrom(configurations[" jvmCompileClasspath" ])
201203}
202204
203205testing {
@@ -220,14 +222,11 @@ testing {
220222
221223tasks {
222224 val compileJava9Java by getting(JavaCompile ::class ) {
223- val compileKotlinJvm = named<KotlinCompile >(" compileKotlinJvm" )
224- .flatMap { it.destinationDirectory }.map { it.asFile.absolutePath }
225- inputs.dir(compileKotlinJvm)
226- options.compilerArgumentProviders.plusAssign(
227- CommandLineArgumentProvider {
228- listOf (" --patch-module" , " okio=${compileKotlinJvm.get()} " )
229- },
230- )
225+ dependsOn(" compileKotlinJvm" )
226+ // https://kotlinlang.org/docs/gradle-configure-project.html#configure-with-java-modules-jpms-enabled
227+ options.compilerArgumentProviders.add(CommandLineArgumentProvider {
228+ listOf (" --patch-module" , " okio=${sourceSets[" main" ].output.asPath} " )
229+ })
231230 options.release = 9
232231 }
233232
You can’t perform that action at this time.
0 commit comments