From 6bd866bdf70e8fa9f5dd6a8ebca13f773068a167 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Sat, 27 Feb 2021 15:52:50 +0100 Subject: [PATCH] Making renovate happy Closes #940 Closes #933 Closes #931 --- buildSrc/build.gradle.kts | 22 ---------------------- buildSrc/src/main/kotlin/Versions.kt | 2 +- worldedit-bukkit/build.gradle.kts | 12 ++++++------ worldedit-core/build.gradle.kts | 10 +++++----- worldedit-libs/core/build.gradle.kts | 4 ++-- 5 files changed, 14 insertions(+), 36 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 7bbaf06cf..777fce05a 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -8,20 +8,6 @@ plugins { repositories { jcenter() gradlePluginPortal() - /* - maven { - name = "Forge Maven" - url = uri("https://files.minecraftforge.net/maven") - } - maven { - name = "Fabric" - url = uri("https://maven.fabricmc.net/") - } - maven { - name = "sponge" - url = uri("https://repo.spongepowered.org/maven") - } - */ maven { name = "EngineHub" url = uri("https://maven.enginehub.org/repo/") @@ -44,12 +30,4 @@ dependencies { implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0") implementation("net.ltgt.apt-eclipse:net.ltgt.apt-eclipse.gradle.plugin:0.21") implementation("net.ltgt.apt-idea:net.ltgt.apt-idea.gradle.plugin:0.21") - /* - implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.19.0") - implementation("org.spongepowered:SpongeGradle:0.11.5") - implementation("net.minecraftforge.gradle:ForgeGradle:4.0.9") - implementation("net.fabricmc:fabric-loom:$loomVersion") - implementation("net.fabricmc:sponge-mixin:$mixinVersion") - implementation("org.enginehub.gradle:gradle-codecov-plugin:0.1.0") - */ } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 279a0c8ff..503e7622a 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -6,7 +6,7 @@ object Versions { const val PISTON = "0.5.6" const val AUTO_VALUE = "1.7.4" const val JUNIT = "5.7.0" - const val MOCKITO = "3.7.7" + const val MOCKITO = "3.8.0" const val SLF4J = "1.7.30" const val LOGBACK = "1.2.3" const val FAST_UTIL = "8.2.1" diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index cabbf55f2..9b21f4c5a 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -65,7 +65,7 @@ repositories { } } maven { - name = "OSS Sonatype Releases" + name = "OSS Sonatype Snapshots" url = uri("https://oss.sonatype.org/content/repositories/snapshots/") content { includeGroup("net.kyori") @@ -107,21 +107,21 @@ dependencies { exclude("com.github.MilkBowl", "VaultAPI") } implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1") - testImplementation("org.mockito:mockito-core:1.9.0-rc1") + testImplementation("org.mockito:mockito-core:3.8.0") compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.4") { exclude("com.sk89q.worldedit", "worldedit-bukkit") exclude("com.sk89q.worldedit", "worldedit-core") exclude("com.sk89q.worldedit.worldedit-libs", "bukkit") exclude("com.sk89q.worldedit.worldedit-libs", "core") } - compileOnly("net.kyori:adventure-api:4.5.0") - testCompileOnly("net.kyori:adventure-api:4.5.0") + compileOnly("net.kyori:adventure-api:4.5.1") + testCompileOnly("net.kyori:adventure-api:4.5.1") api("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT") // Third party implementation("org.bstats:bstats-bukkit:2.2.1") implementation("org.bstats:bstats-base:2.2.1") - compileOnlyApi("org.inventivetalent:mapmanager:1.7.+") { isTransitive = false } - implementation("com.github.TechFortress:GriefPrevention:16.+") { isTransitive = false } + compileOnlyApi("org.inventivetalent:mapmanager:1.7.10-SNAPSHOT") { isTransitive = false } + implementation("com.github.TechFortress:GriefPrevention:16.17.1") { isTransitive = false } implementation("com.massivecraft:mcore:7.0.1") { isTransitive = false } implementation("com.bekvon.bukkit.residence:Residence:4.5._13.1") { isTransitive = false } implementation("com.palmergames.bukkit:towny:0.84.0.9") { isTransitive = false } diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index 3aafeda3a..7b462f0e9 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -25,18 +25,18 @@ applyPlatformAndCoreConfiguration() dependencies { constraints { implementation( "org.yaml:snakeyaml") { - version { strictly("1.26") } + version { strictly("1.27") } because("Bukkit provides SnakeYaml") } } api(project(":worldedit-libs:core")) implementation("de.schlichtherle:truezip:6.8.4") - implementation("net.java.truevfs:truevfs-profile-default_2.13:0.12.1") + implementation("net.java.truevfs:truevfs-profile-default_2.13:0.12.2") implementation("org.mozilla:rhino-runtime:1.7.13") implementation("org.yaml:snakeyaml") implementation("com.google.guava:guava") - implementation("com.google.code.findbugs:jsr305:1.3.9") + implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.google.code.gson:gson") implementation("org.slf4j:slf4j-api:${Versions.SLF4J}") implementation("it.unimi.dsi:fastutil") @@ -54,7 +54,7 @@ dependencies { annotationProcessor("com.google.auto.value:auto-value:${Versions.AUTO_VALUE}") testImplementation("ch.qos.logback:logback-core:${Versions.LOGBACK}") testImplementation("ch.qos.logback:logback-classic:${Versions.LOGBACK}") - implementation("com.github.luben:zstd-jni:1.4.8-5") + implementation("com.github.luben:zstd-jni:1.4.8-6") compileOnly("net.fabiozumbi12:redprotect:1.9.6") api("com.github.intellectualsites.plotsquared:PlotSquared-API:4.514") { isTransitive = false } api("com.plotsquared:PlotSquared-Core:5.13.3") { isTransitive = false } @@ -109,7 +109,7 @@ tasks.named("processResources") { } tasks.named("shadowJar") { dependencies { - include(dependency("com.github.luben:zstd-jni:1.4.8-5")) + include(dependency("com.github.luben:zstd-jni:1.4.8-6")) } } diff --git a/worldedit-libs/core/build.gradle.kts b/worldedit-libs/core/build.gradle.kts index 5f60d3866..1100bade3 100644 --- a/worldedit-libs/core/build.gradle.kts +++ b/worldedit-libs/core/build.gradle.kts @@ -8,8 +8,8 @@ dependencies { "shade"("com.sk89q:jchronic:0.2.4a") { exclude(group = "junit", module = "junit") } - "shade"("com.thoughtworks.paranamer:paranamer:2.6") - "shade"("com.github.luben:zstd-jni:1.4.8-5") + "shade"("com.thoughtworks.paranamer:paranamer:2.8") + "shade"("com.github.luben:zstd-jni:1.4.8-6") "shade"("com.sk89q.lib:jlibnoise:1.0.0") "shade"("org.enginehub.piston:core:0.5.6") "shade"("org.enginehub.piston.core-ap:runtime:0.5.6")