From c9ea38eb8cb6b965635beb797d5e99c9c26cde76 Mon Sep 17 00:00:00 2001
From: Ben Soares <b.soares@dundee.ac.uk>
Date: Tue, 31 Oct 2023 09:25:26 +0000
Subject: [PATCH] JAL-4059 ensure order of transferring JS lib zip files to
 site is consistent

---
 build.gradle |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 78e2466..ff9999c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3408,7 +3408,7 @@ task jalviewjsTransferUnzipSwingJs {
 
 
 task jalviewjsTransferUnzipLib {
-  def zipFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_libjs_dir}", include: "*.zip")
+  def zipFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_libjs_dir}", include: "*.zip").sort()
 
   doLast {
     zipFiles.each { file_zip -> 
@@ -3423,13 +3423,17 @@ task jalviewjsTransferUnzipLib {
   outputs.dir "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
 }
 
+jalviewjsTransferUnzipSwingJs.mustRunAfter jalviewjsTransferUnzipLib
+
 
 task jalviewjsTransferUnzipAllLibs {
-  dependsOn jalviewjsTransferUnzipSwingJs
   dependsOn jalviewjsTransferUnzipLib
+  dependsOn jalviewjsTransferUnzipSwingJs
 }
 
 
+
+
 task jalviewjsCreateJ2sSettings(type: WriteProperties) {
   group "JalviewJS"
   description "Create the alternative j2s file from the j2s.* properties"
-- 
1.7.10.2