Skip to content

Commit a4c20a0

Browse files
committed
Upgrade gradle version
1 parent 6e4c03b commit a4c20a0

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

dd-trace-java.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ buildScan {
5353
}
5454
}
5555

56-
ext.gradleWrapperVersion = '4.8.1'
56+
ext.gradleWrapperVersion = '4.9'
5757
task wrapper(type: Wrapper) {
5858
gradleVersion = gradleWrapperVersion
5959
}

gradle/java.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,13 @@ artifacts {
118118
if (project.plugins.hasPlugin('com.github.johnrengelman.shadow')) {
119119
// Remove the no-deps jar from the archives to prevent publication
120120
configurations.archives.with {
121-
artifacts.remove artifacts.find { it.archiveTask.is jar }
121+
artifacts.remove artifacts.find {
122+
if (it.hasProperty("delegate")) {
123+
it.delegate.archiveTask.is jar
124+
} else {
125+
it.archiveTask.is jar
126+
}
127+
}
122128
}
123129
artifacts {
124130
archives shadowJar
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)