From b7f708dcd68e2dcdc2bd355645607fa0cf657cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= Date: Thu, 14 May 2020 14:32:20 +0200 Subject: [PATCH] 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 @@ com.plotsquared - Core - unspecified + PlotSquared + 5.11.1 compile 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'