JAL-4059 Update closure-compiler.

diff --git a/build.gradle b/build.gradle
index a8e9936..b566545 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -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"

diff --git a/gradle.properties b/gradle.properties
index 5a67a1b..d9d7427 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -259,7 +259,8 @@ j2s_coretemplate_html = utils/jalviewjs/coretemplate.html
 jalviewjs_j2s_transpile_stdout = j2s-transpile.out
 #jalviewjs_j2s_stderr = j2s-transpile.err # all going into out
 jalviewjs_j2s_to_console = true
-jalviewjs_closure_compiler = tools/closure_compiler.jar
+jalviewjs_closure_compiler = tools/closure-compiler-v20230802.jar
+jalviewjs_closure_compiler_optimization_level = SIMPLE_OPTIMIZATIONS
 jalviewjs_j2s_closure_stdout = j2s-closure.out
 
 # for checking jalviewjs launches okay

diff --git a/tools/closure-compiler-v20230802.jar b/tools/closure-compiler-v20230802.jar
new file mode 100644 (file)
index 0000000..2a0cba4
Binary files /dev/null and b/tools/closure-compiler-v20230802.jar differ

diff --git a/tools/closure_compiler.jar b/tools/closure_compiler.jar
deleted file mode 100644 (file)
index 53037b0..0000000
Binary files a/tools/closure_compiler.jar and /dev/null differ