From ea8f5e11333f441d247b076f19eaad04cb4cfd74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20August=C3=BDn?= <michal.augustyn@gendigital.com>
Date: Wed, 9 Aug 2023 09:23:56 +0200
Subject: [PATCH] chore: Gradle updated to v8

---
 build.gradle                                              | 8 +++-----
 gradle/wrapper/gradle-wrapper.properties                  | 2 +-
 .../avast/gradle/dockercompose/ComposeExtension.groovy    | 5 ++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 365a83d..22ff1a0 100644
--- 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
index 98debb8..84a0b92 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-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
index 5e1eba9..45ebebc 100644
--- 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)