From 8986ae242897c80c0ec4c251fd5109c6272f5d7a Mon Sep 17 00:00:00 2001
From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
Date: Sat, 6 Oct 2018 16:20:28 +0300
Subject: [PATCH] Upgrade Gradle to the latest version, small preparations for
 Gradle 5 Also upgraded dependencies in a non-breaking manner

---
 build.gradle                             |  18 +++++++-----------
 gradle/wrapper/gradle-wrapper.jar        | Bin 54706 -> 54706 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 settings.gradle                          |   3 ++-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 02181cb..1b63485 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,10 +8,6 @@ apply plugin: 'maven-publish'
 group = 'com.mojang'
 version = project.hasProperty('buildNumber') ? "${project.majorMinor}.${project.buildNumber}" : "${project.majorMinor}.0-SNAPSHOT"
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.0'
-}
-
 buildscript {
     repositories {
         mavenCentral()
@@ -33,13 +29,13 @@ repositories {
 }
 
 dependencies {
-    testCompile 'com.google.guava:guava:21.0'
-    testCompile 'junit:junit-dep:4.10'
-    testCompile 'org.hamcrest:hamcrest-library:1.2.1'
-    testCompile 'org.mockito:mockito-core:1.8.5'
-    testCompile 'com.google.guava:guava-testlib:21.0'
-    testCompile 'org.openjdk.jmh:jmh-core:1.19'
-    testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.19'
+    testCompile 'com.google.guava:guava:26.0-jre'
+    testCompile 'junit:junit-dep:4.11'
+    testCompile 'org.hamcrest:hamcrest-library:1.3'
+    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'com.google.guava:guava-testlib:26.0-jre'
+    testCompile 'org.openjdk.jmh:jmh-core:1.21'
+    annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
 }
 
 task sourcesJar(type: Jar) {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 9cd52de0b94aceb25225dba64b0ab9149b168ff7..33454243b72df14d6bff6fcd89ee1be900fe7c5f 100644
GIT binary patch
delta 28
hcmdnAnt9V|<_+%-vzRow`ELGnxIhrhnw)mk2LQp648H&X

delta 28
hcmdnAnt9V|<_+%-vwSSL>b3dP;Q~Q0YjWCE9{}GX4=n%y

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 70823f5..37739df 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 21 14:07:34 CEST 2017
+#Sat Oct 06 16:17:40 EEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
diff --git a/settings.gradle b/settings.gradle
index 85ab9c7..c82198a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
-rootProject.name = 'brigadier'
\ No newline at end of file
+rootProject.name = 'brigadier'
+enableFeaturePreview('STABLE_PUBLISHING')