Skip to content

Commit 633027b

Browse files
committed
Upgrade to Gradle 6.7
Closes gh-23754
1 parent a754b79 commit 633027b

File tree

8 files changed

+11
-9
lines changed

8 files changed

+11
-9
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ include::../gradle/packaging/spring-boot-dsl-main-class.gradle[tags=main-class]
119119
include::../gradle/packaging/spring-boot-dsl-main-class.gradle.kts[tags=main-class]
120120
----
121121

122-
If the {application-plugin}[`application` plugin] has been applied its `mainClassName` project property must be configured and can be used for the same purpose:
122+
If the {application-plugin}[`application` plugin] has been applied its `mainClass` property must be configured and can be used for the same purpose:
123123

124124
[source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
125125
.Groovy

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/running.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ include::../gradle/running/boot-run-disable-optimized-launch.gradle[tags=launch]
5656
include::../gradle/running/boot-run-disable-optimized-launch.gradle.kts[tags=launch]
5757
----
5858

59-
If the {application-plugin}[`application` plugin] has been applied, its `mainClassName` property must be configured and can be used for the same purpose:
59+
If the {application-plugin}[`application` plugin] has been applied, its `mainClass` property must be configured and can be used for the same purpose:
6060

6161
[source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
6262
.Groovy

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/application-plugin-main-class.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ plugins {
55
}
66

77
// tag::main-class[]
8-
mainClassName = 'com.example.ExampleApplication'
8+
application {
9+
mainClass = 'com.example.ExampleApplication'
10+
}
911
// end::main-class[]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/application-plugin-main-class.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ plugins {
66

77
// tag::main-class[]
88
application {
9-
mainClassName = "com.example.ExampleApplication"
9+
mainClass.set("com.example.ExampleApplication")
1010
}
1111
// end::main-class[]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/application-plugin-main-class-name.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
// tag::main-class[]
88
application {
9-
mainClassName = 'com.example.ExampleApplication'
9+
mainClass = 'com.example.ExampleApplication'
1010
}
1111
// end::main-class[]
1212

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/application-plugin-main-class-name.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
// tag::main-class[]
1010
application {
11-
mainClassName = "com.example.ExampleApplication"
11+
mainClass.set("com.example.ExampleApplication")
1212
}
1313
// end::main-class[]
1414

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio
4545
JavaVersion javaVersion = JavaVersion.current();
4646
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_14)
4747
|| javaVersion.isCompatibleWith(JavaVersion.VERSION_13)) {
48-
GRADLE_VERSIONS = Arrays.asList("6.3", "6.4.1", "6.5.1", "default", "6.7-rc-1");
48+
GRADLE_VERSIONS = Arrays.asList("6.3", "6.4.1", "6.5.1", "6.6.1", "default");
4949
}
5050
else {
51-
GRADLE_VERSIONS = Arrays.asList("5.6.4", "6.3", "6.4.1", "6.5.1", "default", "6.7-rc-1");
51+
GRADLE_VERSIONS = Arrays.asList("5.6.4", "6.3", "6.4.1", "6.5.1", "6.6.1", "default");
5252
}
5353
}
5454

0 commit comments

Comments
 (0)