diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6a5085ec5..09bfa7632 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -28,6 +28,6 @@ dependencies { implementation(gradleApi()) implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0") implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0") - implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.1.14") + implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.2.0") implementation("io.github.gradle-nexus:publish-plugin:1.1.0") } diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt index c658cf173..2e7572e4f 100644 --- a/buildSrc/src/main/kotlin/CommonConfig.kt +++ b/buildSrc/src/main/kotlin/CommonConfig.kt @@ -54,15 +54,15 @@ fun Project.applyCommonConfiguration() { continue } add(conf.name, "com.google.guava:guava") { - version { require("21.0") } + version { require("31.0.1-jre") } because("Mojang provides Guava") } add(conf.name, "com.google.code.gson:gson") { - version { require("2.8.0") } + version { require("2.8.8") } because("Mojang provides Gson") } add(conf.name, "it.unimi.dsi:fastutil") { - version { require("8.2.1") } + version { require("8.5.6") } because("Mojang provides FastUtil") } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8b6f03ee5..4f7ac600b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] # Minecraft expectations -fastutil = "8.2.1" +fastutil = "8.5.6" log4j = "2.14.1" -guava = "21.0" -gson = "2.8.0" +guava = "31.0.1-jre" +gson = "2.8.8" # Platform expectations paper = "1.17.1-R0.1-SNAPSHOT" @@ -39,7 +39,6 @@ rhino-runtime = "1.7.13" zstd-jni = "1.4.8-1" # Not latest as it can be difficult to obtain latest ZSTD libs antlr4 = "4.9.3" json-simple = "1.1.1" -paranamer = "2.8" jlibnoise = "1.0.0" jchronic = "0.2.4a" lz4-java = "1.8.0" @@ -104,7 +103,6 @@ zstd = { group = "com.github.luben", name = "zstd-jni", version.ref = "zstd-jni" antlr4 = { group = "org.antlr", name = "antlr4", version.ref = "antlr4" } antlr4Runtime = { group = "org.antlr", name = "antlr4-runtime", version.ref = "antlr4" } jsonSimple = { group = "com.googlecode.json-simple", name = "json-simple", version.ref = "json-simple" } -paranamer = { group = "com.thoughtworks.paranamer", name = "paranamer", version.ref = "paranamer" } jlibnoise = { group = "com.sk89q.lib", name = "jlibnoise", version.ref = "jlibnoise" } jchronic = { group = "com.sk89q", name = "jchronic", version.ref = "jchronic" } lz4Java = { group = "org.lz4", name = "lz4-java", version.ref = "lz4-java" } diff --git a/renovate.json b/renovate.json index b6e9da95a..7da708f2e 100644 --- a/renovate.json +++ b/renovate.json @@ -10,7 +10,6 @@ "mockito-core", "org.antlr", "antlr4-runtime", - "paranamer", "fastutil", "it.unimi.dsi:fastutil", "auto-value-annotations", diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 447c05dad..c8ba089d2 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -44,7 +44,7 @@ repositories { configurations.all { resolutionStrategy { - force("com.google.guava:guava:21.0") + force("com.google.guava:guava:31.0.1-jre") } } diff --git a/worldedit-libs/core/build.gradle.kts b/worldedit-libs/core/build.gradle.kts index 73022bc99..c5eb10887 100644 --- a/worldedit-libs/core/build.gradle.kts +++ b/worldedit-libs/core/build.gradle.kts @@ -8,7 +8,6 @@ dependencies { "shade"(libs.jchronic) { exclude(group = "junit", module = "junit") } - "shade"(libs.paranamer) "shade"(libs.jlibnoise) "shade"(libs.piston) "shade"(libs.pistonRuntime)