From 4caaead7ee058e63edf07d66ea581d3620dcb08f Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Mon, 6 Sep 2021 13:47:40 +0200 Subject: [PATCH] Renovate Closes #3217 Closes #3226 Closes #3227 Closes #3229 Closes #3230 --- Bukkit/build.gradle.kts | 4 ++-- .../bukkit/uuid/SquirrelIdUUIDService.java | 8 ++++---- gradle/libs.versions.toml | 16 ++++++++-------- renovate.json | 7 ++++++- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index d1b5e6871..38da249cf 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -71,7 +71,7 @@ tasks.named("shadowJar") { relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination") relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib") relocate("org.bstats", "com.plotsquared.metrics") - relocate("com.sk89q.squirrelid", "com.plotsquared.squirrelid") + relocate("org.enginehub", "com.plotsquared.squirrelid") relocate("org.khelekore.prtree", "com.plotsquared.prtree") relocate("com.google.inject", "com.plotsquared.google") relocate("org.aopalliance", "com.plotsquared.core.aopalliance") @@ -93,7 +93,7 @@ tasks { opt.links("https://papermc.io/javadocs/paper/1.17/") opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.6/") opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.6/") - opt.links("https://jd.adventure.kyori.net/api/4.8.1/") + opt.links("https://jd.adventure.kyori.net/api/4.9.0/") opt.links("https://google.github.io/guice/api-docs/5.0.1/javadoc/") opt.links("https://checkerframework.org/api/") } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java index af5b43a63..40e20cb9e 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java @@ -29,12 +29,12 @@ import com.google.common.util.concurrent.RateLimiter; import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.uuid.UUIDMapping; import com.plotsquared.core.uuid.UUIDService; -import com.sk89q.squirrelid.Profile; -import com.sk89q.squirrelid.resolver.HttpRepositoryService; -import com.sk89q.squirrelid.resolver.ProfileService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.checkerframework.checker.nullness.qual.NonNull; +import org.enginehub.squirrelid.Profile; +import org.enginehub.squirrelid.resolver.HttpRepositoryService; +import org.enginehub.squirrelid.resolver.ProfileService; import java.io.IOException; import java.util.ArrayList; @@ -73,7 +73,7 @@ public class SquirrelIdUUIDService implements UUIDService { this.rateLimiter.acquire(uuids.size()); try { try { - for (final Profile profile : this.profileService.findAllById(uuids)) { + for (final Profile profile : this.profileService.findAllByUuid(uuids)) { results.add(new UUIDMapping(profile.getUniqueId(), profile.getName())); } } catch (final IllegalArgumentException illegalArgumentException) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d405cdea4..85dacc432 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,20 +6,20 @@ log4j-api = "2.14.1" # Version set by Minecraft # Platform expectations paper = "1.17.1-R0.1-SNAPSHOT" -checker-qual = "3.16.0" +checker-qual = "3.18.0" guice = "5.0.1" findbugs = "3.0.1" snakeyaml = "1.28" # Version set by Bukkit # Adventure & MiniMessage -adventure-api = "4.8.1" +adventure-api = "4.9.0" adventure-text-minimessage = "4.1.0-SNAPSHOT" adventure-platform-bukkit = "4.0.0-SNAPSHOT" # Plugins worldedit = "7.2.6" fawe = "1.17-201" -vault = "1.7" +vault = "1.7.1" placeholderapi = "2.10.10" luckperms = "5.3" essentialsx = "2.18.2" @@ -27,14 +27,14 @@ hyperverse = "0.6.0-SNAPSHOT" mvdwapi = "3.1.1" # Third party -prtree = "1.7.0-SNAPSHOT" +prtree = "1.5.0" aopalliance = "1.0" pipeline = "1.4.0-SNAPSHOT" -arkitektonika = "2.0-SNAPSHOT" -paster = "1.0.2-SNAPSHOT" +arkitektonika = "2.1.0" +paster = "1.1.1" bstats = "2.2.1" paperlib = "1.0.6" -squirrelid = "1.0.0-SNAPSHOT" +squirrelid = "0.3.0" serverlib = "2.2.1" http4j = "1.1-SNAPSHOT" @@ -80,7 +80,7 @@ prtree = { group = "org.khelekore", name = "prtree", version.ref = "prtree" } aopalliance = { group = "aopalliance", name = "aopalliance", version.ref = "aopalliance" } pipeline = { group = "com.intellectualsites", name = "Pipeline", version.ref = "pipeline" } mvdwapi = { group = "be.maximvdw", name = "MVdWPlaceholderAPI", version.ref = "mvdwapi" } -squirrelid = { group = "com.sk89q", name = "squirrelid", version.ref = "squirrelid" } +squirrelid = { group = "org.enginehub", name = "squirrelid", version.ref = "squirrelid" } serverlib = { group = "org.incendo.serverlib", name = "ServerLib", version.ref = "serverlib" } bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" } paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" } diff --git a/renovate.json b/renovate.json index f45d8f110..b89092f6d 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,10 @@ { "extends": [ - "config:base" + "config:base", + ":disableDependencyDashboard" + ], + "ignoreDeps": [ + "guava", + "gson" ] }