buildscript {
dependencies {
- classpath 'org.openclover:clover:4.3.1'
+ classpath 'org.openclover:clover:4.4.1'
classpath 'org.apache.commons:commons-compress:1.18'
}
}
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
compileClasspath = files( sourceSets.test.java.outputDir )
if (use_clover) {
- compileClasspath += sourceSets.clover.compileClasspath
+ compileClasspath = sourceSets.clover.compileClasspath
} else {
compileClasspath += files(sourceSets.main.java.outputDir)
}
// 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'
}
}
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 {
task sourceDist (type: Tar) {
def VERSION_UNDERSCORES = JALVIEW_VERSION.replaceAll("\\.", "_")
- archiveFileName = project.name + "_" + VERSION_UNDERSCORES + ".tar.gz"
+ def outputFileName = project.name + "_" + VERSION_UNDERSCORES + ".tar.gz"
+ // cater for buildship < 3.1 [3.0.1 is max version in eclipse 2018-09]
+ try {
+ archiveFileName = outputFileName
+ } catch (Exception e) {
+ archiveName = outputFileName
+ }
compression Compression.GZIP
"LICENSE",
"**/README",
"RELEASE",
- "THIRDPARTYLIBS","TESTNG","**/README",
+ "THIRDPARTYLIBS","TESTNG",
"build.gradle",
"gradle.properties",
"**/*.java",
// exluding these as not using jars as modules yet
exclude ("$j11modDir/**/*.jar")
}
- from (jalviewDir) {
- // explicit includes for stuff that seemed to not get included
- include(fileTree("test/**/*"))
- exclude(EXCLUDE_FILES)
- }
+// from (jalviewDir) {
+// // explicit includes for stuff that seemed to not get included
+// include(fileTree("test/**/*."))
+// exclude(EXCLUDE_FILES)
+// exclude(PROCESS_FILES)
+// }
}
task helppages {