Skip to content

Commit 2d9177d

Browse files
committed
Merge branch '2.6.x' into 2.7.x
Closes gh-29955
2 parents 288533b + 3614c8d commit 2d9177d

File tree

3 files changed

+1
-24
lines changed

3 files changed

+1
-24
lines changed

buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
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>

spring-boot-project/spring-boot/build.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -180,18 +180,6 @@ sourceSets {
180180
}
181181
}
182182

183-
compileKotlin {
184-
kotlinOptions {
185-
jvmTarget = 1.8
186-
}
187-
}
188-
189-
compileTestKotlin {
190-
kotlinOptions {
191-
jvmTarget = 1.8
192-
}
193-
}
194-
195183
toolchain {
196184
testJvmArgs.add("--add-opens=java.base/java.net=ALL-UNNAMED")
197185
}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux-coroutines/build.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@ plugins {
66

77
description = "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-
219
dependencies {
2210
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-webflux"))
2311
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")

0 commit comments

Comments
 (0)