From 9c3c42c3e619f0aac765ef844ef5bc2f77c39401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= Date: Sat, 11 Apr 2020 02:39:02 +0200 Subject: [PATCH] Rename published maven artifacts # Conflicts: # Bukkit/build.gradle # Core/build.gradle --- Bukkit/build.gradle | 25 +++---- Bukkit/pom.xml | 120 +++++++++++++++++++++++++++++++ Core/build.gradle | 23 +++--- Core/pom.xml | 102 ++++++++++++++++++++++++++ build.gradle | 8 +-- buildSrc/build/libs/buildSrc.jar | Bin 261 -> 261 bytes 6 files changed, 251 insertions(+), 27 deletions(-) create mode 100644 Bukkit/pom.xml create mode 100644 Core/pom.xml diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 407c51f4e..89b808473 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -45,33 +45,34 @@ processResources { //noinspection GroovyAssignabilityCheck jar.archiveFileName = "PlotSquared-BukkitAPI-${project.parent.version}.jar" -jar.destinationDirectory = file("../mvn/com/plotsquared/PlotSquared-BukkitAPI/" + project.parent.version) +jar.destinationDirectory = file("../mvn/com/plotsquared/PlotSquared-Bukkit/" + project.parent.version) task createPom { doLast { pom { project { - groupId = "com.plotsquared" - artifactId = "PlotSquared-BukkitAPI" - version = project.parent.version + groupId = rootProject.group + artifactId = "PlotSquared-Bukkit" + version = rootProject.version } - }.writeTo("../mvn/com/plotsquared/PlotSquared-BukkitAPI/${project.parent.version}/PlotSquared-BukkitAPI-${project.parent.version}.pom") + }.writeTo("../mvn/com/plotsquared/PlotSquared-Bukkit/${project.parent.version}/PlotSquared-Bukkit-${project.parent.version}.pom") pom { project { - groupId = "com.plotsquared" - artifactId = "PlotSquared-BukkitAPI" + groupId = rootProject.group + artifactId = "PlotSquared-Bukkit" version = "latest" } - }.writeTo("../mvn/com/plotsquared/PlotSquared-BukkitAPI/latest/PlotSquared-BukkitAPI-latest.pom") + }.writeTo("../mvn/com/plotsquared/PlotSquared-Bukkit/latest/PlotSquared-Bukkit-latest.pom") + .writeTo("pom.xml") } } task copyFiles { doLast { copy { - from("../mvn/com/plotsquared/PlotSquared-BukkitAPI/${project.parent.version}/") - into("../mvn/com/plotsquared/PlotSquared-BukkitAPI/latest/") - include("PlotSquared-BukkitAPI*.jar") - rename("PlotSquared-BukkitAPI-${project.parent.version}.jar", "PlotSquared-BukkitAPI-latest.jar") + from("../mvn/com/plotsquared/PlotSquared-Bukkit/${project.parent.version}/") + into("../mvn/com/plotsquared/PlotSquared-Bukkit/latest/") + include("PlotSquared-Bukkit*.jar") + rename("PlotSquared-Bukkit-${project.parent.version}.jar", "PlotSquared-Bukkit-latest.jar") } } } diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml new file mode 100644 index 000000000..86898e919 --- /dev/null +++ b/Bukkit/pom.xml @@ -0,0 +1,120 @@ + + + 4.0.0 + com.plotsquared + PlotSquared-Bukkit + latest + + + com.plotsquared + Core + latest + compile + + + com.destroystokyo.paper + paper-api + 1.15.2-R0.1-SNAPSHOT + compile + + + com.sk89q.worldedit + worldedit-bukkit + 7.0.1 + compile + + + io.papermc + paperlib + 1.0.2 + compile + + + com.github.MilkBowl + VaultAPI + 1.7 + compile + + + bukkit + * + + + + + com.sk89q.worldedit + worldedit-core + 7.0.0 + runtime + + + dummypermscompat + * + + + bukkit-classloader-check + * + + + mockito-core + * + + + + + net.kyori + text-api + 3.0.2 + runtime + + + net.kyori + text-serializer-gson + 3.0.2 + runtime + + + net.kyori + text-serializer-legacy + 3.0.2 + runtime + + + net.kyori + text-serializer-plain + 3.0.2 + runtime + + + com.google.guava + guava + 21.0 + runtime + + + org.spigotmc + spigot-api + 1.15.2-R0.1-SNAPSHOT + runtime + + + net.kyori + text-adapter-bukkit + 3.0.3 + runtime + + + me.clip + placeholderapi + 2.10.4 + runtime + + + junit + junit + 4.13 + test + + + diff --git a/Core/build.gradle b/Core/build.gradle index b5062a45e..91214813b 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -34,34 +34,35 @@ processResources { } //noinspection GroovyAssignabilityCheck -jar.archiveFileName = "PlotSquared-CoreAPI-${project.parent.version}.jar" -jar.destinationDirectory = file("../mvn/com/plotsquared/PlotSquared-CoreAPI/" + project.parent.version) +jar.archiveFileName = "PlotSquared-${project.parent.version}.jar" +jar.destinationDirectory = file("../mvn/com/plotsquared/PlotSquared/" + project.parent.version) task createPom { doLast { pom { project { - groupId = "com.plotsquared" - artifactId = "PlotSquared-CoreAPI" + groupId = rootProject.group + artifactId = "PlotSquared" version = project.parent.version } - }.writeTo("../mvn/com/plotsquared/PlotSquared-CoreAPI/${project.parent.version}/PlotSquared-CoreAPI-${project.parent.version}.pom") + }.writeTo("../mvn/com/plotsquared/PlotSquared/${project.parent.version}/PlotSquared-${project.parent.version}.pom") pom { project { - groupId = "com.plotsquared" - artifactId = "PlotSquared-CoreAPI" + groupId = rootProject.group + artifactId = "PlotSquared" version = "latest" } - }.writeTo("../mvn/com/plotsquared/PlotSquared-CoreAPI/latest/PlotSquared-CoreAPI-latest.pom") + }.writeTo("../mvn/com/plotsquared/PlotSquared/latest/PlotSquared-latest.pom") + .writeTo("pom.xml") } } task copyFiles { doLast { copy { - from("../mvn/com/plotsquared/PlotSquared-CoreAPI/${project.parent.version}/") - into("../mvn/com/plotsquared/PlotSquared-CoreAPI/latest/") + from("../mvn/com/plotsquared/PlotSquared/${project.parent.version}/") + into("../mvn/com/plotsquared/PlotSquared/latest/") include("*.jar") - rename("PlotSquared-CoreAPI-${project.parent.version}.jar", "PlotSquared-CoreAPI-latest.jar") + rename("PlotSquared-${project.parent.version}.jar", "PlotSquared-latest.jar") } } } diff --git a/Core/pom.xml b/Core/pom.xml new file mode 100644 index 000000000..f4123bd96 --- /dev/null +++ b/Core/pom.xml @@ -0,0 +1,102 @@ + + + 4.0.0 + com.plotsquared + PlotSquared + latest + + + org.json + json + 20190722 + compile + + + org.projectlombok + lombok + 1.18.12 + runtime + + + com.sk89q.worldedit + worldedit-core + 7.0.0 + runtime + + + dummypermscompat + * + + + bukkit-classloader-check + * + + + mockito-core + * + + + + + net.kyori + text-api + 3.0.2 + runtime + + + net.kyori + text-serializer-gson + 3.0.2 + runtime + + + net.kyori + text-serializer-legacy + 3.0.2 + runtime + + + net.kyori + text-serializer-plain + 3.0.2 + runtime + + + com.google.guava + guava + 21.0 + runtime + + + org.yaml + snakeyaml + 1.25 + runtime + + + com.google.code.gson + gson + 2.8.6 + runtime + + + org.jetbrains.kotlin + kotlin-stdlib + 1.3.61 + runtime + + + org.jetbrains + annotations + 18.0.0 + runtime + + + junit + junit + 4.13 + test + + + diff --git a/build.gradle b/build.gradle index 4f88692d5..947ddcad5 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id "org.ajoberstar.grgit" version "4.0.1" } -group = "com.github.intellectualsites.plotsquared" +group = "com.plotsquared" def rootVersion = "5" def revision = "" @@ -63,7 +63,7 @@ subprojects { apply(plugin: "idea") apply(plugin: "com.github.johnrengelman.shadow") - group = "com.github.intellectualsites.plotsquared" + group = "com.plotsquared" clean.doFirst { delete("../target") @@ -112,8 +112,8 @@ subprojects { dependencies { include(dependency("net.kyori:text-api:3.0.2")) } - relocate("io.papermc.lib", "com.github.intellectualsites.plotsquared.bukkit.paperlib") - relocate("org.json", "com.github.intellectualsites.plotsquared.json") + relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib") + relocate("org.json", "com.plotsquared.json") // relocate('org.mcstats', 'com.plotsquared.stats') archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar" destinationDirectory = file "../target" diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar index 3c68c8ea09ad7e78db79a2e191f0775a824d438c..4c03455d981ce65464dccf54eb5b74db6383298e 100644 GIT binary patch delta 44 rcmZo=YGvXL@MdP=VqoClU`Q0}p2(}l0;B>antL;YxUD7-?p_Z7&A1Cf delta 44 tcmZo=YGvXL@MdP=VqoClU|2P~Ya*{2OA-^i|3q_dW)Qd41j60x0RZ493#