From 82ee209c55ad4c348d72db7e6cf055812d067858 Mon Sep 17 00:00:00 2001
From: zaxar163 <zahar.vcherachny@yandex.ru>
Date: Fri, 8 Mar 2019 15:57:23 +0300
Subject: [PATCH] =?UTF-8?q?[FEATURE]=20=D0=93=D0=B5=D0=BD=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20bundle,=20=D1=81=D0=BE=20=D0=B2=D1=81=D0=B5?=
 =?UTF-8?q?=D0=B9=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=BD=D1=83=D0=B6=D0=BD=D0=BE=D0=B9=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D0=BB=D0=B0=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=87=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LaunchServer/build.gradle | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle
index 3da0f287..e449f034 100644
--- a/LaunchServer/build.gradle
+++ b/LaunchServer/build.gradle
@@ -21,7 +21,7 @@
 	launch4j
 	launch4jCJ
 	bundleOnly.extendsFrom bundle
-	compile.extendsFrom bundle, hikari, pack, launch4jCJ
+	compile.extendsFrom bundle, hikari, pack, launch4jCJ, launch4j
 }
 
 jar {
@@ -60,15 +60,15 @@ pack project(':libLauncher')
 		exclude group: 'org.slf4j'
 	}
 
-	launch4j('net.sf.launch4j:launch4j:3.12') { // need user
+	launch4j('net.sf.launch4j:launch4j:3.12') {
 		exclude group: '*'
 	}
 
-	launch4jCJ('net.sf.launch4j:launch4j:3.12:workdir-win32') { // need user
+	launch4jCJ('net.sf.launch4j:launch4j:3.12:workdir-win32') {
 		exclude group: '*'
 	}
 
-	launch4jCJ('net.sf.launch4j:launch4j:3.12:workdir-linux') { // need user
+	launch4jCJ('net.sf.launch4j:launch4j:3.12:workdir-linux') {
 		exclude group: '*'
 	}	
 }
@@ -115,10 +115,13 @@ task dumpLibs(type: Copy) {
 	from configurations.bundleOnly
 }
 
-task dumpClientLibs(type: Copy) {
-	dependsOn parent.childProjects.Launcher.tasks.build
-	into "$buildDir/libs/launcher-libraries"
-	from parent.childProjects.Launcher.tasks.dumpLibs.destinationDir
+task bundle(type: Zip) {
+	dependsOn parent.childProjects.Launcher.tasks.build, tasks.dumpLibs, tasks.jar
+	archiveName 'bundle.zip'
+	destinationDir file("$buildDir")
+	from(tasks.dumpLibs.destinationDir) { into 'libraries' }
+	from tasks.jar.archivePath
+	from(parent.childProjects.Launcher.tasks.dumpLibs) { into 'launcher-libraries' }
 }
 
-build.dependsOn tasks.dumpLibs, tasks.dumpClientLibs
+build.dependsOn tasks.dumpLibs, tasks.bundle