From fe4f0cfc4977ae18954248e57ccac144cb33bcc2 Mon Sep 17 00:00:00 2001 From: wizjany Date: Thu, 13 Jun 2019 08:53:49 -0400 Subject: [PATCH] Bump dependencies. Also remove intake. Unsure when that was ever used. --- worldguard-bukkit/build.gradle | 6 +++--- .../bukkit/listener/EventAbstractionListener.java | 1 - worldguard-core/build.gradle | 3 +-- .../protection/flags/registry/SimpleFlagRegistry.java | 2 -- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/worldguard-bukkit/build.gradle b/worldguard-bukkit/build.gradle index e4c48ef1..cbb4f7d4 100644 --- a/worldguard-bukkit/build.gradle +++ b/worldguard-bukkit/build.gradle @@ -11,7 +11,7 @@ dependencies { compile project(path: ':worldguard-core', configuration: 'shadow') api 'org.bukkit:bukkit:1.13-R0.1-SNAPSHOT' - api ('com.sk89q.worldedit:worldedit-bukkit:7.0.0-SNAPSHOT') { + api ('com.sk89q.worldedit:worldedit-bukkit:7.0.1-SNAPSHOT') { exclude group: 'io.papermc', module: 'paperlib' } implementation ('com.sk89q:commandbook:2.3') { @@ -20,7 +20,7 @@ compile project(path: ':worldguard-core', configuration: 'shadow') exclude group: 'org.bukkit' exclude group: 'net.sf.opencsv' } - implementation 'org.bstats:bstats-bukkit:1.4' + implementation 'org.bstats:bstats-bukkit:1.5' } processResources { @@ -44,7 +44,7 @@ compile project(path: ':worldguard-core', configuration: 'shadow') dependencies { include(dependency(':worldguard-core')) relocate ("org.bstats", "com.sk89q.worldguard.bukkit.bstats") { - include(dependency("org.bstats:bstats-bukkit:1.4")) + include(dependency("org.bstats:bstats-bukkit:1.5")) } } diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java index 92c38ebd..57531b95 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java @@ -70,7 +70,6 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.FallingBlock; import org.bukkit.entity.Item; -import org.bukkit.entity.LingeringPotion; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.entity.ThrownPotion; diff --git a/worldguard-core/build.gradle b/worldguard-core/build.gradle index 24e554e3..230a991b 100644 --- a/worldguard-core/build.gradle +++ b/worldguard-core/build.gradle @@ -2,8 +2,7 @@ apply plugin: 'idea' dependencies { - api 'com.sk89q.worldedit:worldedit-core:7.0.0-SNAPSHOT' - implementation 'com.sk89q.intake:intake:4.2-SNAPSHOT' + api 'com.sk89q.worldedit:worldedit-core:7.0.1-SNAPSHOT' implementation 'com.sk89q:squirrelid:0.2.0' implementation 'org.flywaydb:flyway-core:3.0' implementation 'org.khelekore:prtree:1.5.0' diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java index ab3df885..13dfeb6a 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java @@ -24,8 +24,6 @@ import com.google.common.collect.Maps; import com.sk89q.worldguard.protection.flags.Flag; import com.sk89q.worldguard.protection.flags.Flags; -import com.sk89q.worldguard.protection.flags.RegionGroup; -import com.sk89q.worldguard.protection.flags.RegionGroupFlag; import javax.annotation.Nullable; import java.util.Collection;