From c5a50179f2a30fb04a47d71c29b2ccb1193e90fb Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Fri, 10 Jun 2022 01:26:48 +0200 Subject: [PATCH] [ci skip] build: Switch to bom (#1778) * build: Switch to bom * chore: Use javax over checkerframework --- buildSrc/src/main/kotlin/AdapterConfig.kt | 1 + buildSrc/src/main/kotlin/CommonJavaConfig.kt | 1 + gradle/libs.versions.toml | 27 +----------------- .../adapters/adapter-1_17_1/build.gradle.kts | 2 +- .../adapters/adapter-1_18/build.gradle.kts | 2 +- .../adapters/adapter-1_18_2/build.gradle.kts | 2 +- worldedit-bukkit/build.gradle.kts | 28 +++++++++---------- .../plotsquared/FaweQueueCoordinator.java | 16 +++++++++++ worldedit-cli/build.gradle.kts | 9 +++--- worldedit-core/build.gradle.kts | 16 +++++------ 10 files changed, 47 insertions(+), 57 deletions(-) diff --git a/buildSrc/src/main/kotlin/AdapterConfig.kt b/buildSrc/src/main/kotlin/AdapterConfig.kt index 60f9a5733..31ac7986c 100644 --- a/buildSrc/src/main/kotlin/AdapterConfig.kt +++ b/buildSrc/src/main/kotlin/AdapterConfig.kt @@ -15,6 +15,7 @@ fun Project.applyPaperweightAdapterConfiguration() { dependencies { "implementation"(project(":worldedit-bukkit")) + "implementation"(platform("com.intellectualsites.bom:bom-1.18.x:1.4")) } tasks.named("assemble") { diff --git a/buildSrc/src/main/kotlin/CommonJavaConfig.kt b/buildSrc/src/main/kotlin/CommonJavaConfig.kt index 0ad546777..c0901f6dc 100644 --- a/buildSrc/src/main/kotlin/CommonJavaConfig.kt +++ b/buildSrc/src/main/kotlin/CommonJavaConfig.kt @@ -45,6 +45,7 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, banSlf4j: Boolean "testImplementation"("org.mockito:mockito-core:3.12.4") "testImplementation"("org.mockito:mockito-junit-jupiter:3.12.4") "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.8.1") + "implementation"(platform("com.intellectualsites.bom:bom-1.18.x:1.4")) } // Java 8 turns on doclint which we fail diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 974a2a83c..4df8da331 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,15 +1,10 @@ [versions] # Minecraft expectations fastutil = "8.5.6" -log4j = "2.17.0" guava = "31.0.1-jre" -gson = "2.8.9" - -# Platform expectations -paper = "1.18.1-R0.1-SNAPSHOT" +log4j = "2.17.1" # Plugins -vault = "1.7.1" dummypermscompat = "1.10" worldguard-bukkit = "7.0.7" mapmanager = "1.8.0-SNAPSHOT" @@ -18,14 +13,10 @@ griefdefender = "2.1.0-SNAPSHOT" mcore = "7.0.1" residence = "4.5._13.1" towny = "0.98.2.2" -plotsquared = "6.7.0" redprotect = "1.9.6" # Third party -paperlib = "1.0.8-SNAPSHOT" bstats = "3.0.0" -serverlib = "2.3.1" -paster = "1.1.4" sparsebitset = "1.2" parallelgzip = "1.0.5" adventure = "4.9.3" @@ -48,7 +39,6 @@ piston = "0.5.7" # Tests mockito = "4.6.1" -checker-qual = "3.22.0" # Gradle plugins pluginyml = "0.5.1" @@ -56,16 +46,10 @@ pluginyml = "0.5.1" [libraries] # Minecraft expectations fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" } -log4j = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" } log4jBom = { group = "org.apache.logging.log4j", name = "log4j-bom", version.ref = "log4j" } guava = { group = "com.google.guava", name = "guava", version.ref = "guava" } -gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } - -#Platform expectations -paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" } # Plugins -vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" } dummypermscompat = { group = "com.sk89q", name = "dummypermscompat", version.ref = "dummypermscompat" } worldguard = { group = "com.sk89q.worldguard", name = "worldguard-bukkit", version.ref = "worldguard-bukkit" } mapmanager = { group = "com.github.InventivetalentDev", name = "MapManager", version.ref = "mapmanager" } @@ -74,19 +58,12 @@ griefdefender = { group = "com.griefdefender", name = "api", version.ref = "grie mcore = { group = "com.massivecraft", name = "mcore", version.ref = "mcore" } residence = { group = "com.bekvon.bukkit.residence", name = "Residence", version.ref = "residence" } towny = { group = "com.github.TownyAdvanced", name = "Towny", version.ref = "towny" } -plotsquaredBukkit = { group = "com.plotsquared", name = "PlotSquared-Bukkit", version.ref = "plotsquared" } -plotsquaredCore = { group = "com.plotsquared", name = "PlotSquared-Core", version.ref = "plotsquared" } redprotect = { group = "net.fabiozumbi12", name = "redprotect", version.ref = "redprotect" } # Third Party -paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" } -bstatsBukkit = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" } bstatsBase = { group = "org.bstats", name = "bstats-base", version.ref = "bstats" } -serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" } -paster = { group = "com.intellectualsites.paster", name = "Paster", version.ref = "paster" } sparsebitset = { group = "com.zaxxer", name = "SparseBitSet", version.ref = "sparsebitset" } parallelgzip = { group = "org.anarres", name = "parallelgzip", version.ref = "parallelgzip" } -adventure = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" } adventureNbt = { group = "net.kyori", name = "adventure-nbt", version.ref = "adventure" } truezip = { group = "de.schlichtherle", name = "truezip", version.ref = "truezip" } autoValueAnnotations = { group = "com.google.auto.value", name = "auto-value-annotations", version.ref = "auto-value" } @@ -105,7 +82,6 @@ lz4JavaStream = { group = "net.jpountz", name = "lz4-java-stream", version.ref = # Internal ## Text adventureTextAdapterBukkit = { group = "net.kyori", name = "text-adapter-bukkit", version.ref = "text-adapter" } -adventureTextMiniMessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure-text-minimessage" } adventureTextApi = { group = "net.kyori", name = "text-api", version.ref = "text" } adventureTextSerializerGson = { group = "net.kyori", name = "text-serializer-gson", version.ref = "text" } adventureTextSerializerLegacy = { group = "net.kyori", name = "text-serializer-legacy", version.ref = "text" } @@ -119,7 +95,6 @@ pistonRuntime = { group = "org.enginehub.piston.core-ap", name = "runtime", vers # Tests mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } -checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checker-qual" } log4jCore = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" } [plugins] diff --git a/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts index b1d60858e..8cfc863cd 100644 --- a/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts +++ b/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts @@ -23,5 +23,5 @@ configurations.all { dependencies { paperDevBundle("1.17.1-R0.1-20220414.034903-210") - compileOnly(libs.paperlib) + compileOnly("io.papermc:paperlib") } diff --git a/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts index 0c76f5066..49b54d164 100644 --- a/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts +++ b/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts @@ -13,5 +13,5 @@ repositories { dependencies { paperDevBundle("1.18.1-R0.1-20220228.153921-147") - compileOnly(libs.paperlib) + compileOnly("io.papermc:paperlib") } diff --git a/worldedit-bukkit/adapters/adapter-1_18_2/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_18_2/build.gradle.kts index d24b84c93..14e1e120c 100644 --- a/worldedit-bukkit/adapters/adapter-1_18_2/build.gradle.kts +++ b/worldedit-bukkit/adapters/adapter-1_18_2/build.gradle.kts @@ -14,5 +14,5 @@ repositories { dependencies { // https://papermc.io/repo/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/ paperDevBundle("1.18.2-R0.1-20220424.184034-95") - compileOnly(libs.paperlib) + compileOnly("io.papermc:paperlib") } diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index ae7210023..b554c3bdd 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -63,19 +63,19 @@ dependencies { implementation(libs.fastutil) // Platform expectations - compileOnly(libs.paper) { + compileOnly("io.papermc.paper:paper-api") { exclude("junit", "junit") exclude(group = "org.slf4j", module = "slf4j-api") } // Logging - localImplementation(libs.log4j) + localImplementation("org.apache.logging.log4j:log4j-api") localImplementation(libs.log4jBom) { because("Spigot provides Log4J (sort of, not in API, implicitly part of server)") } // Plugins - compileOnly(libs.vault) { isTransitive = false } + compileOnly("com.github.MilkBowl:VaultAPI") { isTransitive = false } compileOnly(libs.dummypermscompat) { exclude("com.github.MilkBowl", "VaultAPI") } @@ -91,26 +91,26 @@ dependencies { compileOnly(libs.mcore) { isTransitive = false } compileOnly(libs.residence) { isTransitive = false } compileOnly(libs.towny) { isTransitive = false } - compileOnly(libs.plotsquaredBukkit) { isTransitive = false } - compileOnly(libs.plotsquaredCore) { isTransitive = false } + compileOnly("com.plotsquared:PlotSquared-Bukkit") { isTransitive = false } + compileOnly("com.plotsquared:PlotSquared-Core") { isTransitive = false } // Third party - implementation(libs.paperlib) - implementation(libs.bstatsBukkit) { isTransitive = false } + implementation("io.papermc:paperlib") + implementation("org.bstats:bstats-bukkit") { isTransitive = false } implementation(libs.bstatsBase) { isTransitive = false } - implementation(libs.serverlib) - api(libs.paster) { isTransitive = false } + implementation("dev.notmyfault.serverlib:ServerLib") + api("com.intellectualsites.paster:Paster") { isTransitive = false } api(libs.lz4Java) { isTransitive = false } api(libs.sparsebitset) { isTransitive = false } api(libs.parallelgzip) { isTransitive = false } - compileOnly(libs.adventure) - compileOnlyApi(libs.checkerqual) + compileOnly("net.kyori:adventure-api") + compileOnlyApi("org.checkerframework:checker-qual") // Tests testImplementation(libs.mockito) - testImplementation(libs.adventure) - testImplementation(libs.checkerqual) - testImplementation(libs.paper) { isTransitive = true } + testImplementation("net.kyori:adventure-api") + testImplementation("org.checkerframework:checker-qual") + testImplementation("io.papermc.paper:paper-api") { isTransitive = true } } tasks.named("processResources") { diff --git a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/plotsquared/FaweQueueCoordinator.java b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/plotsquared/FaweQueueCoordinator.java index 3db6141ec..528e5aae9 100644 --- a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/plotsquared/FaweQueueCoordinator.java +++ b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/plotsquared/FaweQueueCoordinator.java @@ -14,6 +14,7 @@ import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; +import com.sk89q.worldedit.util.SideEffectSet; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; @@ -86,6 +87,11 @@ public class FaweQueueCoordinator extends QueueCoordinator { return false; } + @Override + public void setBiomesEnabled(final boolean enabled) { + + } + @Override public boolean setEntity(@Nonnull Entity entity) { return false; @@ -182,6 +188,16 @@ public class FaweQueueCoordinator extends QueueCoordinator { } + @Override + public @Nullable SideEffectSet getSideEffectSet() { + return null; + } + + @Override + public void setSideEffectSet(@Nullable final SideEffectSet sideEffectSet) { + + } + @Override public void regenChunk(int x, int z) { instance.regenerateChunk(x, z, null, null); diff --git a/worldedit-cli/build.gradle.kts b/worldedit-cli/build.gradle.kts index 08bf4678a..ff0c9b5c1 100644 --- a/worldedit-cli/build.gradle.kts +++ b/worldedit-cli/build.gradle.kts @@ -27,16 +27,15 @@ dependencies { // Minecraft expectations annotationProcessor(libs.guava) - implementation(libs.guava) - implementation(libs.gson) + implementation("com.google.guava:guava") + implementation("com.google.code.gson:gson") // Logging implementation(libs.log4jBom) { because("We control Log4J on this platform") } - implementation(libs.log4j) - implementation(libs.log4jCore - ) + implementation("org.apache.logging.log4j:log4j-api") + implementation(libs.log4jCore) implementation("commons-cli:commons-cli:1.5.0") api(libs.parallelgzip) { isTransitive = false } api(libs.lz4Java) diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index 90ebcbb01..94d8e21d7 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -24,20 +24,18 @@ dependencies { // Minecraft expectations implementation(libs.fastutil) - implementation(libs.guava) - implementation(libs.gson) + implementation("com.google.guava:guava") + implementation("com.google.code.gson:gson") // Platform expectations implementation("org.yaml:snakeyaml") // Logging - implementation(libs.log4j) { - because("Mojang provides Log4J 2.14.1") - } + implementation("org.apache.logging.log4j:log4j-api") // Plugins compileOnly(libs.redprotect) { isTransitive = false } - compileOnly(libs.plotsquaredCore) { isTransitive = false } + compileOnly("com.plotsquared:PlotSquared-Core") { isTransitive = false } // ensure this is on the classpath for the AP annotationProcessor(libs.guava) @@ -48,11 +46,11 @@ dependencies { compileOnly(libs.truezip) implementation(libs.findbugs) implementation(libs.rhino) - compileOnly(libs.adventure) + compileOnly("net.kyori:adventure-api") compileOnlyApi(libs.adventureNbt) - compileOnlyApi(libs.adventureTextMiniMessage) + compileOnlyApi("net.kyori:adventure-text-minimessage") implementation(libs.zstd) { isTransitive = false } - api(libs.paster) + api("com.intellectualsites.paster:Paster") compileOnly(libs.lz4Java) { isTransitive = false } compileOnly(libs.sparsebitset) compileOnly(libs.parallelgzip) { isTransitive = false }