diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index dfb4b7055..b7c87d99c 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -7,15 +7,14 @@ repositories {
 }
 
 dependencies {
+    implementation project(':Core')
     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(group: 'org.bstats', name: 'bstats-bukkit', version: '1.4')
     compile("net.milkbowl.vault:VaultAPI:1.7") {
         exclude module: 'bukkit'
     }
-    compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
 }
 
 sourceCompatibility = 1.8
diff --git a/Core/build.gradle b/Core/build.gradle
index eadb2e153..48fa09110 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -6,7 +6,11 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'org.yaml:snakeyaml:1.23'
     compile 'com.google.code.gson:gson:2.8.5'
-    compileOnly 'org.projectlombok:lombok:1.18.4'
+    compile("org.projectlombok:lombok:1.18.4")
+    compileOnly("org.projectlombok:lombok:1.18.4")
+    testCompileOnly("org.projectlombok:lombok:1.18.4")
+    annotationProcessor("org.projectlombok:lombok:1.18.4")
+    testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
 
     compile 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
     compile 'com.squareup.okhttp3:okhttp:3.14.0'
diff --git a/build.gradle b/build.gradle
index 1df3aaa8e..a6c24bba3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
-        classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:5.0.0'
     }
     configurations.all {
         resolutionStrategy {
@@ -18,7 +17,8 @@ buildscript {
 }
 
 plugins {
-    id 'io.franzbecker.gradle-lombok' version '1.14'
+    id 'maven-publish'
+    id "org.ajoberstar.grgit" version "3.1.1"
 }
 
 group = 'com.github.intellectualsites.plotsquared'
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2043;  // Offset to match CI
+    index = -2042;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }
@@ -53,11 +53,6 @@ subprojects {
 
     group = 'com.github.intellectualsites,plotsquared'
 
-    lombok {
-        version = '1.18.4'
-        sha256 = ""
-    }
-
     dependencies {
         compile(group: 'com.sk89q.worldedit', name: 'worldedit-core', version: '7.0.0-SNAPSHOT') {
             exclude(module: 'bukkit-classloader-check')
@@ -66,12 +61,13 @@ subprojects {
         }
         //Minecraft uses Guava 21 as of 1.13.
         compile 'com.google.guava:guava:21.0'
-        compileOnly 'org.projectlombok:lombok:1.18.4'
+        compile("org.projectlombok:lombok:1.18.4")
+        compileOnly("org.projectlombok:lombok:1.18.4")
+        testCompileOnly("org.projectlombok:lombok:1.18.4")
+        annotationProcessor("org.projectlombok:lombok:1.18.4")
+        testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
         testImplementation "junit:junit:4.12"
     }
-    clean {
-        delete file("../target")
-    }
     repositories {
         mavenCentral()
         maven { url "http://maven.sk89q.com/repo/" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 0d4a95168..457aad0d9 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d1f4cb442..2b3219323 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Dec 21 16:11:33 EST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip