azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow customizing compilation classpath for JPMS module-info build

Browse Source
This commit is contained in:
Ilya Gorbunov
2020-04-23 00:52:14 +03:00
parent e3d20a2f5c
commit 92c4ccc65f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/commonConfiguration.gradle
+2 -1
View File
@@ -63,6 +63,7 @@ ext.configureJvm6Project = { Project project ->
ext.compileJava9Sources = { Project project, String moduleName, Collection<FileCollection> moduleOutputs = [project.sourceSets.main.output] -> ext.compileJava9Sources = { Project project, String moduleName, Collection<FileCollection> moduleOutputs = [project.sourceSets.main.output] ->
// module-info.java should be in java9 source set by convention // module-info.java should be in java9 source set by convention
SourceDirectorySet java9SourceSet = project.sourceSets.java9.java SourceDirectorySet java9SourceSet = project.sourceSets.java9.java
project.configurations.java9CompileClasspath.extendsFrom(project.configurations.compileClasspath)
project.tasks.getByName("compileJava9Java").configure { JavaCompile it -> project.tasks.getByName("compileJava9Java").configure { JavaCompile it ->
dependsOn(moduleOutputs) dependsOn(moduleOutputs)
it.sourceCompatibility = 1.9 it.sourceCompatibility = 1.9
@@ -74,7 +75,7 @@ ext.compileJava9Sources = { Project project, String moduleName, Collection<FileC
doFirst { doFirst {
def moduleFiles = files(*moduleOutputs) def moduleFiles = files(*moduleOutputs)
def modulePath = project.configurations.compileClasspath.filter { !(it in moduleFiles.files) } def modulePath = project.configurations.java9CompileClasspath.filter { !(it in moduleFiles.files) }
options.compilerArgs = [ options.compilerArgs = [
'--module-path', modulePath.asPath, '--module-path', modulePath.asPath,