chore: Gradle 9 compatibility

augi · Dec 22, 2023 · 685f9d1 · 685f9d1
1 parent 05e7894
commit 685f9d1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,11 @@ test {
     }
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    withJavadocJar()
+    withSourcesJar()
+}
 
 project.ext.set('gradle.publish.key', System.getenv('GRADLE_PORTAL_KEY'))
 project.ext.set('gradle.publish.secret', System.getenv('GRADLE_PORTAL_SECRET'))
@@ -51,12 +55,6 @@ gradlePlugin {
     }
 }
 
-
-java {
-    withJavadocJar()
-    withSourcesJar()
-}
-
 afterEvaluate {
     publishing.publications.forEach {
         it.pom {

diff --git a/src/main/groovy/cz/augi/gradle/wartremover/WartremoverExtension.groovy b/src/main/groovy/cz/augi/gradle/wartremover/WartremoverExtension.groovy
@@ -1,7 +1,6 @@
 package cz.augi.gradle.wartremover
 
 import groovy.transform.CompileStatic
-import org.gradle.util.ConfigureUtil
 
 @CompileStatic
 class WartremoverExtension extends WartremoverSettings {
@@ -10,7 +9,14 @@ class WartremoverExtension extends WartremoverSettings {
         if (testValue == this) {
             testValue = this.deepClone()
         }
-        ConfigureUtil.configure(closure, testValue)
+        def closureToCall = (Closure)closure.clone()
+        closureToCall.setResolveStrategy(Closure.DELEGATE_FIRST)
+        closureToCall.setDelegate(testValue)
+        if (closureToCall.getMaximumNumberOfParameters() == 0) {
+            closureToCall.call()
+        } else {
+            closureToCall.call(testValue)
+        }
     }
     WartremoverSettings getTest() { testValue }
 }