git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fe1a2bf
)
JAL-3130 provide absolute module path as J11 compile argument, and drop unneeded...
author
Jim Procter
<jprocter@issues.jalview.org>
Mon, 22 Apr 2019 12:25:44 +0000
(13:25 +0100)
committer
Jim Procter
<jprocter@issues.jalview.org>
Mon, 22 Apr 2019 12:25:44 +0000
(13:25 +0100)
build.gradle
patch
|
blob
|
history
diff --git
a/build.gradle
b/build.gradle
index
b4a5077
..
38d35f4
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-35,6
+35,8
@@
if (clover.equals("true")) {
classes = "$jalviewDir/$classesDir"
}
classes = "$jalviewDir/$classesDir"
}
+// configure classpath/args for j8/j11 compilation
+
def libDir
def libDistDir
def compile_source_compatibility
def libDir
def libDistDir
def compile_source_compatibility
@@
-54,7
+56,7
@@
if (JAVA_VERSION.equals("1.8")) {
compile_target_compatibility = 11
getdown_alt_java_min_version = getdown_alt_java11_min_version
additional_compiler_args += [
compile_target_compatibility = 11
getdown_alt_java_min_version = getdown_alt_java11_min_version
additional_compiler_args += [
- '--module-path', sourceSets.modules.compileClasspath.asPath,
+ '--module-path', file("$jalviewDir/$j11modDir").getAbsolutePath(),
'--add-modules', j11modules
]
} else {
'--add-modules', j11modules
]
} else {
@@
-81,12
+83,6
@@
sourceSets {
runtimeClasspath = compileClasspath
}
runtimeClasspath = compileClasspath
}
-
- modules {
- compileClasspath = fileTree(dir: "$jalviewDir/$j11modDir", include: ["*.jar"])
-
- runtimeClasspath = compileClasspath
- }
clover {
java {
clover {
java {