git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80d58b8
)
JAL-4059 Updated SwingJS and JSmol (March 2024). Fix gradle to spot new SwingJS zip.
author
Ben Soares
<b.soares@dundee.ac.uk>
Fri, 15 Mar 2024 17:04:36 +0000
(17:04 +0000)
committer
Ben Soares
<b.soares@dundee.ac.uk>
Fri, 15 Mar 2024 17:04:36 +0000
(17:04 +0000)
build.gradle
patch
|
blob
|
history
swingjs/SwingJS-site.zip
patch
|
blob
|
history
swingjs/j2s.core.jar
patch
|
blob
|
history
swingjs/timestamp
patch
|
blob
|
history
swingjs/ver/5.0.1/SwingJS-site.zip
patch
|
blob
|
history
swingjs/ver/5.0.1/timestamp
patch
|
blob
|
history
utils/jalviewjs/libjs/Jmol-SwingJS.zip
patch
|
blob
|
history
diff --git
a/build.gradle
b/build.gradle
index
89df34d
..
ebde80e
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-3440,8
+3440,11
@@
jalviewjsEclipseCopyDropins.finalizedBy jalviewjsCleanEclipse
task jalviewjsTransferUnzipSwingJs(type: Copy) {
+ def swingJsZipFile = "${jalviewDir}/${jalviewjs_swingjs_zip}"
from zipTree( "${jalviewDir}/${jalviewjs_swingjs_zip}" )
into "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}"
+
+ inputs.file swingJsZipFile
}
diff --git
a/swingjs/SwingJS-site.zip
b/swingjs/SwingJS-site.zip
index
08b1c33
..
871b9d2
100644
(file)
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git
a/swingjs/j2s.core.jar
b/swingjs/j2s.core.jar
index
e7c60f2
..
e6f92de
100644
(file)
Binary files a/swingjs/j2s.core.jar and b/swingjs/j2s.core.jar differ
diff --git
a/swingjs/timestamp
b/swingjs/timestamp
index
cdc488e
..
af91237
100644
(file)
--- a/
swingjs/timestamp
+++ b/
swingjs/timestamp
@@
-1
+1
@@
-20231210191429
+20240301123437
diff --git
a/swingjs/ver/5.0.1/SwingJS-site.zip
b/swingjs/ver/5.0.1/SwingJS-site.zip
index
20e95d9
..
871b9d2
100644
(file)
Binary files a/swingjs/ver/5.0.1/SwingJS-site.zip and b/swingjs/ver/5.0.1/SwingJS-site.zip differ
diff --git
a/swingjs/ver/5.0.1/timestamp
b/swingjs/ver/5.0.1/timestamp
index
cdc488e
..
af91237
100644
(file)
--- a/
swingjs/ver/5.0.1/timestamp
+++ b/
swingjs/ver/5.0.1/timestamp
@@
-1
+1
@@
-20231210191429
+20240301123437
diff --git
a/utils/jalviewjs/libjs/Jmol-SwingJS.zip
b/utils/jalviewjs/libjs/Jmol-SwingJS.zip
index
5aa9443
..
d36be75
100644
(file)
Binary files a/utils/jalviewjs/libjs/Jmol-SwingJS.zip and b/utils/jalviewjs/libjs/Jmol-SwingJS.zip differ