File tree Expand file tree Collapse file tree 5 files changed +42
-2
lines changed
Expand file tree Collapse file tree 5 files changed +42
-2
lines changed Original file line number Diff line number Diff line change @@ -10,4 +10,6 @@ ver_OKIO=3.9.0
1010ver_KOTLIN_TEST =2.0.0
1111ver_KOTLIN_SERIALIZATION =1.7.3
1212# Kotest 5.4.0 is the oldest that we support
13- ver_KOTEST =5.4.0
13+ ver_KOTEST =5.4.0
14+
15+ ver_JVM_TARGET =11
Original file line number Diff line number Diff line change 1+ if (plugins. hasPlugin(' org.jetbrains.kotlin.jvm' )) {
2+ kotlin {
3+ compileKotlin {
4+ kotlinOptions {
5+ jvmTarget = " $ver_JVM_TARGET "
6+ }
7+ }
8+ compileTestKotlin {
9+ kotlinOptions {
10+ jvmTarget = " $ver_JVM_TARGET "
11+ }
12+ }
13+ }
14+ java {
15+ sourceCompatibility = JavaVersion . toVersion(" $ver_JVM_TARGET " )
16+ targetCompatibility = JavaVersion . toVersion(" $ver_JVM_TARGET " )
17+ }
18+ } else if (plugins. hasPlugin(' org.jetbrains.kotlin.multiplatform' )) {
19+ kotlin {
20+ jvm {
21+ compilations. all {
22+ kotlinOptions {
23+ jvmTarget = " $ver_JVM_TARGET "
24+ }
25+ }
26+ }
27+ targets. withType(org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget ) {
28+ compilations. all {
29+ kotlinOptions {
30+ jvmTarget = " $ver_JVM_TARGET "
31+ }
32+ }
33+ }
34+ }
35+ }
Original file line number Diff line number Diff line change @@ -58,4 +58,5 @@ tasks.create('test') {
5858
5959// it all needs to get published and formatted
6060apply from : 干. file(' base/maven.gradle' )
61- apply from : 干. file(' base/sonatype.gradle' )
61+ apply from : 干. file(' base/sonatype.gradle' )
62+ apply from : rootProject. file(' gradle/jvm-target.gradle' )
Original file line number Diff line number Diff line change 3535// it all needs to get published and formatted
3636apply from : 干. file(' base/maven.gradle' )
3737apply from : 干. file(' base/sonatype.gradle' )
38+ apply from : rootProject. file(' gradle/jvm-target.gradle' )
Original file line number Diff line number Diff line change @@ -59,3 +59,4 @@ jvmTest {
5959// it all needs to get published and formatted
6060apply from : 干. file(' base/maven.gradle' )
6161apply from : 干. file(' base/sonatype.gradle' )
62+ apply from : rootProject. file(' gradle/jvm-target.gradle' )
You can’t perform that action at this time.
0 commit comments