JAL-3210 testing

diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
new file mode 100644 (file)
index 0000000..e889521
--- /dev/null
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1

diff --git a/.settings/org.eclipse.jdt.groovy.core.prefs b/.settings/org.eclipse.jdt.groovy.core.prefs
new file mode 100644 (file)
index 0000000..74af1ba
--- /dev/null
+++ b/.settings/org.eclipse.jdt.groovy.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+groovy.compiler.level=25

diff --git a/gradle.properties b/gradle.properties
index 407fbe3..e2a06d8 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -38,7 +38,7 @@ outputJar = jalview.jar
 testSourceDir = test
 testOutputDir = tests
 utilsDir = utils
-includeUtilsJars = false
+includeUtilsJars = true
 
 buildPropertiesFile = .build_properties
 application_codebase = *.jalview.org

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index 6f2893d..52042b8 100644 (file)
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ

diff --git a/swingjs/net.sf.j2s.core.jar b/swingjs/net.sf.j2s.core.jar
index ec67d8c..54e0f0c 100644 (file)
Binary files a/swingjs/net.sf.j2s.core.jar and b/swingjs/net.sf.j2s.core.jar differ

diff --git a/swingjs/net.sf.j2s.core.jar-3.2.4 b/swingjs/net.sf.j2s.core.jar-newer
similarity index 100%
rename from swingjs/net.sf.j2s.core.jar-3.2.4
rename to swingjs/net.sf.j2s.core.jar-newer