mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Upgrade to Gradle 6.7
Closes gh-23754
This commit is contained in:
parent
a754b791a2
commit
633027b1cd
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@ -119,7 +119,7 @@ include::../gradle/packaging/spring-boot-dsl-main-class.gradle[tags=main-class]
|
|||||||
include::../gradle/packaging/spring-boot-dsl-main-class.gradle.kts[tags=main-class]
|
include::../gradle/packaging/spring-boot-dsl-main-class.gradle.kts[tags=main-class]
|
||||||
----
|
----
|
||||||
|
|
||||||
If the {application-plugin}[`application` plugin] has been applied its `mainClassName` project property must be configured and can be used for the same purpose:
|
If the {application-plugin}[`application` plugin] has been applied its `mainClass` property must be configured and can be used for the same purpose:
|
||||||
|
|
||||||
[source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
|
[source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
|
||||||
.Groovy
|
.Groovy
|
||||||
|
@ -56,7 +56,7 @@ include::../gradle/running/boot-run-disable-optimized-launch.gradle[tags=launch]
|
|||||||
include::../gradle/running/boot-run-disable-optimized-launch.gradle.kts[tags=launch]
|
include::../gradle/running/boot-run-disable-optimized-launch.gradle.kts[tags=launch]
|
||||||
----
|
----
|
||||||
|
|
||||||
If the {application-plugin}[`application` plugin] has been applied, its `mainClassName` property must be configured and can be used for the same purpose:
|
If the {application-plugin}[`application` plugin] has been applied, its `mainClass` property must be configured and can be used for the same purpose:
|
||||||
|
|
||||||
[source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
|
[source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
|
||||||
.Groovy
|
.Groovy
|
||||||
|
@ -5,5 +5,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// tag::main-class[]
|
// tag::main-class[]
|
||||||
mainClassName = 'com.example.ExampleApplication'
|
application {
|
||||||
|
mainClass = 'com.example.ExampleApplication'
|
||||||
|
}
|
||||||
// end::main-class[]
|
// end::main-class[]
|
||||||
|
@ -6,6 +6,6 @@ plugins {
|
|||||||
|
|
||||||
// tag::main-class[]
|
// tag::main-class[]
|
||||||
application {
|
application {
|
||||||
mainClassName = "com.example.ExampleApplication"
|
mainClass.set("com.example.ExampleApplication")
|
||||||
}
|
}
|
||||||
// end::main-class[]
|
// end::main-class[]
|
||||||
|
@ -6,7 +6,7 @@ plugins {
|
|||||||
|
|
||||||
// tag::main-class[]
|
// tag::main-class[]
|
||||||
application {
|
application {
|
||||||
mainClassName = 'com.example.ExampleApplication'
|
mainClass = 'com.example.ExampleApplication'
|
||||||
}
|
}
|
||||||
// end::main-class[]
|
// end::main-class[]
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ plugins {
|
|||||||
|
|
||||||
// tag::main-class[]
|
// tag::main-class[]
|
||||||
application {
|
application {
|
||||||
mainClassName = "com.example.ExampleApplication"
|
mainClass.set("com.example.ExampleApplication")
|
||||||
}
|
}
|
||||||
// end::main-class[]
|
// end::main-class[]
|
||||||
|
|
||||||
|
@ -45,10 +45,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio
|
|||||||
JavaVersion javaVersion = JavaVersion.current();
|
JavaVersion javaVersion = JavaVersion.current();
|
||||||
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_14)
|
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_14)
|
||||||
|| javaVersion.isCompatibleWith(JavaVersion.VERSION_13)) {
|
|| javaVersion.isCompatibleWith(JavaVersion.VERSION_13)) {
|
||||||
GRADLE_VERSIONS = Arrays.asList("6.3", "6.4.1", "6.5.1", "default", "6.7-rc-1");
|
GRADLE_VERSIONS = Arrays.asList("6.3", "6.4.1", "6.5.1", "6.6.1", "default");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
GRADLE_VERSIONS = Arrays.asList("5.6.4", "6.3", "6.4.1", "6.5.1", "default", "6.7-rc-1");
|
GRADLE_VERSIONS = Arrays.asList("5.6.4", "6.3", "6.4.1", "6.5.1", "6.6.1", "default");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user