Skip to content

Commit ea8f5e1

Browse files
committed
chore: Gradle updated to v8
1 parent 178316b commit ea8f5e1

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,17 @@ nexusPublishing {
8787

8888
project.ext.set('gradle.publish.key', System.getenv('GRADLE_PORTAL_KEY'))
8989
project.ext.set('gradle.publish.secret', System.getenv('GRADLE_PORTAL_SECRET'))
90-
pluginBundle {
91-
website = 'https://github.com/avast/gradle-docker-compose-plugin'
92-
vcsUrl = 'https://github.com/avast/gradle-docker-compose-plugin'
93-
tags = ['docker', 'docker-compose']
94-
}
9590

9691
gradlePlugin {
92+
website = 'https://github.com/avast/gradle-docker-compose-plugin'
93+
vcsUrl = 'https://github.com/avast/gradle-docker-compose-plugin'
9794
plugins {
9895
dockerComposePlugin {
9996
id = 'com.avast.gradle.docker-compose'
10097
displayName = 'Gradle Docker Compose plugin'
10198
description = 'Simplifies usage of Docker Compose for integration testing in Gradle environment.'
10299
implementationClass = 'com.avast.gradle.dockercompose.DockerComposePlugin'
100+
tags.set(['docker', 'docker-compose'])
103101
}
104102
}
105103
}
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-7.6.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/groovy/com/avast/gradle/dockercompose/ComposeExtension.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ abstract class ComposeExtension extends ComposeSettings {
4848
s
4949
} else if (args.length == 1 && args[0] instanceof Closure) {
5050
ComposeSettings s = getOrCreateNested(name)
51-
ConfigureUtil.configure(args[0] as Closure, s)
51+
Closure closure = (Closure)args[0].clone()
52+
closure.setResolveStrategy(Closure.DELEGATE_FIRST)
53+
closure.setDelegate(s)
54+
closure.call(s)
5255
s
5356
} else {
5457
getOrCreateNested(name)

0 commit comments

Comments
 (0)