From db830a0befc4425e1cfddf563be836e036f49f35 Mon Sep 17 00:00:00 2001 From: Luck Date: Mon, 7 Jan 2019 21:25:11 +0000 Subject: [PATCH] Buildscript changes --- build.gradle | 10 ++-------- bukkit-legacy/build.gradle | 7 ------- bukkit/build.gradle | 5 +---- .../luckperms/bukkit/compat/LuckPermsBrigadier.java | 3 +-- nukkit/build.gradle | 5 +---- sponge/build.gradle | 5 +---- sponge/sponge-service-api6/build.gradle | 11 ++++------- sponge/sponge-service-api7/build.gradle | 11 ++++------- sponge/sponge-service/build.gradle | 10 ++++------ velocity/build.gradle | 5 +---- 10 files changed, 19 insertions(+), 53 deletions(-) diff --git a/build.gradle b/build.gradle index 2bb8708f..1cfcaa99 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,6 @@ buildscript { repositories { - maven { - url 'https://plugins.gradle.org/m2' - } + maven { url 'https://plugins.gradle.org/m2' } } dependencies { @@ -60,10 +58,6 @@ subprojects { repositories { //mavenLocal() mavenCentral() - - maven { - name 'luck-repo' - url 'https://repo.lucko.me/' - } + maven { url 'https://repo.lucko.me/' } } } diff --git a/bukkit-legacy/build.gradle b/bukkit-legacy/build.gradle index 6504bad9..fa36386b 100644 --- a/bukkit-legacy/build.gradle +++ b/bukkit-legacy/build.gradle @@ -2,13 +2,6 @@ plugins { id 'com.github.johnrengelman.shadow' version '2.0.4' } -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' diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 5c72f4f9..65150156 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -3,10 +3,7 @@ plugins { } repositories { - maven { - name 'spigot-repo' - url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' - } + maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' } } dependencies { diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/compat/LuckPermsBrigadier.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/compat/LuckPermsBrigadier.java index 1587aea7..9fb253a7 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/compat/LuckPermsBrigadier.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/compat/LuckPermsBrigadier.java @@ -91,8 +91,7 @@ public class LuckPermsBrigadier { public void onCommandSend(PlayerCommandSendEvent e) { Sender playerAsSender = this.plugin.getSenderFactory().wrap(e.getPlayer()); if (!this.plugin.getCommandManager().hasPermissionForAny(playerAsSender)) { - e.getCommands().remove(this.pluginCommand.getLabel()); - e.getCommands().removeAll(this.pluginCommand.getAliases()); + e.getCommands().removeAll(Commodore.getAliases(this.pluginCommand)); } } } diff --git a/nukkit/build.gradle b/nukkit/build.gradle index 5ff8f884..2083a82d 100644 --- a/nukkit/build.gradle +++ b/nukkit/build.gradle @@ -3,10 +3,7 @@ plugins { } repositories { - maven { - name 'nukkit-repo' - url 'https://repo.potestas.xyz/main/' - } + maven { url 'https://repo.potestas.xyz/main/' } } dependencies { diff --git a/sponge/build.gradle b/sponge/build.gradle index 5b775e7e..30c87528 100644 --- a/sponge/build.gradle +++ b/sponge/build.gradle @@ -4,10 +4,7 @@ plugins { } repositories { - maven { - name 'sponge-repo' - url 'https://repo.spongepowered.org/maven' - } + maven { url 'https://repo.spongepowered.org/maven' } } dependencies { diff --git a/sponge/sponge-service-api6/build.gradle b/sponge/sponge-service-api6/build.gradle index a79168e3..e714b63a 100644 --- a/sponge/sponge-service-api6/build.gradle +++ b/sponge/sponge-service-api6/build.gradle @@ -1,3 +1,7 @@ +repositories { + maven { url 'https://repo.spongepowered.org/maven' } +} + dependencies { compile project(':common') compile project(':sponge:sponge-service') @@ -9,10 +13,3 @@ dependencies { exclude(module: 'configurate-yaml') } } - -repositories { - maven { - name 'sponge-repo' - url 'https://repo.spongepowered.org/maven' - } -} diff --git a/sponge/sponge-service-api7/build.gradle b/sponge/sponge-service-api7/build.gradle index 95e3ecb8..5c878ace 100644 --- a/sponge/sponge-service-api7/build.gradle +++ b/sponge/sponge-service-api7/build.gradle @@ -1,3 +1,7 @@ +repositories { + maven { url 'https://repo.spongepowered.org/maven' } +} + dependencies { compile project(':common') compile project(':sponge:sponge-service') @@ -9,10 +13,3 @@ dependencies { exclude(module: 'configurate-yaml') } } - -repositories { - maven { - name 'sponge-repo' - url 'https://repo.spongepowered.org/maven' - } -} diff --git a/sponge/sponge-service/build.gradle b/sponge/sponge-service/build.gradle index d7520f76..cebd90a9 100644 --- a/sponge/sponge-service/build.gradle +++ b/sponge/sponge-service/build.gradle @@ -1,3 +1,7 @@ +repositories { + maven { url 'https://repo.spongepowered.org/maven' } +} + dependencies { compile project(':common') @@ -10,9 +14,3 @@ dependencies { compileOnly 'com.google.guava:guava:21.0' } -repositories { - maven { - name 'sponge-repo' - url 'https://repo.spongepowered.org/maven' - } -} diff --git a/velocity/build.gradle b/velocity/build.gradle index 52db61b8..27d83bdf 100644 --- a/velocity/build.gradle +++ b/velocity/build.gradle @@ -4,10 +4,7 @@ plugins { } repositories { - maven { - name 'velocity-repo' - url 'https://repo.velocitypowered.com/snapshots/' - } + maven { url 'https://repo.velocitypowered.com/snapshots/' } } dependencies {