JAL-4059 --timeout not needed with --virtual-time-budget

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 1a2e4a1..d05e865 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -3423,8 +3423,6 @@ task jalviewjsTransferUnzipLib {
   outputs.dir "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
 }
 
-jalviewjsTransferUnzipSwingJs.mustRunAfter jalviewjsTransferUnzipLib
-
 
 task jalviewjsTransferUnzipAllLibs {
   dependsOn jalviewjsTransferUnzipLib
@@ -3488,7 +3486,7 @@ task jalviewjsSyncAllLibs (type: Sync) {
     include "**"
   }
 
-  // should this be exclude really ?
+  // should this be exclude really ? No, swingjs dir should be transferred last (and overwrite)
   duplicatesStrategy "INCLUDE"
 
   outputs.files outputFiles
@@ -3721,7 +3719,7 @@ def jalviewjsCallCore(String name, FileCollection list, String prefixFile, Strin
     classpath = files(["${jalviewDir}/${jalviewjs_closure_compiler}"])
     main = "com.google.javascript.jscomp.CommandLineRunner"
     jvmArgs = [ "-Dfile.encoding=UTF-8" ]
-    args = [ "--compilation_level", "SIMPLE_OPTIMIZATIONS", "--warning_level", "QUIET", "--charset", "UTF-8", "--js", jsfile, "--js_output_file", zjsfile ]
+    args = [ "--compilation_level", jalviewjs_closure_compiler_optimization_level, "--warning_level", "QUIET", "--charset", "UTF-8", "--js", jsfile, "--js_output_file", zjsfile ]
     maxHeapSize = "2g"
 
     msg = "\nRunning '"+commandLine.join(' ')+"'\n"
@@ -4331,7 +4329,6 @@ task jalviewjsLaunchTest {
     }
     // macOS not running properly with timeout arguments
     def execArgs = macOS ? [] : [
-      "--timeout=${timeoutms}",
       "--virtual-time-budget=${timeoutms}",
     ]
     execArgs += [