From bcab33c12c1662bd4c75e9dcca8958866c1d6669 Mon Sep 17 00:00:00 2001
From: JOO200 <github@joo200.de>
Date: Fri, 11 Jun 2021 17:52:43 +0200
Subject: [PATCH] Updated dependencies and gradle

---
 build.gradle.kts                           | 2 +-
 buildSrc/build.gradle.kts                  | 6 +++---
 buildSrc/src/main/kotlin/PlatformConfig.kt | 4 ++--
 buildSrc/src/main/kotlin/Versions.kt       | 2 +-
 gradle/wrapper/gradle-wrapper.properties   | 2 +-
 worldguard-core/build.gradle.kts           | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e1d5b3bb..caa15ac5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ applyRootArtifactoryConfig()
 if (!project.hasProperty("gitCommitHash")) {
     apply(plugin = "org.ajoberstar.grgit")
     ext["gitCommitHash"] = try {
-        (ext["grgit"] as Grgit?)?.head()?.abbreviatedId
+        Grgit.open(mapOf("currentDir" to project.rootDir))?.head()?.abbreviatedId
     } catch (e: Exception) {
         logger.warn("Error getting commit hash", e)
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 16dfb8a2..1d92f8fa 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,9 +11,9 @@ repositories {
 dependencies {
     implementation(gradleApi())
     implementation("gradle.plugin.net.minecrell:licenser:0.4.1")
-    implementation("org.ajoberstar.grgit:grgit-gradle:3.1.1")
-    implementation("com.github.jengelman.gradle.plugins:shadow:5.1.0")
+    implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
+    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.9.7")
+    implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0")
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/PlatformConfig.kt b/buildSrc/src/main/kotlin/PlatformConfig.kt
index 66b1fe77..28c2d7f2 100644
--- a/buildSrc/src/main/kotlin/PlatformConfig.kt
+++ b/buildSrc/src/main/kotlin/PlatformConfig.kt
@@ -31,8 +31,8 @@ fun Project.applyPlatformAndCoreConfiguration() {
     ext["internalVersion"] = "$version+${rootProject.ext["gitCommitHash"]}"
 
     configure<JavaPluginConvention> {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     configure<CheckstyleExtension> {
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 2313a032..302902c5 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,7 +1,7 @@
 object Versions {
 //    const val PISTON = "0.4.3"
 //    const val AUTO_VALUE = "1.6.5"
-    const val WORLDEDIT = "7.2.0-SNAPSHOT"
+    const val WORLDEDIT = "7.2.6-SNAPSHOT"
     const val JUNIT = "4.11"
     const val SQUIRRELID = "0.2.0"
     const val GUAVA = "21.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bb8b2fc2..549d8442 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-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/worldguard-core/build.gradle.kts b/worldguard-core/build.gradle.kts
index 4439036d..b2047ba6 100644
--- a/worldguard-core/build.gradle.kts
+++ b/worldguard-core/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     "api"(project(":worldguard-libs:core"))
     "api"("com.sk89q.worldedit:worldedit-core:${Versions.WORLDEDIT}")
     "implementation"("org.flywaydb:flyway-core:3.0")
-    "implementation"("org.yaml:snakeyaml:1.9")
+    "implementation"("org.yaml:snakeyaml:1.29")
     "implementation"("com.google.guava:guava:${Versions.GUAVA}")
 
     "compileOnly"("com.google.code.findbugs:jsr305:1.3.9")