diff --git a/dd-trace-java.gradle b/dd-trace-java.gradle
index 14f1b8df42..9865790f53 100644
--- a/dd-trace-java.gradle
+++ b/dd-trace-java.gradle
@@ -53,7 +53,7 @@ buildScan {
   }
 }
 
-ext.gradleWrapperVersion = '4.8.1'
+ext.gradleWrapperVersion = '4.9'
 task wrapper(type: Wrapper) {
   gradleVersion = gradleWrapperVersion
 }
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 7d4c4e282a..a5cb7338bd 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -118,7 +118,13 @@ artifacts {
 if (project.plugins.hasPlugin('com.github.johnrengelman.shadow')) {
   // Remove the no-deps jar from the archives to prevent publication
   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 {
     archives shadowJar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2d80b69a76..a95009c3b9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 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
 zipStorePath=wrapper/dists