Merge branch 'improvement/JAL-4111_suffixed_DEVELOP_channels' into development/Releas...

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 70c5e86..1142388 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -441,7 +441,6 @@ ext {
   modules_compileClasspath = fileTree(dir: "${jalviewDir}/${j11modDir}", include: ["*.jar"])
   modules_runtimeClasspath = modules_compileClasspath
   */
-
   gitHash = "SOURCE"
   gitBranch = "Source"
   try {
@@ -1446,8 +1445,6 @@ def getMdSections(String content) {
   }
   return sections
 }
-
-
 task copyHelp(type: Copy) {
   def inputDir = helpSourceDir
   def outputDir = "${helpBuildDir}/${help_dir}"
@@ -1618,8 +1615,6 @@ task releasesTemplates {
   outputs.file(releasesHtmlFile)
   outputs.file(whatsnewHtmlFile)
 }
-
-
 task copyResources(type: Copy) {
   group = "build"
   description = "Copy (and make text substitutions in) the resources dir to the build area"
@@ -1756,6 +1751,8 @@ test {
     excludeGroups testng_excluded_groups
     preserveOrder true
     useDefaultListeners=true
+    // Uncomment to show stdout and stderr for tests in gradle build output
+    // testLogging.showStandardStreams = true
   }
 
   maxHeapSize = "1024m"
@@ -2359,7 +2356,6 @@ task getdownArchive() {
   dependsOn getdownArchiveBuild
   dependsOn getdownArchiveDigest
 }
-
 tasks.withType(JavaCompile) {
        options.encoding = 'UTF-8'
 }
@@ -2414,7 +2410,6 @@ task copyInstall4jTemplate {
       macosArchive.attributes().remove('executeSetupApp')
       macosArchive.attributes().remove('setupAppId')
     }
-
     // turn off checksum creation for LOCAL channel
     def e = install4jConfigXml.application[0]
     e.'@createChecksums' = string(install4jCheckSums)
@@ -2718,7 +2713,6 @@ task installers {
   dependsOn installerFiles
 }
 
-
 spotless {
   java {
     eclipse().configFile(eclipse_codestyle_file)
@@ -2893,7 +2887,6 @@ task dataInstallersJson {
 task helppages {
   group "help"
   description "Copies all help pages to build dir. Runs ant task 'pubhtmlhelp'."
-
   dependsOn copyHelp
   dependsOn pubhtmlhelp