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

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 8786251..d05e865 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -3471,7 +3471,7 @@ task jalviewjsEclipseSetup {
 
 task jalviewjsSyncAllLibs (type: Sync) {
   dependsOn jalviewjsTransferUnzipAllLibs
-  def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}").sort()
+  def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}")
   inputFiles += fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}")
   def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
 
@@ -3719,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"
@@ -4329,7 +4329,6 @@ task jalviewjsLaunchTest {
     }
     // macOS not running properly with timeout arguments
     def execArgs = macOS ? [] : [
-      "--timeout=${timeoutms}",
       "--virtual-time-budget=${timeoutms}",
     ]
     execArgs += [