Upgrade gradle version

This commit is contained in:
Tyler Benson 2018-07-25 11:05:37 +10:00
parent 6e4c03baaf
commit a4c20a0b37
3 changed files with 9 additions and 3 deletions

View File

@ -53,7 +53,7 @@ buildScan {
} }
} }
ext.gradleWrapperVersion = '4.8.1' ext.gradleWrapperVersion = '4.9'
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = gradleWrapperVersion gradleVersion = gradleWrapperVersion
} }

View File

@ -118,7 +118,13 @@ artifacts {
if (project.plugins.hasPlugin('com.github.johnrengelman.shadow')) { if (project.plugins.hasPlugin('com.github.johnrengelman.shadow')) {
// Remove the no-deps jar from the archives to prevent publication // Remove the no-deps jar from the archives to prevent publication
configurations.archives.with { configurations.archives.with {
artifacts.remove artifacts.find { it.archiveTask.is jar } artifacts.remove artifacts.find {
if (it.hasProperty("delegate")) {
it.delegate.archiveTask.is jar
} else {
it.archiveTask.is jar
}
}
} }
artifacts { artifacts {
archives shadowJar archives shadowJar

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists