From 74ec39d67bc4f532afda511e0eefdcd2ef203027 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Mon, 13 Aug 2018 03:38:20 +1000 Subject: [PATCH] Change output jar name --- build.gradle | 4 ++++ settings.gradle | 2 +- worldedit-bukkit/build.gradle | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 32532aa78..7bc57c2dc 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,10 @@ ext { date = git.head().date.format("yy.MM.dd") revision = "-${git.head().abbreviatedId}" index = 0; // Offset to match CI + for (; parents != null && !parents.isEmpty(); index++) { + commit = git.getResolve().toCommit(parents.get(0)); + parents = commit.getParentIds() + } buildNumber = "-${index}" } catch (Throwable ignore) { revision = "unknown"; diff --git a/settings.gradle b/settings.gradle index 8de797141..f28bdc6e1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ -rootProject.name = 'worldedit' +rootProject.name = 'FastAsyncWorldEdit' include 'worldedit-core', 'worldedit-bukkit' \ No newline at end of file diff --git a/worldedit-bukkit/build.gradle b/worldedit-bukkit/build.gradle index d1c02dbe0..060c1039e 100644 --- a/worldedit-bukkit/build.gradle +++ b/worldedit-bukkit/build.gradle @@ -54,7 +54,7 @@ shadowJar { dependencies { include(dependency(':worldedit-core')) } - archiveName = "${parent.name}-${project.name}-${parent.version}.jar" + archiveName = "${parent.name}-${project.name.replaceAll("worldedit-", "")}-${parent.version}.jar" destinationDir = file '../target' }