Merge pull request #1292 from vpavic

snicoll · snicoll · commit 97e556186e9b · 2022-01-22T13:29:23.000+01:00
* pr/1292: Update copyright year of changed files Ensure Gradle tasks are configured lazily Closes gh-1292
diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java
@@ -129,7 +129,7 @@ void buildDotGradleIsContributedWhenGeneratingGradleProject() {
 				"    testImplementation 'org.springframework.boot:spring-boot-starter-test'",
 				"}",
 				"",
-				"test {",
+				"tasks.named('test') {",
 				"    useJUnitPlatform()",
 				"}"); // @formatter:on
 	}
@@ -150,7 +150,8 @@ void junitPlatformIsConfiguredWithCompatibleVersion() {
 		description.setPlatformVersion(Version.parse("2.2.4.RELEASE"));
 		description.setLanguage(new JavaLanguage());
 		ProjectStructure project = this.projectTester.generate(description);
-		assertThat(project).textFile("build.gradle").lines().containsSequence("test {", "    useJUnitPlatform()", "}");
+		assertThat(project).textFile("build.gradle").lines().containsSequence("tasks.named('test') {",
+				"    useJUnitPlatform()", "}");
 	}
 
 	@Test
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen
@@ -25,6 +25,6 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen
@@ -25,6 +25,6 @@ dependencyManagement {
 	}
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen
@@ -27,6 +27,6 @@ dependencyManagement {
 	}
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen
@@ -19,6 +19,6 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen
@@ -29,6 +29,6 @@ tasks.withType(KotlinCompile) {
 	}
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen
@@ -20,6 +20,6 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen
@@ -18,6 +18,6 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen
@@ -22,6 +22,6 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen
@@ -18,6 +18,6 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen
@@ -20,6 +20,6 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen
@@ -17,6 +17,6 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen
@@ -19,6 +19,6 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen
@@ -29,6 +29,6 @@ tasks.withType(KotlinCompile) {
 	}
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen
@@ -31,6 +31,6 @@ tasks.withType(KotlinCompile) {
 	}
 }
 
-test {
+tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -190,7 +190,7 @@ protected void writeTasks(IndentingWriter writer, GradleTaskContainer tasks) {
 		});
 		tasks.values().filter((candidate) -> candidate.getType() == null).forEach((task) -> {
 			writer.println();
-			writer.println(task.getName() + " {");
+			writer.println("tasks.named('" + task.getName() + "') {");
 			writer.indented(() -> writeTaskCustomization(writer, task));
 			writer.println("}");
 		});
diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriterTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -170,15 +170,16 @@ void gradleBuildWithTaskCustomizedWithInvocations() {
 			task.invoke("dependsOn", "test");
 		});
 		List<String> lines = generateBuild(build);
-		assertThat(lines).containsSequence("asciidoctor {", "    inputs.dir snippetsDir", "    dependsOn test", "}");
+		assertThat(lines).containsSequence("tasks.named('asciidoctor') {", "    inputs.dir snippetsDir",
+				"    dependsOn test", "}");
 	}
 
 	@Test
 	void gradleBuildWithTaskCustomizedWithInvocationAndNoArgument() {
 		GradleBuild build = new GradleBuild();
 		build.tasks().customize("test", (task) -> task.invoke("myMethod"));
 		List<String> lines = generateBuild(build);
-		assertThat(lines).containsSequence("test {", "    myMethod()", "}");
+		assertThat(lines).containsSequence("tasks.named('test') {", "    myMethod()", "}");
 	}
 
 	@Test
@@ -189,7 +190,7 @@ void gradleBuildWithTaskCustomizedWithAssignments() {
 			task.attribute("kotlinOptions.jvmTarget", "'1.8'");
 		});
 		List<String> lines = generateBuild(build);
-		assertThat(lines).containsSequence("compileKotlin {",
+		assertThat(lines).containsSequence("tasks.named('compileKotlin') {",
 				"    kotlinOptions.freeCompilerArgs = ['-Xjsr305=strict']", "    kotlinOptions.jvmTarget = '1.8'", "}");
 	}
 
@@ -202,7 +203,7 @@ void gradleBuildWithTaskCustomizedWithNestedCustomization() {
 					kotlinOptions.attribute("jvmTarget", "'1.8'");
 				}));
 		List<String> lines = generateBuild(build);
-		assertThat(lines).containsSequence("compileKotlin {", "    kotlinOptions {",
+		assertThat(lines).containsSequence("tasks.named('compileKotlin') {", "    kotlinOptions {",
 				"        freeCompilerArgs = ['-Xjsr305=strict']", "        jvmTarget = '1.8'", "    }", "}");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ dependencies {`
`25`	`25`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`26`	`26`	`}`
`27`	`27`
`28`		`-test {`
	`28`	`+tasks.named('test') {`
`29`	`29`	`useJUnitPlatform()`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ dependencyManagement {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-test {`
	`28`	`+tasks.named('test') {`
`29`	`29`	`useJUnitPlatform()`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ dependencyManagement {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`-test {`
	`30`	`+tasks.named('test') {`
`31`	`31`	`useJUnitPlatform()`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ dependencies {`
`19`	`19`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`20`	`20`	`}`
`21`	`21`
`22`		`-test {`
	`22`	`+tasks.named('test') {`
`23`	`23`	`useJUnitPlatform()`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ tasks.withType(KotlinCompile) {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`-test {`
	`32`	`+tasks.named('test') {`
`33`	`33`	`useJUnitPlatform()`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ dependencies {`
`20`	`20`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`21`	`21`	`}`
`22`	`22`
`23`		`-test {`
	`23`	`+tasks.named('test') {`
`24`	`24`	`useJUnitPlatform()`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ dependencies {`
`18`	`18`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`19`	`19`	`}`
`20`	`20`
`21`		`-test {`
	`21`	`+tasks.named('test') {`
`22`	`22`	`useJUnitPlatform()`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ dependencies {`
`22`	`22`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`23`	`23`	`}`
`24`	`24`
`25`		`-test {`
	`25`	`+tasks.named('test') {`
`26`	`26`	`useJUnitPlatform()`
`27`	`27`	`}`