Skip to content

Commit a2cf2cd

Browse files
committed
Raise the minimum supported version of Gradle to 4.4
Closes gh-14418
1 parent 576cc79 commit a2cf2cd

File tree

11 files changed

+20
-22
lines changed

11 files changed

+20
-22
lines changed

spring-boot-project/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ Advanced configuration options and examples are available in the
168168
== Spring Boot Gradle Plugin
169169
The Spring Boot Gradle Plugin provides Spring Boot support in Gradle, letting you package
170170
executable jar or war archives, run Spring Boot applications, and use the dependency
171-
management provided by `spring-boot-dependencies`. It requires Gradle 4.0 or later. Please
171+
management provided by `spring-boot-dependencies`. It requires Gradle 4.4 or later. Please
172172
refer to the plugin's documentation to learn more:
173173

174174
* Reference ({spring-boot-gradle-plugin}/reference/html[HTML] and

spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Explicit build support is provided for the following build tools:
5050
|3.2+
5151

5252
|Gradle
53-
|4.x
53+
|4.4+
5454
|===
5555

5656

@@ -199,8 +199,8 @@ scope.
199199

200200
[[getting-started-gradle-installation]]
201201
==== Gradle Installation
202-
Spring Boot is compatible with Gradle 4. If you do not already have Gradle installed, you
203-
can follow the instructions at https://gradle.org.
202+
Spring Boot is compatible with Gradle 4.4 and later. If you do not already have Gradle
203+
installed, you can follow the instructions at https://gradle.org.
204204

205205
Spring Boot dependencies can be declared by using the `org.springframework.boot` `group`.
206206
Typically, your project declares dependencies to one or more
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Jul 27 14:32:22 BST 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/gradlew

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Andy Wilkinson
3737
The Spring Boot Gradle Plugin provides Spring Boot support in https://gradle.org[Gradle],
3838
allowing you to package executable jar or war archives, run Spring Boot applications, and
3939
use the dependency management provided by `spring-boot-dependencies`. Spring Boot's
40-
Gradle plugin requires Gradle 4.0 or later.
40+
Gradle plugin requires Gradle 4.4 or later.
4141

4242
In addition to this user guide, {api-documentation}[API documentation] is also available.
4343

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public void apply(Project project) {
8484
}
8585

8686
private void verifyGradleVersion() {
87-
if (GradleVersion.current().compareTo(GradleVersion.version("4.0")) < 0) {
88-
throw new GradleException("Spring Boot plugin requires Gradle 4.0 or later."
87+
if (GradleVersion.current().compareTo(GradleVersion.version("4.4")) < 0) {
88+
throw new GradleException("Spring Boot plugin requires Gradle 4.4 or later."
8989
+ " The current version is " + GradleVersion.current());
9090
}
9191
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
*/
5454
class BootZipCopyAction implements CopyAction {
5555

56-
private static final long CONSTANT_TIME_FOR_ZIP_ENTRIES = new GregorianCalendar(1980,
56+
static final long CONSTANT_TIME_FOR_ZIP_ENTRIES = new GregorianCalendar(1980,
5757
Calendar.FEBRUARY, 1, 0, 0, 0).getTimeInMillis();
5858

5959
private final File output;

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
*/
3939
public final class GradleCompatibilitySuite extends Suite {
4040

41-
private static final List<String> GRADLE_VERSIONS = Arrays.asList("default", "4.1",
42-
"4.2", "4.3", "4.4.1", "4.5.1", "4.6", "4.7", "4.8.1", "4.9", "4.10");
41+
private static final List<String> GRADLE_VERSIONS = Arrays.asList("default", "4.5.1",
42+
"4.6", "4.7", "4.8.1", "4.9", "4.10");
4343

4444
public GradleCompatibilitySuite(Class<?> clazz) throws InitializationError {
4545
super(clazz, createRunners(clazz));

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ public class SpringBootPluginIntegrationTests {
3939

4040
@Test
4141
public void failFastWithVersionOfGradleLowerThanRequired() {
42-
BuildResult result = this.gradleBuild.gradleVersion("3.5.1").buildAndFail();
43-
assertThat(result.getOutput()).contains("Spring Boot plugin requires Gradle 4.0"
44-
+ " or later. The current version is Gradle 3.5.1");
42+
BuildResult result = this.gradleBuild.gradleVersion("4.3").buildAndFail();
43+
assertThat(result.getOutput()).contains("Spring Boot plugin requires Gradle 4.4"
44+
+ " or later. The current version is Gradle 4.3");
4545
}
4646

4747
@Test
4848
public void succeedWithVersionOfGradleHigherThanRequired() {
49-
this.gradleBuild.gradleVersion("4.0.1").build();
49+
this.gradleBuild.gradleVersion("4.4.1").build();
5050
}
5151

5252
@Test
5353
public void succeedWithVersionOfGradleMatchingWhatIsRequired() {
54-
this.gradleBuild.gradleVersion("4.0").build();
54+
this.gradleBuild.gradleVersion("4.4").build();
5555
}
5656

5757
@Test

0 commit comments

Comments
 (0)