From 9a33789e4115e732daeaaf4355c9abd1a21f889b Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Mon, 18 Oct 2021 22:41:31 +0200 Subject: [PATCH] build: Update shadow and PlotSquared Closes #1367 --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/PlatformConfig.kt | 7 ------- gradle/libs.versions.toml | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index b4f784954..c2ed9bb3c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -27,6 +27,6 @@ val properties = Properties().also { props -> dependencies { implementation(gradleApi()) implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0") - implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0") + implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0") implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.1.11") } diff --git a/buildSrc/src/main/kotlin/PlatformConfig.kt b/buildSrc/src/main/kotlin/PlatformConfig.kt index ad49908ab..6f805aece 100644 --- a/buildSrc/src/main/kotlin/PlatformConfig.kt +++ b/buildSrc/src/main/kotlin/PlatformConfig.kt @@ -1,24 +1,17 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.Project -import org.gradle.api.attributes.java.TargetJvmVersion import org.gradle.api.component.AdhocComponentWithVariants import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.publish.PublishingExtension import org.gradle.api.publish.maven.MavenPublication import org.gradle.api.tasks.bundling.Jar -import org.gradle.api.tasks.compile.JavaCompile -import org.gradle.api.tasks.javadoc.Javadoc -import org.gradle.api.tasks.testing.Test -import org.gradle.external.javadoc.StandardJavadocDocletOptions import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.named import org.gradle.kotlin.dsl.provideDelegate import org.gradle.kotlin.dsl.register import org.gradle.kotlin.dsl.the -import org.gradle.kotlin.dsl.withType fun Project.applyPlatformAndCoreConfiguration() { applyCommonConfiguration() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 80f475e31..d8070e61e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ mcore = "7.0.1" residence = "4.5._13.1" towny = "0.97.2.7" protocollib = "4.7.0" -plotsquaredV6 = "6.1.2" +plotsquaredV6 = "6.1.3" plotsquaredV4 = "4.514" redprotect = "1.9.6"