Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
db79fe8b
Commit
db79fe8b
authored
Apr 10, 2021
by
dreis2211
Committed by
Stephane Nicoll
Apr 10, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Test our Gradle Plugin against Gradle 7.0
See gh-25997
parent
f03f74ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
GradleCompatibilityExtension.java
...ework/boot/gradle/junit/GradleCompatibilityExtension.java
+2
-2
GradleMultiDslExtension.java
...gframework/boot/gradle/junit/GradleMultiDslExtension.java
+1
-1
No files found.
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
View file @
db79fe8b
...
...
@@ -48,10 +48,10 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex
static
{
JavaVersion
javaVersion
=
JavaVersion
.
current
();
if
(
javaVersion
.
isCompatibleWith
(
JavaVersion
.
VERSION_16
))
{
GRADLE_VERSIONS
=
Arrays
.
asList
(
"7.0
-rc-2
"
);
GRADLE_VERSIONS
=
Arrays
.
asList
(
"7.0"
);
}
else
{
GRADLE_VERSIONS
=
Arrays
.
asList
(
"6.3"
,
"6.4.1"
,
"6.5.1"
,
"6.6.1"
,
"6.7.1"
,
"current"
,
"7.0
-rc-2
"
);
GRADLE_VERSIONS
=
Arrays
.
asList
(
"6.3"
,
"6.4.1"
,
"6.5.1"
,
"6.6.1"
,
"6.7.1"
,
"current"
,
"7.0"
);
}
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
View file @
db79fe8b
...
...
@@ -63,7 +63,7 @@ public class GradleMultiDslExtension implements TestTemplateInvocationContextPro
GradleBuild
gradleBuild
=
new
GradleBuild
(
this
.
dsl
);
JavaVersion
javaVersion
=
JavaVersion
.
current
();
if
(
javaVersion
.
isCompatibleWith
(
JavaVersion
.
VERSION_16
))
{
gradleBuild
.
gradleVersion
(
"7.0
-rc-1
"
);
gradleBuild
.
gradleVersion
(
"7.0"
);
}
return
Arrays
.
asList
(
new
GradleBuildFieldSetter
(
gradleBuild
),
new
GradleBuildExtension
());
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment