From a330af433035d65b32eb6bfc3cf3f40dac5d2d61 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Tue, 31 Oct 2023 12:54:26 +0000 Subject: [PATCH] JAL-4059 Actually fix the order of js lib syncs to site. --- build.gradle | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 1a2e4a1..8786251 100644 --- a/build.gradle +++ b/build.gradle @@ -3423,8 +3423,6 @@ task jalviewjsTransferUnzipLib { outputs.dir "${jalviewDir}/${jalviewjsTransferSiteLibDir}" } -jalviewjsTransferUnzipSwingJs.mustRunAfter jalviewjsTransferUnzipLib - task jalviewjsTransferUnzipAllLibs { dependsOn jalviewjsTransferUnzipLib @@ -3473,7 +3471,7 @@ task jalviewjsEclipseSetup { task jalviewjsSyncAllLibs (type: Sync) { dependsOn jalviewjsTransferUnzipAllLibs - def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}") + def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}").sort() inputFiles += fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}") def outputDir = "${jalviewDir}/${jalviewjsSiteDir}" @@ -3488,7 +3486,7 @@ task jalviewjsSyncAllLibs (type: Sync) { include "**" } - // should this be exclude really ? + // should this be exclude really ? No, swingjs dir should be transferred last (and overwrite) duplicatesStrategy "INCLUDE" outputs.files outputFiles -- 1.7.10.2