From 19ac80d4495f9831fb23099ff8b98c006fb1788a Mon Sep 17 00:00:00 2001
From: Zaxar163 <zahar.vcherachny@yandex.ru>
Date: Fri, 21 Feb 2020 06:20:54 +0100
Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=92=D1=81=D1=91=20=D0=B2=20gradle-?=
 =?UTF-8?q?=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B0=D1=85=20=D0=BA=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83?=
 =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D0=B9=20compile/testCompile.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LaunchServer/build.gradle  |  8 ++++----
 Launcher/build.gradle      | 10 ++--------
 ServerWrapper/build.gradle |  2 +-
 build.gradle               |  4 ++--
 modules                    |  2 +-
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle
index 5cadc5a7..190a175c 100644
--- a/LaunchServer/build.gradle
+++ b/LaunchServer/build.gradle
@@ -8,7 +8,7 @@
         url "https://oss.sonatype.org/content/repositories/snapshots"
     }
     maven {
-        url "http://maven.geomajas.org/"
+        url "https://maven.geomajas.org/"
     }
 }
 
@@ -31,7 +31,6 @@
     dependsOn parent.childProjects.Launcher.tasks.build
     from { configurations.pack.collect { it.isDirectory() ? it : zipTree(it) } }
     from(parent.childProjects.Launcher.tasks.shadowJar.archivePath)
-    from(parent.childProjects.Launcher.tasks.genRuntimeJS.archivePath)
     manifest.attributes("Main-Class": mainClassName,
             "Premain-Class": mainAgentName,
             "Can-Redefine-Classes": "true",
@@ -125,6 +124,7 @@ task hikari(type: Copy) {
 task launch4jM(type: Copy) {
     into "$buildDir/libs/libraries/launch4j"
     from(configurations.launch4jCJ.collect { it.isDirectory() ? it : zipTree(it) })
+    duplicatesStrategy = 'INCLUDE'
     includeEmptyDirs false
     eachFile { FileCopyDetails fcp ->
         if (fcp.relativePath.pathString.startsWith("launch4j-")) {
@@ -163,8 +163,8 @@ task dumpCompileOnlyLibs(type: Copy) {
 
 task bundle(type: Zip) {
     dependsOn parent.childProjects.Launcher.tasks.build, tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.jar
-    archiveName 'LaunchServer.zip'
-    destinationDir file("$buildDir")
+    archiveFileName = 'LaunchServer.zip'
+    destinationDirectory = file("$buildDir")
     from(tasks.dumpLibs.destinationDir) { into 'libraries' }
     from(tasks.dumpCompileOnlyLibs.destinationDir) { into 'launcher-libraries-compile' }
     from tasks.jar.archivePath
diff --git a/Launcher/build.gradle b/Launcher/build.gradle
index b99e62a8..0ddb6d06 100644
--- a/Launcher/build.gradle
+++ b/Launcher/build.gradle
@@ -8,7 +8,7 @@
 
 repositories {
     maven {
-        url "http://repo.spring.io/plugins-release/"
+        url "https://repo.spring.io/plugins-release/"
     }
 }
 javafx {
@@ -59,19 +59,13 @@ pack project(':LauncherAPI')
     pack 'org.ow2.asm:asm-tree:7.1'
 }
 
-task genRuntimeJS(type: Zip) {
-    archiveName = "runtime.zip"
-    destinationDir = file("${buildDir}/tmp")
-    from "runtime/"
-}
-
 task dumpLibs(type: Copy) {
     into "$buildDir/libs/libraries"
     from configurations.bundle
 }
 
 
-assemble.dependsOn tasks.genRuntimeJS, tasks.dumpLibs, tasks.shadowJar
+assemble.dependsOn tasks.dumpLibs, tasks.shadowJar
 
 publishing {
     publications {
diff --git a/ServerWrapper/build.gradle b/ServerWrapper/build.gradle
index 9db86cf6..6c69d053 100644
--- a/ServerWrapper/build.gradle
+++ b/ServerWrapper/build.gradle
@@ -10,7 +10,7 @@
 
 repositories {
     maven {
-        url "http://repo.spring.io/plugins-release/"
+        url "https://repo.spring.io/plugins-release/"
     }
 }
 
diff --git a/build.gradle b/build.gradle
index c071da22..8c03a9e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,9 +15,9 @@
 
     repositories {
         mavenCentral()
-        maven { url 'http://oss.sonatype.org/content/groups/public' }
+        maven { url 'https://oss.sonatype.org/content/groups/public' }
         maven {
-            url "http://clojars.org/repo/"
+            url "https://clojars.org/repo/"
         }
     }
 
diff --git a/modules b/modules
index 0fbc3fb2..fa940313 160000
--- a/modules
+++ b/modules
@@ -1 +1 @@
-Subproject commit 0fbc3fb26c505800a61976cdf1310cad6ab7808d
+Subproject commit fa9403131f0d3caed104d323128b241ac05ecda3