Deprecate support for Gradle 6

Closes gh-1437
This commit is contained in:
Stephane Nicoll
2023-07-10 16:26:23 +02:00
parent 74419308bd
commit 8c5c50e196
2 changed files with 11 additions and 7 deletions

View File

@@ -139,6 +139,7 @@ public class GradleProjectGenerationConfiguration {
*/ */
@Configuration @Configuration
@ConditionalOnGradleVersion("6") @ConditionalOnGradleVersion("6")
@Deprecated
static class Gradle6ProjectGenerationConfiguration { static class Gradle6ProjectGenerationConfiguration {
@Bean @Bean

View File

@@ -37,6 +37,7 @@ public class ConditionalOnGradleVersionTests {
.withConfiguration(GradleVersionTestConfiguration.class); .withConfiguration(GradleVersionTestConfiguration.class);
@Test @Test
@Deprecated
void outcomeWithSpringBoot23() { void outcomeWithSpringBoot23() {
MutableProjectDescription description = new MutableProjectDescription(); MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.3.10.RELEASE")); description.setPlatformVersion(Version.parse("2.3.10.RELEASE"));
@@ -47,6 +48,7 @@ public class ConditionalOnGradleVersionTests {
} }
@Test @Test
@Deprecated
void outcomeWithSpringBoot24() { void outcomeWithSpringBoot24() {
MutableProjectDescription description = new MutableProjectDescription(); MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.4.0")); description.setPlatformVersion(Version.parse("2.4.0"));
@@ -132,10 +134,10 @@ public class ConditionalOnGradleVersionTests {
@Test @Test
void outcomeWithSpringBoot24AndMultipleGenerations() { void outcomeWithSpringBoot24AndMultipleGenerations() {
MutableProjectDescription description = new MutableProjectDescription(); MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.4.0")); description.setPlatformVersion(Version.parse("2.7.0"));
this.projectTester.withConfiguration(Gradle6Or7TestConfiguration.class) this.projectTester.withConfiguration(Gradle7Or8TestConfiguration.class)
.configure(description, .configure(description,
(context) -> assertThat(context).getBeanNames(String.class).containsOnly("gradle6", "gradle6Or7")); (context) -> assertThat(context).getBeanNames(String.class).containsOnly("gradle7", "gradle7Or8"));
} }
@Configuration @Configuration
@@ -143,6 +145,7 @@ public class ConditionalOnGradleVersionTests {
@Bean @Bean
@ConditionalOnGradleVersion("6") @ConditionalOnGradleVersion("6")
@Deprecated
String gradle6() { String gradle6() {
return "testGradle6"; return "testGradle6";
} }
@@ -162,12 +165,12 @@ public class ConditionalOnGradleVersionTests {
} }
@Configuration @Configuration
static class Gradle6Or7TestConfiguration { static class Gradle7Or8TestConfiguration {
@Bean @Bean
@ConditionalOnGradleVersion({ "6", "7" }) @ConditionalOnGradleVersion({ "7", "8" })
String gradle6Or7() { String gradle7Or8() {
return "testGradle6Or7"; return "testGradle7Or8";
} }
} }