Merge branch 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 0a7fe70..1a2e4a1 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -52,7 +52,7 @@ plugins {
   id 'application'
   id 'eclipse'
   id "com.diffplug.gradle.spotless" version "3.28.0"
-  id 'com.github.johnrengelman.shadow' version '7.1.2'
+  id 'com.github.johnrengelman.shadow' version '6.0.0'
   id 'com.install4j.gradle' version '10.0.3'
   id 'com.dorongold.task-tree' version '2.1.1' // only needed to display task dependency tree with  gradle task1 [task2 ...] taskTree
   id 'com.palantir.git-version' version '0.13.0' apply false
@@ -1851,7 +1851,9 @@ tasks.withType(Test).matching {t -> t.getName().startsWith("testTask")}.all { te
     showExceptions true
     showCauses true
     showStackTraces true
-
+    if (test_output) {
+      showStandardStreams true
+    }
     info.events = [ TestLogEvent.FAILED ]
   }
 
@@ -3406,7 +3408,7 @@ task jalviewjsTransferUnzipSwingJs {
 
 
 task jalviewjsTransferUnzipLib {
-  def zipFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_libjs_dir}", include: "*.zip")
+  def zipFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_libjs_dir}", include: "*.zip").sort()
 
   doLast {
     zipFiles.each { file_zip -> 
@@ -3421,13 +3423,17 @@ task jalviewjsTransferUnzipLib {
   outputs.dir "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
 }
 
+jalviewjsTransferUnzipSwingJs.mustRunAfter jalviewjsTransferUnzipLib
+
 
 task jalviewjsTransferUnzipAllLibs {
-  dependsOn jalviewjsTransferUnzipSwingJs
   dependsOn jalviewjsTransferUnzipLib
+  dependsOn jalviewjsTransferUnzipSwingJs
 }
 
 
+
+
 task jalviewjsCreateJ2sSettings(type: WriteProperties) {
   group "JalviewJS"
   description "Create the alternative j2s file from the j2s.* properties"
@@ -4323,12 +4329,15 @@ task jalviewjsLaunchTest {
       execStdout = stdout
       execStderr = stderr
     }
-    def execArgs = [
+    // macOS not running properly with timeout arguments
+    def execArgs = macOS ? [] : [
+      "--timeout=${timeoutms}",
+      "--virtual-time-budget=${timeoutms}",
+    ]
+    execArgs += [
       "--no-sandbox", // --no-sandbox IS USED BY THE THORIUM APPIMAGE ON THE BUILDSERVER
       "--headless=new",
       "--disable-gpu",
-      "--timeout=${timeoutms}",
-      "--virtual-time-budget=${timeoutms}",
       "--user-data-dir=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_chromium_user_dir}",
       "--profile-directory=${jalviewjs_chromium_profile_name}",
       "--allow-file-access-from-files",