Add bukkit-legacy build back to the main project

This commit is contained in:
Luck 2018-08-11 18:11:30 +01:00
parent 03720665b3
commit 56df15caf8
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
12 changed files with 53 additions and 30 deletions

View File

@ -30,8 +30,6 @@ if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePass
} }
uploadArchives { uploadArchives {
enabled = true
repositories { repositories {
mavenDeployer { mavenDeployer {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

View File

@ -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
}

View File

@ -19,7 +19,7 @@ repositories {
} }
dependencies { dependencies {
compile project(':luckperms-common') compile project(':common')
compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT' compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT'
compileOnly 'me.lucko:commodore:1.0' compileOnly 'me.lucko:commodore:1.0'

View File

@ -141,7 +141,7 @@ public class LPBukkitBootstrap extends JavaPlugin implements LuckPermsBootstrap
getLogger().severe(""); 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.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("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("----------------------------------------------------------------------"); getLogger().severe("----------------------------------------------------------------------");
getServer().getPluginManager().disablePlugin(this); getServer().getPluginManager().disablePlugin(this);
return; return;

View File

@ -12,7 +12,7 @@ buildscript {
apply plugin: "com.github.johnrengelman.shadow" apply plugin: "com.github.johnrengelman.shadow"
dependencies { dependencies {
compile project(':luckperms-common') compile project(':common')
compileOnly 'net.md-5:bungeecord-api:1.12-SNAPSHOT' compileOnly 'net.md-5:bungeecord-api:1.12-SNAPSHOT'
compileOnly 'com.imaginarycode.minecraft:RedisBungee:0.4' compileOnly 'com.imaginarycode.minecraft:RedisBungee:0.4'

View File

@ -1,5 +1,5 @@
dependencies { dependencies {
compile project(':luckperms-api') compile project(':api')
compile 'com.google.code.findbugs:jsr305:3.0.2' compile 'com.google.code.findbugs:jsr305:3.0.2'
compile('net.kyori:text:1.11-1.6.2') { compile('net.kyori:text:1.11-1.6.2') {

View File

@ -19,7 +19,7 @@ repositories {
} }
dependencies { dependencies {
compile project(':luckperms-common') compile project(':common')
compileOnly 'cn.nukkit:nukkit:1.0-SNAPSHOT' compileOnly 'cn.nukkit:nukkit:1.0-SNAPSHOT'
} }

View File

@ -1,23 +1,6 @@
rootProject.name = 'luckperms' rootProject.name = 'luckperms'
include 'api', 'common', 'bukkit', 'bukkit-legacy', 'bungee', 'sponge', 'sponge:sponge-service', 'sponge:sponge-service-api6', 'sponge:sponge-service-api7', 'nukkit'
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'

View File

@ -21,7 +21,7 @@ repositories {
} }
dependencies { dependencies {
compile project(':luckperms-common') compile project(':common')
compile project(':sponge:sponge-service') compile project(':sponge:sponge-service')
compile project(':sponge:sponge-service-api6') compile project(':sponge:sponge-service-api6')
compile project(':sponge:sponge-service-api7') compile project(':sponge:sponge-service-api7')

View File

@ -1,5 +1,5 @@
dependencies { dependencies {
compile project(':luckperms-common') compile project(':common')
compile project(':sponge:sponge-service') compile project(':sponge:sponge-service')
compileOnly('org.spongepowered:spongeapi:6.0.0') { compileOnly('org.spongepowered:spongeapi:6.0.0') {

View File

@ -1,5 +1,5 @@
dependencies { dependencies {
compile project(':luckperms-common') compile project(':common')
compile project(':sponge:sponge-service') compile project(':sponge:sponge-service')
compileOnly('org.spongepowered:spongeapi:7.0.0') { compileOnly('org.spongepowered:spongeapi:7.0.0') {

View File

@ -1,5 +1,5 @@
dependencies { dependencies {
compile project(':luckperms-common') compile project(':common')
compileOnly('org.spongepowered:spongeapi:7.0.0') { compileOnly('org.spongepowered:spongeapi:7.0.0') {
exclude(module: 'configurate-core') exclude(module: 'configurate-core')