From 5de7c31a8c3eb1a930ec7409e8d8ea705dffc680 Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Tue, 3 Mar 2020 15:36:21 -0500 Subject: [PATCH] Update gradle --- build.gradle.kts | 4 ---- buildSrc/build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- worldedit-core/build.gradle.kts | 4 ++-- worldedit-libs/core/build.gradle.kts | 1 + 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5e6a17aea..8c9ed0c03 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,6 @@ import org.ajoberstar.grgit.Grgit import java.time.format.DateTimeFormatter -plugins { - id("com.gradle.build-scan") version "2.4.1" -} - logger.lifecycle(""" ******************************************* You are building FastAsyncWorldEdit! diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 17800ae54..9fe894493 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -2,7 +2,7 @@ import java.util.Properties plugins { `kotlin-dsl` - kotlin("jvm") version embeddedKotlinVersion + kotlin("jvm") version "1.3.61" } repositories { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5028f28f8..4a6ebceac 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index 25ed1cefa..de4a61e4b 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("net.ltgt.apt-idea") id("antlr") id("com.mendhak.gradlecrowdin") - kotlin("jvm") version "1.3.41" + kotlin("jvm") version "1.3.61" } repositories { @@ -58,7 +58,7 @@ dependencies { "compile"("com.github.intellectualsites.plotsquared:PlotSquared-API:latest") { isTransitive = false } - implementation(kotlin("stdlib-jdk8")) + implementation(kotlin("stdlib-jdk8", "1.3.61")) } tasks.withType().configureEach { diff --git a/worldedit-libs/core/build.gradle.kts b/worldedit-libs/core/build.gradle.kts index 915c530b5..128dab86c 100644 --- a/worldedit-libs/core/build.gradle.kts +++ b/worldedit-libs/core/build.gradle.kts @@ -14,4 +14,5 @@ dependencies { "shade"("org.enginehub.piston:core:${Versions.PISTON}") "shade"("org.enginehub.piston.core-ap:runtime:${Versions.PISTON}") "shade"("org.enginehub.piston:default-impl:${Versions.PISTON}") + "shade"("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61") }