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

Compile Kotlin code with a JVM target of 17 

Closes gh-29956
This commit is contained in:
Stephane Nicoll 2022-03-08 12:43:54 +01:00
parent 099e811a38
commit 0a81c238c2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java
View File

@ -31,7 +31,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
* <li>{@link KotlinCompile} tasks are configured to: * <li>{@link KotlinCompile} tasks are configured to:
* <ul> * <ul>
* <li>Use {@code apiVersion} and {@code languageVersion} 1.6. * <li>Use {@code apiVersion} and {@code languageVersion} 1.6.
* <li>Use {@code jvmTarget} 1.8. * <li>Use {@code jvmTarget} 17.
* <li>Treat all warnings as errors * <li>Treat all warnings as errors
* <li>Suppress version warnings * <li>Suppress version warnings
* </ul> * </ul>
@ -52,7 +52,7 @@ class KotlinConventions {
KotlinJvmOptions kotlinOptions = compile.getKotlinOptions(); KotlinJvmOptions kotlinOptions = compile.getKotlinOptions();
kotlinOptions.setApiVersion("1.6"); kotlinOptions.setApiVersion("1.6");
kotlinOptions.setLanguageVersion("1.6"); kotlinOptions.setLanguageVersion("1.6");
kotlinOptions.setJvmTarget("1.8"); kotlinOptions.setJvmTarget("17");
kotlinOptions.setAllWarningsAsErrors(true); kotlinOptions.setAllWarningsAsErrors(true);
List<String> freeCompilerArgs = new ArrayList<>(compile.getKotlinOptions().getFreeCompilerArgs()); List<String> freeCompilerArgs = new ArrayList<>(compile.getKotlinOptions().getFreeCompilerArgs());
freeCompilerArgs.add("-Xsuppress-version-warnings"); freeCompilerArgs.add("-Xsuppress-version-warnings");