git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3529 assert Uniprot refs must be provided as primary ‘AC’ ref
[jalview.git]
/
build.gradle
diff --git
a/build.gradle
b/build.gradle
index
0bb89f9
..
ba884a1
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-8,7
+8,7
@@
import groovy.transform.ExternalizeMethods
buildscript {
dependencies {
buildscript {
dependencies {
- classpath 'org.openclover:clover:4.3.1'
+ classpath 'org.openclover:clover:4.4.1'
classpath 'org.apache.commons:commons-compress:1.18'
}
}
classpath 'org.apache.commons:commons-compress:1.18'
}
}
@@
-61,6
+61,9
@@
ext {
case "BUILD":
// TODO: get bamboo build artifact URL for getdown artifacts
case "BUILD":
// TODO: get bamboo build artifact URL for getdown artifacts
+ getdown_channel_base = bamboo_channelbase
+ getdown_channel_name = bamboo_planKey + '/'+JAVA_VERSION
+ getdown_app_base = bamboo_channelbase + '/'+ bamboo_planKey + bamboo_getdown_channel_suffix + '/'+JAVA_VERSION
getdown_app_dir = getdown_app_dir_alt
buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
break
getdown_app_dir = getdown_app_dir_alt
buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
break
@@
-269,7
+272,7
@@
sourceSets {
compileClasspath = files( sourceSets.test.java.outputDir )
if (use_clover) {
compileClasspath = files( sourceSets.test.java.outputDir )
if (use_clover) {
- compileClasspath += sourceSets.clover.compileClasspath
+ compileClasspath = sourceSets.clover.compileClasspath
} else {
compileClasspath += files(sourceSets.main.java.outputDir)
}
} else {
compileClasspath += files(sourceSets.main.java.outputDir)
}
@@
-284,8
+287,8
@@
sourceSets {
// clover bits
dependencies {
if (use_clover) {
// clover bits
dependencies {
if (use_clover) {
- cloverCompile 'org.openclover:clover:4.3.1'
- testCompile 'org.openclover:clover:4.3.1'
+ cloverCompile 'org.openclover:clover:4.4.1'
+ testCompile 'org.openclover:clover:4.4.1'
}
}
}
}
@@
-449,7
+452,7
@@
eclipse {
task cloverInstr() {
// only instrument source, we build test classes as normal
task cloverInstr() {
// only instrument source, we build test classes as normal
- inputs.files files (sourceSets.main.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
+ inputs.files files (sourceSets.main.allJava,sourceSets.test.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
outputs.dir cloverInstrDir
doFirst {
outputs.dir cloverInstrDir
doFirst {