Add support for Gradle 5

Closes gh-847

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

@@ -155,13 +155,36 @@ public class GradleProjectGenerationConfiguration {
 	static class Gradle4ProjectGenerationConfiguration {
 
 		@Bean
-		public GradleBuildWriter gradleBuildWriter() {
-			return new GradleBuildWriter();
+		public GradleWrapperContributor gradle4WrapperContributor() {
+			return new GradleWrapperContributor("4");
 		}
 
+	}
+
+	/**
+	 * Configuration specific to projects using Gradle 5.
+	 */
+	@Configuration
+	@ConditionalOnGradleVersion("5")
+	static class Gradle5ProjectGenerationConfiguration {
+
 		@Bean
 		public GradleWrapperContributor gradle4WrapperContributor() {
-			return new GradleWrapperContributor("4");
+			return new GradleWrapperContributor("5");
+		}
+
+	}
+
+	/**
+	 * Configuration specific to projects using Gradle 4 or 5.
+	 */
+	@Configuration
+	@ConditionalOnGradleVersion({ "4", "5" })
+	static class Gradle4Or5ProjectGenerationConfiguration {
+
+		@Bean
+		public GradleBuildWriter gradleBuildWriter() {
+			return new GradleBuildWriter();
 		}
 
 		@Bean

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

@@ -40,7 +40,10 @@ public class OnGradleVersionCondition extends ProjectGenerationCondition {
 			.parseRange("[1.5.0.M1,2.0.0.M1)");
 
 	private static final VersionRange GRADLE_4_VERSION_RANGE = VersionParser.DEFAULT
-			.parseRange("2.0.0.M1");
+			.parseRange("[2.0.0.M1, 2.1.0.M1)");
+
+	private static final VersionRange GRADLE_5_VERSION_RANGE = VersionParser.DEFAULT
+			.parseRange("2.1.0.M1");
 
 	@Override
 	protected boolean matches(ResolvedProjectDescription projectDescription,
@@ -66,6 +69,9 @@ public class OnGradleVersionCondition extends ProjectGenerationCondition {
 		else if (GRADLE_4_VERSION_RANGE.match(platformVersion)) {
 			return "4";
 		}
+		else if (GRADLE_5_VERSION_RANGE.match(platformVersion)) {
+			return "5";
+		}
 		else {
 			return null;
 		}

initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

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

@@ -47,13 +47,21 @@ public class ConditionalOnGradleVersionTests {
 	}
 
 	@Test
-	void outcomeWithSpringBoot2() {
+	void outcomeWithSpringBoot20() {
 		ProjectDescription projectDescription = new ProjectDescription();
 		projectDescription.setPlatformVersion(Version.parse("2.0.9.RELEASE"));
 		String bean = outcomeFor(projectDescription);
 		assertThat(bean).isEqualTo("testGradle4");
 	}
 
+	@Test
+	void outcomeWithSpringBoot21() {
+		ProjectDescription projectDescription = new ProjectDescription();
+		projectDescription.setPlatformVersion(Version.parse("2.1.3.RELEASE"));
+		String bean = outcomeFor(projectDescription);
+		assertThat(bean).isEqualTo("testGradle5");
+	}
+
 	@Test
 	void outcomeWithNoMatch() {
 		ProjectDescription projectDescription = new ProjectDescription();
@@ -83,7 +91,7 @@ public class ConditionalOnGradleVersionTests {
 	}
 
 	@Test
-	void outcomeWithSpringBoot2AndMultipleGenerations() {
+	void outcomeWithSpringBoot20AndMultipleGenerations() {
 		ProjectDescription projectDescription = new ProjectDescription();
 		projectDescription.setPlatformVersion(Version.parse("2.0.9.RELEASE"));
 		Map<String, String> candidates = candidatesFor(projectDescription,
@@ -91,6 +99,15 @@ public class ConditionalOnGradleVersionTests {
 		assertThat(candidates).containsOnlyKeys("gradle4", "gradle3AndLater");
 	}
 
+	@Test
+	void outcomeWithSpringBoot21AndMultipleNonMatchingGenerations() {
+		ProjectDescription projectDescription = new ProjectDescription();
+		projectDescription.setPlatformVersion(Version.parse("2.1.3.RELEASE"));
+		Map<String, String> candidates = candidatesFor(projectDescription,
+				Gradle3Or4TestConfiguration.class);
+		assertThat(candidates).containsOnlyKeys("gradle5");
+	}
+
 	private String outcomeFor(ProjectDescription projectDescription) {
 		return this.projectTester.generate(projectDescription,
 				(projectGenerationContext) -> {
@@ -121,6 +138,12 @@ public class ConditionalOnGradleVersionTests {
 			return "testGradle4";
 		}
 
+		@Bean
+		@ConditionalOnGradleVersion("5")
+		public String gradle5() {
+			return "testGradle5";
+		}
+
 	}
 
 	@Configuration

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

@@ -41,6 +41,9 @@ import io.spring.initializr.metadata.InitializrMetadata;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import org.springframework.util.StreamUtils;
 
@@ -67,39 +70,35 @@ class GradleProjectGenerationConfigurationTests {
 						.setBuildSystem(new GradleBuildSystem()));
 	}
 
-	@Test
-	void buildWriterIsContributed() {
+	static Stream<Arguments> supportedPlatformVersions() {
+		return Stream.of(Arguments.arguments("1.5.17.RELEASE"),
+				Arguments.arguments("2.0.6.RELEASE"),
+				Arguments.arguments("2.1.3.RELEASE"));
+	}
+
+	@ParameterizedTest(name = "Spring Boot {0}")
+	@MethodSource("supportedPlatformVersions")
+	void buildWriterIsContributed(String platformVersion) {
 		ProjectDescription description = new ProjectDescription();
-		description.setPlatformVersion(Version.parse("2.1.0.RELEASE"));
+		description.setPlatformVersion(Version.parse(platformVersion));
 		description.setLanguage(new JavaLanguage());
 		BuildWriter buildWriter = this.projectTester.generate(description,
 				(context) -> context.getBean(BuildWriter.class));
 		assertThat(buildWriter).isInstanceOf(GradleBuildProjectContributor.class);
 	}
 
-	@Test
-	void gradle3WrapperIsContributedWhenGeneratingGradleProjectWithBoot15()
-			throws IOException {
-		ProjectDescription description = new ProjectDescription();
-		description.setPlatformVersion(Version.parse("1.5.17.RELEASE"));
-		description.setLanguage(new JavaLanguage());
-		ProjectStructure projectStructure = this.projectTester.generate(description);
-		List<String> relativePaths = projectStructure.getRelativePathsOfProjectFiles();
-		assertThat(relativePaths).contains("gradlew", "gradlew.bat",
-				"gradle/wrapper/gradle-wrapper.properties",
-				"gradle/wrapper/gradle-wrapper.jar");
-		try (Stream<String> lines = Files.lines(
-				projectStructure.resolve("gradle/wrapper/gradle-wrapper.properties"))) {
-			assertThat(lines.filter((line) -> line.contains("gradle-3.5.1-bin.zip")))
-					.hasSize(1);
-		}
+	static Stream<Arguments> gradleWrapperParameters() {
+		return Stream.of(Arguments.arguments("1.5.17.RELEASE", "3.5.1"),
+				Arguments.arguments("2.0.6.RELEASE", "4.10.2"),
+				Arguments.arguments("2.1.3.RELEASE", "5.2.1"));
 	}
 
-	@Test
-	void gradle4WrapperIsContributedWhenGeneratingGradleProjectWithBoot20()
-			throws IOException {
+	@ParameterizedTest(name = "Spring Boot {0}")
+	@MethodSource("gradleWrapperParameters")
+	void gradleWrapperIsContributedWhenGeneratingGradleProject(String platformVersion,
+			String expectedGradleVersion) throws IOException {
 		ProjectDescription description = new ProjectDescription();
-		description.setPlatformVersion(Version.parse("2.0.6.RELEASE"));
+		description.setPlatformVersion(Version.parse(platformVersion));
 		description.setLanguage(new JavaLanguage());
 		ProjectStructure projectStructure = this.projectTester.generate(description);
 		List<String> relativePaths = projectStructure.getRelativePathsOfProjectFiles();
@@ -108,8 +107,9 @@ class GradleProjectGenerationConfigurationTests {
 				"gradle/wrapper/gradle-wrapper.jar");
 		try (Stream<String> lines = Files.lines(
 				projectStructure.resolve("gradle/wrapper/gradle-wrapper.properties"))) {
-			assertThat(lines.filter((line) -> line.contains("gradle-4.10.2-bin.zip")))
-					.hasSize(1);
+			assertThat(lines.filter((line) -> line
+					.contains(String.format("gradle-%s-bin.zip", expectedGradleVersion))))
+							.hasSize(1);
 		}
 	}
 

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

@@ -41,7 +41,8 @@ class GradleWrapperContributorTests {
 	Path directory;
 
 	static Stream<Arguments> parameters() {
-		return Stream.of(Arguments.arguments("3"), Arguments.arguments("4"));
+		return Stream.of(Arguments.arguments("3"), Arguments.arguments("4"),
+				Arguments.arguments("5"));
 	}
 
 	@ParameterizedTest(name = "Gradle {0}")