From b43f7c4ed0cadae052e057eaff88168207f7509e Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Wed, 4 Sep 2019 15:38:50 +0200 Subject: [PATCH] =?UTF-8?q?[FIX]=20ShadowJar=20=D0=BD=D0=B0=20assemble=20(?= =?UTF-8?q?=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D1=8B=20=D1=81=D0=B1=D0=BE?= =?UTF-8?q?=D1=80=D0=BA=D0=B8).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LaunchServer/build.gradle | 2 +- Launcher/build.gradle | 2 +- ServerWrapper/build.gradle | 3 +-- modules | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index 8288f840..1b0cb5e7 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -177,7 +177,7 @@ task dumpClientLibs(type: Copy) { from parent.childProjects.Launcher.tasks.dumpLibs.destinationDir } -build.dependsOn tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.dumpClientLibs, tasks.bundle, tasks.cleanjar +assemble.dependsOn tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.dumpClientLibs, tasks.bundle, tasks.cleanjar publishing { diff --git a/Launcher/build.gradle b/Launcher/build.gradle index 2cc9e3cb..4d368664 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -66,7 +66,7 @@ task dumpLibs(type: Copy) { } -build.dependsOn tasks.genRuntimeJS, tasks.dumpLibs, tasks.shadowJar +assemble.dependsOn tasks.genRuntimeJS, tasks.dumpLibs, tasks.shadowJar publishing { publications { diff --git a/ServerWrapper/build.gradle b/ServerWrapper/build.gradle index 65c459a8..72d24cec 100644 --- a/ServerWrapper/build.gradle +++ b/ServerWrapper/build.gradle @@ -95,5 +95,4 @@ pack project(':LauncherAuthlib') sign publishing.publications.serverwrapperapi } -build.dependsOn tasks.shadowJar - \ No newline at end of file +assemble.dependsOn tasks.shadowJar diff --git a/modules b/modules index 34f3eb73..150d7852 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 34f3eb73b471d1ac2fcf6661d61e7fd3af530b7f +Subproject commit 150d78526db03d0f580b17702dd67466aee0c3a5