root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.0.x' 

Closes gh-35038
This commit is contained in:
Andy Wilkinson 2023-04-17 17:52:11 +01:00
parent d6bbbb8bac df93b39f60
commit 2b4f565b76
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java
View File

@ -48,28 +48,31 @@ class KotlinPluginActionIntegrationTests {
@TestTemplate @TestTemplate
void kotlinVersionPropertyIsSet() { void kotlinVersionPropertyIsSet() {
String output = this.gradleBuild.build("kotlinVersion", "dependencies", "--configuration", "compileClasspath") String output = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1")
.build("kotlinVersion", "dependencies", "--configuration", "compileClasspath")
.getOutput(); .getOutput();
assertThat(output).containsPattern("Kotlin version: [0-9]\\.[0-9]\\.[0-9]+"); assertThat(output).containsPattern("Kotlin version: [0-9]\\.[0-9]\\.[0-9]+");
} }
@TestTemplate @TestTemplate
void kotlinCompileTasksUseJavaParametersFlagByDefault() { void kotlinCompileTasksUseJavaParametersFlagByDefault() {
assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput()) assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1")
.contains("compileKotlin java parameters: true") .build("kotlinCompileTasksJavaParameters")
.getOutput()).contains("compileKotlin java parameters: true")
.contains("compileTestKotlin java parameters: true"); .contains("compileTestKotlin java parameters: true");
} }
@TestTemplate @TestTemplate
void kotlinCompileTasksCanOverrideDefaultJavaParametersFlag() { void kotlinCompileTasksCanOverrideDefaultJavaParametersFlag() {
assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput()) assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1")
.contains("compileKotlin java parameters: false") .build("kotlinCompileTasksJavaParameters")
.getOutput()).contains("compileKotlin java parameters: false")
.contains("compileTestKotlin java parameters: false"); .contains("compileTestKotlin java parameters: false");
} }
@TestTemplate @TestTemplate
void taskConfigurationIsAvoided() throws IOException { void taskConfigurationIsAvoided() throws IOException {
BuildResult result = this.gradleBuild.build("help"); BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1").build("help");
String output = result.getOutput(); String output = result.getOutput();
BufferedReader reader = new BufferedReader(new StringReader(output)); BufferedReader reader = new BufferedReader(new StringReader(output));
String line; String line;

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
View File

@ -32,7 +32,7 @@ public final class GradleVersions {
} }
public static List<String> allCompatible() { public static List<String> allCompatible() {
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2"); return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.1");
} }
public static String minimumCompatible() { public static String minimumCompatible() {