diff --git a/pom.xml b/pom.xml index edf73b76..44196e87 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ Xephi, sgdc3, DNx5, timvisee, games647, ljacqu, Gnat008 - 1.10.2-R0.1-SNAPSHOT + 1.11-R0.1-SNAPSHOT diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 78620307..c10954cf 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -40,9 +40,9 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.PluginLoader; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.plugin.java.JavaPluginLoader; import org.bukkit.scheduler.BukkitScheduler; import java.io.File; @@ -85,9 +85,9 @@ public class AuthMe extends JavaPlugin { */ @VisibleForTesting @SuppressWarnings("deprecation") // the super constructor is deprecated to mark it for unit testing only - protected AuthMe(final PluginLoader loader, final Server server, final PluginDescriptionFile description, + protected AuthMe(final JavaPluginLoader loader, final Server server, final PluginDescriptionFile description, final File dataFolder, final File file) { - super(loader, server, description, dataFolder, file); + super(loader, description, dataFolder, file); } /** diff --git a/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java b/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java index a41dc588..df339b35 100644 --- a/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java +++ b/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java @@ -19,8 +19,8 @@ import fr.xephi.authme.task.purge.PurgeService; import org.bukkit.Bukkit; import org.bukkit.Server; import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.PluginLoader; import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPluginLoader; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; @@ -50,7 +50,7 @@ import static org.mockito.Mockito.mock; public class AuthMeInitializationTest { @Mock - private PluginLoader pluginLoader; + private JavaPluginLoader pluginLoader; @Mock private Server server;