build: Update core dependencies

- Drop paranamer, you can access parameter names at runtime with Java 8+ natively
This commit is contained in:
NotMyFault 2021-11-22 13:47:59 +01:00
parent 507b8d5e35
commit 705f580290
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
6 changed files with 8 additions and 12 deletions

View File

@ -28,6 +28,6 @@ dependencies {
implementation(gradleApi()) implementation(gradleApi())
implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0") implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.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") implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
} }

View File

@ -54,15 +54,15 @@ fun Project.applyCommonConfiguration() {
continue continue
} }
add(conf.name, "com.google.guava:guava") { add(conf.name, "com.google.guava:guava") {
version { require("21.0") } version { require("31.0.1-jre") }
because("Mojang provides Guava") because("Mojang provides Guava")
} }
add(conf.name, "com.google.code.gson:gson") { add(conf.name, "com.google.code.gson:gson") {
version { require("2.8.0") } version { require("2.8.8") }
because("Mojang provides Gson") because("Mojang provides Gson")
} }
add(conf.name, "it.unimi.dsi:fastutil") { add(conf.name, "it.unimi.dsi:fastutil") {
version { require("8.2.1") } version { require("8.5.6") }
because("Mojang provides FastUtil") because("Mojang provides FastUtil")
} }
} }

View File

@ -1,9 +1,9 @@
[versions] [versions]
# Minecraft expectations # Minecraft expectations
fastutil = "8.2.1" fastutil = "8.5.6"
log4j = "2.14.1" log4j = "2.14.1"
guava = "21.0" guava = "31.0.1-jre"
gson = "2.8.0" gson = "2.8.8"
# Platform expectations # Platform expectations
paper = "1.17.1-R0.1-SNAPSHOT" 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 zstd-jni = "1.4.8-1" # Not latest as it can be difficult to obtain latest ZSTD libs
antlr4 = "4.9.3" antlr4 = "4.9.3"
json-simple = "1.1.1" json-simple = "1.1.1"
paranamer = "2.8"
jlibnoise = "1.0.0" jlibnoise = "1.0.0"
jchronic = "0.2.4a" jchronic = "0.2.4a"
lz4-java = "1.8.0" 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" } antlr4 = { group = "org.antlr", name = "antlr4", version.ref = "antlr4" }
antlr4Runtime = { group = "org.antlr", name = "antlr4-runtime", 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" } 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" } jlibnoise = { group = "com.sk89q.lib", name = "jlibnoise", version.ref = "jlibnoise" }
jchronic = { group = "com.sk89q", name = "jchronic", version.ref = "jchronic" } jchronic = { group = "com.sk89q", name = "jchronic", version.ref = "jchronic" }
lz4Java = { group = "org.lz4", name = "lz4-java", version.ref = "lz4-java" } lz4Java = { group = "org.lz4", name = "lz4-java", version.ref = "lz4-java" }

View File

@ -10,7 +10,6 @@
"mockito-core", "mockito-core",
"org.antlr", "org.antlr",
"antlr4-runtime", "antlr4-runtime",
"paranamer",
"fastutil", "fastutil",
"it.unimi.dsi:fastutil", "it.unimi.dsi:fastutil",
"auto-value-annotations", "auto-value-annotations",

View File

@ -44,7 +44,7 @@ repositories {
configurations.all { configurations.all {
resolutionStrategy { resolutionStrategy {
force("com.google.guava:guava:21.0") force("com.google.guava:guava:31.0.1-jre")
} }
} }

View File

@ -8,7 +8,6 @@ dependencies {
"shade"(libs.jchronic) { "shade"(libs.jchronic) {
exclude(group = "junit", module = "junit") exclude(group = "junit", module = "junit")
} }
"shade"(libs.paranamer)
"shade"(libs.jlibnoise) "shade"(libs.jlibnoise)
"shade"(libs.piston) "shade"(libs.piston)
"shade"(libs.pistonRuntime) "shade"(libs.pistonRuntime)