File tree Expand file tree Collapse file tree 3 files changed +3
-25
lines changed
buildSrc/src/main/java/org/springframework/boot/build
spring-boot-project/spring-boot
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux-coroutines Expand file tree Collapse file tree 3 files changed +3
-25
lines changed Original file line number Diff line number Diff line change 11/*
2- * Copyright 2012-2021 the original author or authors.
2+ * Copyright 2012-2022 the original author or authors.
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
3131 * <li>{@link KotlinCompile} tasks are configured to:
3232 * <ul>
3333 * <li>Use {@code apiVersion} and {@code languageVersion} 1.3.
34+ * <li>Use {@code jvmTarget} 1.8.
3435 * <li>Treat all warnings as errors
3536 * <li>Suppress version warnings
3637 * </ul>
@@ -48,6 +49,7 @@ void apply(Project project) {
4849 KotlinJvmOptions kotlinOptions = compile .getKotlinOptions ();
4950 kotlinOptions .setApiVersion ("1.3" );
5051 kotlinOptions .setLanguageVersion ("1.3" );
52+ kotlinOptions .setJvmTarget ("1.8" );
5153 kotlinOptions .setAllWarningsAsErrors (true );
5254 List <String > freeCompilerArgs = new ArrayList <>(compile .getKotlinOptions ().getFreeCompilerArgs ());
5355 freeCompilerArgs .add ("-Xsuppress-version-warnings" );
Original file line number Diff line number Diff line change @@ -161,18 +161,6 @@ sourceSets {
161161 }
162162}
163163
164- compileKotlin {
165- kotlinOptions {
166- jvmTarget = 1.8
167- }
168- }
169-
170- compileTestKotlin {
171- kotlinOptions {
172- jvmTarget = 1.8
173- }
174- }
175-
176164toolchain {
177165 testJvmArgs. add(" --add-opens=java.base/java.net=ALL-UNNAMED" )
178166}
Original file line number Diff line number Diff line change @@ -6,18 +6,6 @@ plugins {
66
77description = " Spring Boot WebFlux coroutines smoke test"
88
9- compileKotlin {
10- kotlinOptions {
11- jvmTarget = " 1.8"
12- }
13- }
14-
15- compileTestKotlin {
16- kotlinOptions {
17- jvmTarget = " 1.8"
18- }
19- }
20-
219dependencies {
2210 implementation(project(" :spring-boot-project:spring-boot-starters:spring-boot-starter-webflux" ))
2311 implementation(" com.fasterxml.jackson.module:jackson-module-kotlin" )
You can’t perform that action at this time.
0 commit comments