Skip to content

Commit 27fc9d4

Browse files
vpavicsnicoll
authored andcommitted
Ensure Gradle tasks are configured lazily
At present, generated Gradle build scripts that use Groovy DSL configure tasks eagerly. This is both suboptimal and actually not aligned with the generated build scripts that use Kotlin DSL, which configures tasks lazily. This commit updates `GroovyDslGradleBuildWriter` to ensure tasks are configured lazily. See gh-1292
1 parent 35e41a8 commit 27fc9d4

File tree

17 files changed

+24
-22
lines changed

17 files changed

+24
-22
lines changed

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void buildDotGradleIsContributedWhenGeneratingGradleProject() {
129129
" testImplementation 'org.springframework.boot:spring-boot-starter-test'",
130130
"}",
131131
"",
132-
"test {",
132+
"tasks.named('test') {",
133133
" useJUnitPlatform()",
134134
"}"); // @formatter:on
135135
}
@@ -150,7 +150,8 @@ void junitPlatformIsConfiguredWithCompatibleVersion() {
150150
description.setPlatformVersion(Version.parse("2.2.4.RELEASE"));
151151
description.setLanguage(new JavaLanguage());
152152
ProjectStructure project = this.projectTester.generate(description);
153-
assertThat(project).textFile("build.gradle").lines().containsSequence("test {", " useJUnitPlatform()", "}");
153+
assertThat(project).textFile("build.gradle").lines().containsSequence("tasks.named('test') {",
154+
" useJUnitPlatform()", "}");
154155
}
155156

156157
@Test

initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ dependencies {
2525
testImplementation 'org.springframework.boot:spring-boot-starter-test'
2626
}
2727

28-
test {
28+
tasks.named('test') {
2929
useJUnitPlatform()
3030
}

initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ dependencyManagement {
2525
}
2626
}
2727

28-
test {
28+
tasks.named('test') {
2929
useJUnitPlatform()
3030
}

initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ dependencyManagement {
2727
}
2828
}
2929

30-
test {
30+
tasks.named('test') {
3131
useJUnitPlatform()
3232
}

initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ dependencies {
1919
testImplementation 'org.springframework.boot:spring-boot-starter-test'
2020
}
2121

22-
test {
22+
tasks.named('test') {
2323
useJUnitPlatform()
2424
}

initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ tasks.withType(KotlinCompile) {
2929
}
3030
}
3131

32-
test {
32+
tasks.named('test') {
3333
useJUnitPlatform()
3434
}

initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ dependencies {
2020
testImplementation 'org.springframework.boot:spring-boot-starter-test'
2121
}
2222

23-
test {
23+
tasks.named('test') {
2424
useJUnitPlatform()
2525
}

initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ dependencies {
1818
testImplementation 'org.springframework.boot:spring-boot-starter-test'
1919
}
2020

21-
test {
21+
tasks.named('test') {
2222
useJUnitPlatform()
2323
}

initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ dependencies {
2222
testImplementation 'org.springframework.boot:spring-boot-starter-test'
2323
}
2424

25-
test {
25+
tasks.named('test') {
2626
useJUnitPlatform()
2727
}

initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ dependencies {
1818
testImplementation 'org.springframework.boot:spring-boot-starter-test'
1919
}
2020

21-
test {
21+
tasks.named('test') {
2222
useJUnitPlatform()
2323
}

0 commit comments

Comments
 (0)