chore: Gradle updated to v8

avast · Aug 9, 2023 · ea8f5e1 · tkrah · Aug 9, 2023 · augi
1 parent 178316b
commit ea8f5e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -87,19 +87,17 @@ nexusPublishing {
 
 project.ext.set('gradle.publish.key', System.getenv('GRADLE_PORTAL_KEY'))
 project.ext.set('gradle.publish.secret', System.getenv('GRADLE_PORTAL_SECRET'))
-pluginBundle {
-    website = 'https://github.com/avast/gradle-docker-compose-plugin'
-    vcsUrl = 'https://github.com/avast/gradle-docker-compose-plugin'
-    tags = ['docker', 'docker-compose']
-}
 
 gradlePlugin {
+    website = 'https://github.com/avast/gradle-docker-compose-plugin'
+    vcsUrl = 'https://github.com/avast/gradle-docker-compose-plugin'
     plugins {
         dockerComposePlugin {
             id = 'com.avast.gradle.docker-compose'
             displayName = 'Gradle Docker Compose plugin'
             description = 'Simplifies usage of Docker Compose for integration testing in Gradle environment.'
             implementationClass = 'com.avast.gradle.dockercompose.DockerComposePlugin'
+            tags.set(['docker', 'docker-compose'])
         }
     }
 }
diff --git 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-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/groovy/com/avast/gradle/dockercompose/ComposeExtension.groovy b/src/main/groovy/com/avast/gradle/dockercompose/ComposeExtension.groovy
@@ -48,7 +48,10 @@ abstract class ComposeExtension extends ComposeSettings {
             s
         } else if (args.length == 1 && args[0] instanceof Closure) {
             ComposeSettings s = getOrCreateNested(name)
-            ConfigureUtil.configure(args[0] as Closure, s)
+            Closure closure = (Closure)args[0].clone()
+            closure.setResolveStrategy(Closure.DELEGATE_FIRST)
+            closure.setDelegate(s)
+            closure.call(s)
             s
         } else {
             getOrCreateNested(name)