diff --git a/README.md b/README.md index f312154a..4b0acd10 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ ##### Running requirements: >- Java 1.8 ->- TacoSpigot, PaperSpigot or Spigot (1.7.10, 1.8.X, 1.9.X, 1.10.X, 1.11.X)
+>- TacoSpigot, PaperSpigot or Spigot (1.7.10, 1.8.X, 1.9.X, 1.10.X, 1.11.X, 1.12.X)
(In case you use Thermos, Cauldron or similar, you have to update the SpecialSource library to support Java 8 plugins. HowTo: https://github.com/games647/FastLogin/issues/111#issuecomment-272331347) >- ProtocolLib (optional, required by some features) diff --git a/pom.xml b/pom.xml index 4075dd56..77ce9b56 100644 --- a/pom.xml +++ b/pom.xml @@ -220,7 +220,7 @@ than already loaded libs (i.e. by Mojang -> gson) --> - + spigot-shade package @@ -281,7 +281,7 @@ target/${project.finalName}-spigot.jar - + legacy-shade package @@ -290,7 +290,7 @@ - + com.google fr.xephi.authme.libs.google @@ -469,7 +469,7 @@ com.google.guava guava - 17.0 + 21.0 compile true diff --git a/src/main/java/fr/xephi/authme/data/auth/PlayerAuth.java b/src/main/java/fr/xephi/authme/data/auth/PlayerAuth.java index ec8fc47e..addfdead 100644 --- a/src/main/java/fr/xephi/authme/data/auth/PlayerAuth.java +++ b/src/main/java/fr/xephi/authme/data/auth/PlayerAuth.java @@ -3,7 +3,7 @@ package fr.xephi.authme.data.auth; import fr.xephi.authme.security.crypts.HashedPassword; import org.bukkit.Location; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java index 7e41196f..c2dd4655 100644 --- a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java +++ b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java @@ -4,7 +4,7 @@ import ch.jalu.configme.migration.PlainMigrationService; import ch.jalu.configme.properties.Property; import ch.jalu.configme.properties.StringListProperty; import ch.jalu.configme.resource.PropertyResource; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.initialization.DataFolder; import fr.xephi.authme.output.LogLevel; @@ -203,7 +203,7 @@ public class SettingsMigrationService extends PlainMigrationService { final Property newProperty = PluginSettings.LOG_LEVEL; if (!newProperty.isPresent(resource) && resource.contains(oldPath)) { ConsoleLogger.info("Moving '" + oldPath + "' to '" + newProperty.getPath() + "'"); - boolean oldValue = Objects.firstNonNull(resource.getBoolean(oldPath), false); + boolean oldValue = MoreObjects.firstNonNull(resource.getBoolean(oldPath), false); LogLevel level = oldValue ? LogLevel.INFO : LogLevel.FINE; resource.setValue(newProperty.getPath(), level.name()); return true; diff --git a/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java index 40d8ad3b..1da098e1 100644 --- a/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java @@ -1,7 +1,7 @@ package fr.xephi.authme.datasource; import ch.jalu.configme.properties.Property; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -143,7 +143,7 @@ public abstract class AbstractResourceClosingTest { // Use XFBCRYPT if nothing else specified as there is a lot of specific behavior to this hash algorithm in MySQL final HashAlgorithm[] defaultAlgorithm = new HashAlgorithm[]{HashAlgorithm.XFBCRYPT}; for (Method method : methods) { - HashAlgorithm[] algorithms = Objects.firstNonNull(CUSTOM_ALGORITHMS.get(method.getName()), defaultAlgorithm); + HashAlgorithm[] algorithms = MoreObjects.firstNonNull(CUSTOM_ALGORITHMS.get(method.getName()), defaultAlgorithm); for (HashAlgorithm algorithm : algorithms) { data.add(new Object[]{method, method.getName(), algorithm}); } diff --git a/src/test/java/tools/docs/translations/TranslationPageGenerator.java b/src/test/java/tools/docs/translations/TranslationPageGenerator.java index 5460e33d..0bb58f7b 100644 --- a/src/test/java/tools/docs/translations/TranslationPageGenerator.java +++ b/src/test/java/tools/docs/translations/TranslationPageGenerator.java @@ -12,7 +12,7 @@ import java.util.Arrays; import java.util.Map; import java.util.stream.Collectors; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; /** * Generates the translations page in docs.