Upgrade Gradle to the latest version, small preparations for Gradle 5

Also upgraded dependencies in a non-breaking manner
This commit is contained in:
DoNotSpamPls 2018-10-06 16:20:28 +03:00 committed by Nathan Adams
parent e527fec986
commit 8986ae2428
4 changed files with 11 additions and 14 deletions

View file

@ -8,10 +8,6 @@ apply plugin: 'maven-publish'
group = 'com.mojang' group = 'com.mojang'
version = project.hasProperty('buildNumber') ? "${project.majorMinor}.${project.buildNumber}" : "${project.majorMinor}.0-SNAPSHOT" version = project.hasProperty('buildNumber') ? "${project.majorMinor}.${project.buildNumber}" : "${project.majorMinor}.0-SNAPSHOT"
task wrapper(type: Wrapper) {
gradleVersion = '4.0'
}
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
@ -33,13 +29,13 @@ repositories {
} }
dependencies { dependencies {
testCompile 'com.google.guava:guava:21.0' testCompile 'com.google.guava:guava:26.0-jre'
testCompile 'junit:junit-dep:4.10' testCompile 'junit:junit-dep:4.11'
testCompile 'org.hamcrest:hamcrest-library:1.2.1' testCompile 'org.hamcrest:hamcrest-library:1.3'
testCompile 'org.mockito:mockito-core:1.8.5' testCompile 'org.mockito:mockito-core:1.10.19'
testCompile 'com.google.guava:guava-testlib:21.0' testCompile 'com.google.guava:guava-testlib:26.0-jre'
testCompile 'org.openjdk.jmh:jmh-core:1.19' testCompile 'org.openjdk.jmh:jmh-core:1.21'
testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.19' annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
} }
task sourcesJar(type: Jar) { task sourcesJar(type: Jar) {

Binary file not shown.

View file

@ -1,6 +1,6 @@
#Wed Jun 21 14:07:34 CEST 2017 #Sat Oct 06 16:17:40 EEST 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

View file

@ -1 +1,2 @@
rootProject.name = 'brigadier' rootProject.name = 'brigadier'
enableFeaturePreview('STABLE_PUBLISHING')