From 886081e27fa460468b8094ffdbd9a27df94d2e80 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Fri, 21 Dec 2018 16:26:19 +0000
Subject: [PATCH] The local build was a fluke, and I couldn't work it out in
 the last 3 hours, so here are some basic updates/cleanup to a few things, and
 an updated bui;d command in README.md

---
 Bukkit/build.gradle |  5 +++--
 Core/build.gradle   | 37 +++++++++++++++++++------------------
 build.gradle        | 13 ++++++++-----
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index 9b807ee0d..ffde75600 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -7,9 +7,10 @@ repositories {
 
 dependencies {
     compile project(':Core')
+    testCompile project(':Core')
     compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
     compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
-    compile("net.milkbowl.vault:VaultAPI:1.6") {
+    compile("net.milkbowl.vault:VaultAPI:1.7") {
         exclude module: 'bukkit'
     }
     compileOnly 'org.projectlombok:lombok:1.18.4'
@@ -44,4 +45,4 @@ shadowJar.doLast {
         ant.checksum file: task.archivePath
 }
 
-build.dependsOn(shadowJar);
+build.dependsOn(shadowJar)
diff --git a/Core/build.gradle b/Core/build.gradle
index ee8cd6834..b0deac29f 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -1,10 +1,9 @@
 dependencies {
     testCompile 'junit:junit:4.12'
-    compile 'org.yaml:snakeyaml:1.16'
-    compile 'com.google.code.gson:gson:2.2.4'
+    compile 'org.yaml:snakeyaml:1.23'
+    compile 'com.google.code.gson:gson:2.8.5'
     compileOnly 'org.projectlombok:lombok:1.18.4'
 }
-
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
@@ -21,21 +20,23 @@ processResources {
 
 jar.archiveName = "plotsquared-api-${project.parent.version}.jar"
 jar.destinationDir = file '../mvn/com/plotsquared/plotsquared-api/' + project.parent.version
-task createPom << {
-    pom {
-        project {
-            groupId 'com.plotsquared'
-            artifactId 'plotsquared-api'
-            version project.parent.version
-        }
-    }.writeTo("../mvn/com/plotsquared/plotsquared-api/${project.parent.version}/plotsquared-api-${project.parent.version}.pom")
-    pom {
-        project {
-            groupId 'com.plotsquared'
-            artifactId 'plotsquared-api'
-            version 'latest'
-        }
-    }.writeTo("../mvn/com/plotsquared/plotsquared-api/latest/plotsquared-api-latest.pom")
+task createPom {
+    doLast {
+        pom {
+            project {
+                groupId 'com.plotsquared'
+                artifactId 'plotsquared-api'
+                version project.parent.version
+            }
+        }.writeTo("../mvn/com/plotsquared/plotsquared-api/${project.parent.version}/plotsquared-api-${project.parent.version}.pom")
+        pom {
+            project {
+                groupId 'com.plotsquared'
+                artifactId 'plotsquared-api'
+                version 'latest'
+            }
+        }.writeTo("../mvn/com/plotsquared/plotsquared-api/latest/plotsquared-api-latest.pom")
+    }
 }
 
 task copyFiles {
diff --git a/build.gradle b/build.gradle
index d3586fd93..8e2fdcf5d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,11 +8,11 @@ buildscript {
     }
     dependencies {
         classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
-        classpath 'org.ajoberstar:grgit:1.7.0'
+        classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
     }
     configurations.all {
         resolutionStrategy {
-            force 'org.ow2.asm:asm:6.0_BETA'
+            force 'org.ow2.asm:asm:7.0'
         }
     }
 }
@@ -21,15 +21,15 @@ plugins {
     id 'io.franzbecker.gradle-lombok' version '1.14'
 }
 
-group = 'com.intellectualcrafters'
+group = 'com.github.intellectualsites,plotsquared'
 
 def rootVersion = "4"
 def revision = ""
 def buildNumber = ""
 def date = ""
 ext {
-    git = Grgit.open(file(".git"))
-    date = git.head().date.format("yy.MM.dd")
+    git = Grgit.open(dir: '.git')
+    date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
     index = 0;  // Offset to match CI
@@ -53,6 +53,8 @@ subprojects {
     apply plugin: 'idea'
     apply plugin: 'com.github.johnrengelman.shadow'
 
+    group = 'com.github.intellectualsites,plotsquared'
+
     lombok {
         version = '1.18.4'
         sha256 = ""
@@ -66,6 +68,7 @@ subprojects {
         }
         compile 'com.google.guava:guava:27.0.1-jre'
         compileOnly 'org.projectlombok:lombok:1.18.4'
+        testImplementation "junit:junit:4.12"
     }
     clean {
         delete file("../target")