From 56df15caf8a83e9274864bdc0683c2558cefd2e6 Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 11 Aug 2018 18:11:30 +0100 Subject: [PATCH] Add bukkit-legacy build back to the main project --- api/build.gradle | 2 - bukkit-legacy/build.gradle | 42 +++++++++++++++++++ bukkit/build.gradle | 2 +- .../luckperms/bukkit/LPBukkitBootstrap.java | 2 +- bungee/build.gradle | 2 +- common/build.gradle | 2 +- nukkit/build.gradle | 2 +- settings.gradle | 21 +--------- sponge/build.gradle | 2 +- sponge/sponge-service-api6/build.gradle | 2 +- sponge/sponge-service-api7/build.gradle | 2 +- sponge/sponge-service/build.gradle | 2 +- 12 files changed, 53 insertions(+), 30 deletions(-) create mode 100644 bukkit-legacy/build.gradle diff --git a/api/build.gradle b/api/build.gradle index 37afd97de..7c3c28a18 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -30,8 +30,6 @@ if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePass } uploadArchives { - enabled = true - repositories { mavenDeployer { beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } diff --git a/bukkit-legacy/build.gradle b/bukkit-legacy/build.gradle new file mode 100644 index 000000000..927aa305b --- /dev/null +++ b/bukkit-legacy/build.gradle @@ -0,0 +1,42 @@ +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "com.github.jengelman.gradle.plugins:shadow:2.0.4" + } +} + +apply plugin: "com.github.johnrengelman.shadow" + +repositories { + maven { + name 'spigot-repo' + url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' + } +} + +dependencies { + compile project(path: ':bukkit', configuration: 'shadow') + compile 'com.google.code.gson:gson:2.7' + compile 'com.google.guava:guava:19.0' +} + +shadowJar { + archiveName = "LuckPerms-Bukkit-Legacy-${project.ext.fullVersion}.jar" + + dependencies { + include(dependency('me.lucko.luckperms:.*')) + include(dependency('com.google.guava:guava:.*')) + include(dependency('com.google.code.gson:gson:.*')) + } + + relocate 'com.google.common', 'me.lucko.luckperms.lib.guava' + relocate 'com.google.gson', 'me.lucko.luckperms.lib.gson' +} + +artifacts { + archives shadowJar +} \ No newline at end of file diff --git a/bukkit/build.gradle b/bukkit/build.gradle index cd6d35811..eb04e1be4 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -19,7 +19,7 @@ repositories { } dependencies { - compile project(':luckperms-common') + compile project(':common') compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT' compileOnly 'me.lucko:commodore:1.0' diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java index a4fab9703..74d2af064 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java @@ -141,7 +141,7 @@ public class LPBukkitBootstrap extends JavaPlugin implements LuckPermsBootstrap getLogger().severe(""); getLogger().severe("If your server is running 1.8, please update to 1.8.8 or higher."); getLogger().severe("If your server is running 1.7.10, please download the Bukkit-Legacy version of LuckPerms from here:"); - getLogger().severe("==> https://ci.lucko.me/job/LuckPermsLegacy/"); + getLogger().severe("==> https://ci.lucko.me/job/LuckPerms/"); getLogger().severe("----------------------------------------------------------------------"); getServer().getPluginManager().disablePlugin(this); return; diff --git a/bungee/build.gradle b/bungee/build.gradle index 9063435f7..c8c1fdd56 100644 --- a/bungee/build.gradle +++ b/bungee/build.gradle @@ -12,7 +12,7 @@ buildscript { apply plugin: "com.github.johnrengelman.shadow" dependencies { - compile project(':luckperms-common') + compile project(':common') compileOnly 'net.md-5:bungeecord-api:1.12-SNAPSHOT' compileOnly 'com.imaginarycode.minecraft:RedisBungee:0.4' diff --git a/common/build.gradle b/common/build.gradle index 563b01eff..f7d970720 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':luckperms-api') + compile project(':api') compile 'com.google.code.findbugs:jsr305:3.0.2' compile('net.kyori:text:1.11-1.6.2') { diff --git a/nukkit/build.gradle b/nukkit/build.gradle index 86f0e70e7..7d6e2ddbf 100644 --- a/nukkit/build.gradle +++ b/nukkit/build.gradle @@ -19,7 +19,7 @@ repositories { } dependencies { - compile project(':luckperms-common') + compile project(':common') compileOnly 'cn.nukkit:nukkit:1.0-SNAPSHOT' } diff --git a/settings.gradle b/settings.gradle index 5225264b6..e96ffbd5c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,23 +1,6 @@ rootProject.name = 'luckperms' - -include 'api' -findProject(':api')?.name = 'luckperms-api' - -include 'common' -findProject(':common')?.name = 'luckperms-common' - -include 'bukkit' -findProject(':bukkit')?.name = 'luckperms-bukkit' - -include 'bungee' -findProject(':bungee')?.name = 'luckperms-bungee' - -include 'sponge' -findProject(':sponge')?.name = 'luckperms-sponge' -include 'sponge:sponge-service', 'sponge:sponge-service-api6', 'sponge:sponge-service-api7' - -include 'nukkit' -findProject(':nukkit')?.name = 'luckperms-nukkit' +include 'api', 'common', 'bukkit', 'bukkit-legacy', 'bungee', 'sponge', 'sponge:sponge-service', 'sponge:sponge-service-api6', 'sponge:sponge-service-api7', 'nukkit' + diff --git a/sponge/build.gradle b/sponge/build.gradle index 479b07be3..280edbbc6 100644 --- a/sponge/build.gradle +++ b/sponge/build.gradle @@ -21,7 +21,7 @@ repositories { } dependencies { - compile project(':luckperms-common') + compile project(':common') compile project(':sponge:sponge-service') compile project(':sponge:sponge-service-api6') compile project(':sponge:sponge-service-api7') diff --git a/sponge/sponge-service-api6/build.gradle b/sponge/sponge-service-api6/build.gradle index d94f2aa2d..a79168e36 100644 --- a/sponge/sponge-service-api6/build.gradle +++ b/sponge/sponge-service-api6/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':luckperms-common') + compile project(':common') compile project(':sponge:sponge-service') compileOnly('org.spongepowered:spongeapi:6.0.0') { diff --git a/sponge/sponge-service-api7/build.gradle b/sponge/sponge-service-api7/build.gradle index 78cc0103f..95e3ecb80 100644 --- a/sponge/sponge-service-api7/build.gradle +++ b/sponge/sponge-service-api7/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':luckperms-common') + compile project(':common') compile project(':sponge:sponge-service') compileOnly('org.spongepowered:spongeapi:7.0.0') { diff --git a/sponge/sponge-service/build.gradle b/sponge/sponge-service/build.gradle index 9f15ddbaa..d7520f76c 100644 --- a/sponge/sponge-service/build.gradle +++ b/sponge/sponge-service/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':luckperms-common') + compile project(':common') compileOnly('org.spongepowered:spongeapi:7.0.0') { exclude(module: 'configurate-core')