Skip to content

Commit 8c5c50e

Browse files
committed
Deprecate support for Gradle 6
Closes gh-1437
1 parent 7441930 commit 8c5c50e

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ public GradleBuildProjectContributor gradleKtsBuildProjectContributor(KotlinDslG
139139
*/
140140
@Configuration
141141
@ConditionalOnGradleVersion("6")
142+
@Deprecated
142143
static class Gradle6ProjectGenerationConfiguration {
143144

144145
@Bean

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/ConditionalOnGradleVersionTests.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class ConditionalOnGradleVersionTests {
3737
.withConfiguration(GradleVersionTestConfiguration.class);
3838

3939
@Test
40+
@Deprecated
4041
void outcomeWithSpringBoot23() {
4142
MutableProjectDescription description = new MutableProjectDescription();
4243
description.setPlatformVersion(Version.parse("2.3.10.RELEASE"));
@@ -47,6 +48,7 @@ void outcomeWithSpringBoot23() {
4748
}
4849

4950
@Test
51+
@Deprecated
5052
void outcomeWithSpringBoot24() {
5153
MutableProjectDescription description = new MutableProjectDescription();
5254
description.setPlatformVersion(Version.parse("2.4.0"));
@@ -132,17 +134,18 @@ void outcomeWithNoAvailableSpringBootVersion() {
132134
@Test
133135
void outcomeWithSpringBoot24AndMultipleGenerations() {
134136
MutableProjectDescription description = new MutableProjectDescription();
135-
description.setPlatformVersion(Version.parse("2.4.0"));
136-
this.projectTester.withConfiguration(Gradle6Or7TestConfiguration.class)
137+
description.setPlatformVersion(Version.parse("2.7.0"));
138+
this.projectTester.withConfiguration(Gradle7Or8TestConfiguration.class)
137139
.configure(description,
138-
(context) -> assertThat(context).getBeanNames(String.class).containsOnly("gradle6", "gradle6Or7"));
140+
(context) -> assertThat(context).getBeanNames(String.class).containsOnly("gradle7", "gradle7Or8"));
139141
}
140142

141143
@Configuration
142144
static class GradleVersionTestConfiguration {
143145

144146
@Bean
145147
@ConditionalOnGradleVersion("6")
148+
@Deprecated
146149
String gradle6() {
147150
return "testGradle6";
148151
}
@@ -162,12 +165,12 @@ String gradle8() {
162165
}
163166

164167
@Configuration
165-
static class Gradle6Or7TestConfiguration {
168+
static class Gradle7Or8TestConfiguration {
166169

167170
@Bean
168-
@ConditionalOnGradleVersion({ "6", "7" })
169-
String gradle6Or7() {
170-
return "testGradle6Or7";
171+
@ConditionalOnGradleVersion({ "7", "8" })
172+
String gradle7Or8() {
173+
return "testGradle7Or8";
171174
}
172175

173176
}

0 commit comments

Comments
 (0)