From b7f708dcd68e2dcdc2bd355645607fa0cf657cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= <sauilitired@gmail.com>
Date: Thu, 14 May 2020 14:32:20 +0200
Subject: [PATCH 1/3] Fix gradle config

---
 Bukkit/build.gradle | 4 ++--
 Bukkit/pom.xml      | 4 ++--
 build.gradle        | 2 ++
 settings.gradle     | 3 +++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index 6ef2cb0d1..56816ee76 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -16,9 +16,9 @@ repositories {
 
 
 dependencies {
-    implementation(project(":Core"))
+    implementation(project(":PlotSquared"))
     compile("org.bstats:bstats-bukkit:1.7")
-    compile(project(":Core"))
+    compile(project(":PlotSquared"))
     compile("com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT")
     //implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT'
     implementation("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
index 6ff4a11e6..6066c1105 100644
--- a/Bukkit/pom.xml
+++ b/Bukkit/pom.xml
@@ -20,8 +20,8 @@
     </dependency>
     <dependency>
       <groupId>com.plotsquared</groupId>
-      <artifactId>Core</artifactId>
-      <version>unspecified</version>
+      <artifactId>PlotSquared</artifactId>
+      <version>5.11.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/build.gradle b/build.gradle
index 3723a1e1f..7259ba47b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -129,6 +129,8 @@ subprojects {
         archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar"
         destinationDirectory = file "../target"
     }
+
+    version = rootProject.version
 }
 
 task aggregatedJavadocs(type: Javadoc, description: "Generate javadocs from all child projects as if it was a single project", group: "Documentation") {
diff --git a/settings.gradle b/settings.gradle
index 0a72ce373..b65f2b227 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,6 @@
 rootProject.name = 'PlotSquared'
 
 include 'Core', 'Bukkit' // , 'Nukkit', 'Sponge'
+
+project(':Core').name = 'PlotSquared'
+project(':Bukkit').name = 'PlotSquared-Bukkit'

From 2f02f4392a56cc5ef0346940159f7393f1aecca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= <sauilitired@gmail.com>
Date: Thu, 14 May 2020 14:51:23 +0200
Subject: [PATCH 2/3] Fix names of shaded jars

---
 Bukkit/build.gradle | 2 +-
 build.gradle        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index 56816ee76..f3f67ee8e 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -89,7 +89,7 @@ shadowJar {
     relocate('net.kyori.text', 'com.plotsquared.formatting.text')
     relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
     relocate("org.bstats", "com.plotsquared.metrics")
-    archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar"
+    archiveFileName = "${project.name}-${parent.version}.jar"
     destinationDirectory = file "../target"
 }
 
diff --git a/build.gradle b/build.gradle
index 7259ba47b..1c2f4d0a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,7 +126,7 @@ subprojects {
             exclude "org/json/simple/**"
         }
         // relocate('org.mcstats', 'com.plotsquared.stats')
-        archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar"
+        archiveFileName = "${project.name}-${parent.version}.jar"
         destinationDirectory = file "../target"
     }
 

From f4729310fa9105821b4652dacd9e3485d4a1120a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= <sauilitired@gmail.com>
Date: Thu, 14 May 2020 14:52:43 +0200
Subject: [PATCH 3/3] Include the core dependency in the Bukkit module

---
 Bukkit/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index f3f67ee8e..e081d0699 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -81,7 +81,7 @@ task copyFiles {
 
 shadowJar {
     dependencies {
-        include(dependency(":Core"))
+        include(dependency(":PlotSquared"))
         include(dependency("io.papermc:paperlib:1.0.2"))
         include(dependency("net.kyori:text-adapter-bukkit:3.0.3"))
         include(dependency("org.bstats:bstats-bukkit:1.7"))