Restore support for Gradle 3

While new scopes are available as of Gradle 3.4, the Spring Boot plugin
does not manage them in the `1.5.x` line. This commit introduces a
dedicated GradleBuildWriter for Gradle 3 that uses the previous scopes.

Closes gh-845

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleBuildProjectContributor.java

@@ -35,17 +35,17 @@ import io.spring.initializr.generator.spring.build.BuildWriter;
  */
 public class GradleBuildProjectContributor implements BuildWriter, ProjectContributor {
 
+	private final GradleBuildWriter buildWriter;
+
 	private final GradleBuild build;
 
 	private final IndentingWriterFactory indentingWriterFactory;
 
-	private final GradleBuildWriter buildWriter;
-
-	GradleBuildProjectContributor(GradleBuild build,
+	GradleBuildProjectContributor(GradleBuildWriter buildWriter, GradleBuild build,
 			IndentingWriterFactory indentingWriterFactory) {
+		this.buildWriter = buildWriter;
 		this.build = build;
 		this.indentingWriterFactory = indentingWriterFactory;
-		this.buildWriter = new GradleBuildWriter();
 	}
 
 	@Override

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java

@@ -20,8 +20,10 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import io.spring.initializr.generator.buildsystem.BuildItemResolver;
+import io.spring.initializr.generator.buildsystem.gradle.Gradle3BuildWriter;
 import io.spring.initializr.generator.buildsystem.gradle.GradleBuild;
 import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem;
+import io.spring.initializr.generator.buildsystem.gradle.GradleBuildWriter;
 import io.spring.initializr.generator.condition.ConditionalOnBuildSystem;
 import io.spring.initializr.generator.condition.ConditionalOnLanguage;
 import io.spring.initializr.generator.condition.ConditionalOnPackaging;
@@ -104,8 +106,9 @@ public class GradleProjectGenerationConfiguration {
 
 	@Bean
 	public GradleBuildProjectContributor gradleBuildProjectContributor(
-			GradleBuild build) {
-		return new GradleBuildProjectContributor(build, this.indentingWriterFactory);
+			GradleBuildWriter buildWriter, GradleBuild build) {
+		return new GradleBuildProjectContributor(buildWriter, build,
+				this.indentingWriterFactory);
 	}
 
 	/**
@@ -115,6 +118,11 @@ public class GradleProjectGenerationConfiguration {
 	@ConditionalOnGradleVersion("3")
 	static class Gradle3ProjectGenerationConfiguration {
 
+		@Bean
+		public Gradle3BuildWriter gradleBuildWriter() {
+			return new Gradle3BuildWriter();
+		}
+
 		@Bean
 		public GradleWrapperContributor gradle3WrapperContributor() {
 			return new GradleWrapperContributor("3");
@@ -146,6 +154,11 @@ public class GradleProjectGenerationConfiguration {
 	@ConditionalOnGradleVersion("4")
 	static class Gradle4ProjectGenerationConfiguration {
 
+		@Bean
+		public GradleBuildWriter gradleBuildWriter() {
+			return new GradleBuildWriter();
+		}
+
 		@Bean
 		public GradleWrapperContributor gradle4WrapperContributor() {
 			return new GradleWrapperContributor("4");

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

@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import io.spring.initializr.generator.buildsystem.gradle.GradleBuild;
+import io.spring.initializr.generator.buildsystem.gradle.GradleBuildWriter;
 import io.spring.initializr.generator.io.IndentingWriterFactory;
 import io.spring.initializr.generator.io.SimpleIndentStrategy;
 import org.junit.jupiter.api.Test;
@@ -42,7 +43,7 @@ class GradleBuildProjectContributorTests {
 	void gradleBuildIsContributedInProjectStructure(@TempDir Path projectDir)
 			throws IOException {
 		GradleBuild build = new GradleBuild();
-		new GradleBuildProjectContributor(build,
+		new GradleBuildProjectContributor(new GradleBuildWriter(), build,
 				IndentingWriterFactory.withDefaultSettings()).contribute(projectDir);
 		Path buildGradle = projectDir.resolve("build.gradle");
 		assertThat(buildGradle).isRegularFile();
@@ -80,8 +81,8 @@ class GradleBuildProjectContributorTests {
 	private List<String> generateBuild(GradleBuild build,
 			IndentingWriterFactory indentingWriterFactory) throws IOException {
 		StringWriter writer = new StringWriter();
-		new GradleBuildProjectContributor(build, indentingWriterFactory)
-				.writeBuild(writer);
+		new GradleBuildProjectContributor(new GradleBuildWriter(), build,
+				indentingWriterFactory).writeBuild(writer);
 		return Arrays.asList(writer.toString().split("\\r?\\n"));
 	}
 

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

@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter'
-	implementation 'org.codehaus.groovy:groovy'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	compile 'org.springframework.boot:spring-boot-starter'
+	compile 'org.codehaus.groovy:groovy'
+	testCompile 'org.springframework.boot:spring-boot-starter-test'
 }

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

@@ -22,6 +22,6 @@ repositories {
 }
 
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	compile 'org.springframework.boot:spring-boot-starter'
+	testCompile 'org.springframework.boot:spring-boot-starter-test'
 }

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

@@ -23,10 +23,10 @@ repositories {
 }
 
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter'
-	implementation 'org.jetbrains.kotlin:kotlin-reflect'
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	compile 'org.springframework.boot:spring-boot-starter'
+	compile 'org.jetbrains.kotlin:kotlin-reflect'
+	compile 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+	testCompile 'org.springframework.boot:spring-boot-starter-test'
 }
 
 compileKotlin {