From 11cf5377d914b68d7f9463f556f7e97c6a9c865d Mon Sep 17 00:00:00 2001
From: Matthew Miller <mnmiller1@me.com>
Date: Sat, 15 Dec 2018 18:57:37 +1000
Subject: [PATCH] Further attempts

---
 build.gradle                 | 10 ++++------
 worldedit-forge/build.gradle |  8 +-------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6b63f5caf..8bdb1a122 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,20 +7,19 @@ buildscript {
 
     configurations.all {
         resolutionStrategy {
-            force 'com.google.guava:guava:21.0'
-            force 'org.ow2.asm:asm:6.0_BETA'
+            force 'commons-io:commons-io:2.4'
         }
     }
 
     dependencies {
         classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'
-        classpath 'org.ajoberstar:gradle-git:1.7.2'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.8.1'
     }
 }
 
 plugins {
     id 'net.minecrell.licenser' version '0.4.1' apply false
+    id "org.ajoberstar.grgit" version "2.3.0"
 }
 
 println """
@@ -48,7 +47,7 @@ if (!project.hasProperty("artifactory_password")) ext.artifactory_password = ""
 
 if (!project.hasProperty("gitCommitHash") && !JavaVersion.current().isJava6()) {
     try {
-        def repo = org.ajoberstar.grgit.Grgit.open(dir: '.')
+        def repo = grgit.open()
         ext.gitCommitHash = repo.head().abbreviatedId
     } catch (Exception e) {
         println "Error getting commit hash: " + e.getMessage()
@@ -100,7 +99,6 @@ subprojects {
 
     repositories {
         mavenCentral()
-        maven { url "http://repo.bukkit.org/content/groups/public" }
         maven { url "http://maven.sk89q.com/repo/" }
         maven { url "http://repo.maven.apache.org/maven2" }
     }
diff --git a/worldedit-forge/build.gradle b/worldedit-forge/build.gradle
index 054bd138b..229f4447b 100644
--- a/worldedit-forge/build.gradle
+++ b/worldedit-forge/build.gradle
@@ -13,12 +13,6 @@ buildscript {
 
 apply plugin: 'net.minecraftforge.gradle'
 
-configurations.all {
-	resolutionStrategy {
-		force 'org.ow2.asm:asm:5.2'
-	}
-}
-
 def minecraftVersion = "1.13"
 def forgeVersion = "24.0.16-1.13-pre"
 
@@ -34,7 +28,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 minecraft {
-    mappings channel: 'snapshot', version: '20181117'
+    mappings channel: 'snapshot', version: '20181215'
 //    runDir = 'run'
 
 //    replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java"