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
94ca2d1e
Commit
94ca2d1e
authored
Apr 30, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Test the Gradle plugin against Gradle 6.9-rc-1
Closes gh-26267
parent
07358c6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
GradleCompatibilityExtension.java
...ework/boot/gradle/junit/GradleCompatibilityExtension.java
+2
-2
GradleBuild.java
.../org/springframework/boot/gradle/testkit/GradleBuild.java
+1
-0
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 @
94ca2d1e
...
@@ -45,10 +45,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio
...
@@ -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"
,
"6.6.1"
,
"6.7.1"
,
"default"
);
GRADLE_VERSIONS
=
Arrays
.
asList
(
"6.3"
,
"6.4.1"
,
"6.5.1"
,
"6.6.1"
,
"6.7.1"
,
"default"
,
"6.9-rc-1"
);
}
}
else
{
else
{
GRADLE_VERSIONS
=
Arrays
.
asList
(
"5.6.4"
,
"6.3"
,
"6.4.1"
,
"6.5.1"
,
"6.6.1"
,
"6.7.1"
,
"default"
);
GRADLE_VERSIONS
=
Arrays
.
asList
(
"5.6.4"
,
"6.3"
,
"6.4.1"
,
"6.5.1"
,
"6.6.1"
,
"6.7.1"
,
"default"
,
"6.9-rc-1"
);
}
}
}
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java
View file @
94ca2d1e
...
@@ -152,6 +152,7 @@ public class GradleBuild {
...
@@ -152,6 +152,7 @@ public class GradleBuild {
.
replace
(
"{version}"
,
getBootVersion
())
.
replace
(
"{version}"
,
getBootVersion
())
.
replace
(
"{dependency-management-plugin-version}"
,
getDependencyManagementPluginVersion
());
.
replace
(
"{dependency-management-plugin-version}"
,
getDependencyManagementPluginVersion
());
FileCopyUtils
.
copy
(
scriptContent
,
new
FileWriter
(
new
File
(
this
.
projectDir
,
"build"
+
this
.
dsl
.
getExtension
())));
FileCopyUtils
.
copy
(
scriptContent
,
new
FileWriter
(
new
File
(
this
.
projectDir
,
"build"
+
this
.
dsl
.
getExtension
())));
new
File
(
this
.
projectDir
,
"settings.gradle"
).
createNewFile
();
FileSystemUtils
.
copyRecursively
(
new
File
(
"src/test/resources/repository"
),
FileSystemUtils
.
copyRecursively
(
new
File
(
"src/test/resources/repository"
),
new
File
(
this
.
projectDir
,
"repository"
));
new
File
(
this
.
projectDir
,
"repository"
));
GradleRunner
gradleRunner
=
GradleRunner
.
create
().
withProjectDir
(
this
.
projectDir
)
GradleRunner
gradleRunner
=
GradleRunner
.
create
().
withProjectDir
(
this
.
projectDir
)
...
...
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