Set jvmTarget to 1.8 and Kotlin API target to 1.3 (#920)

raniejade · web-flow · commit 0cb4d2ef0adc · 2020-08-28T23:29:49.000+10:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 import java.nio.file.Files
 import java.nio.file.Paths
 
@@ -29,6 +31,22 @@ allprojects {
         releaseMode = true
     }
     project.extra["releaseMode"] = releaseMode
+
+    afterEvaluate {
+        tasks.withType<KotlinCompile<*>> {
+            if (this is KotlinJvmCompile) {
+                kotlinOptions {
+                    apiVersion = "1.3"
+                    jvmTarget = "1.8"
+                }
+            } else {
+                kotlinOptions {
+                    // KN requires 1.4
+                    apiVersion = "1.4"
+                }
+            }
+        }
+    }
 }
 
 listOf("check", "build", "clean").forEach { taskName ->
diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts
@@ -22,7 +22,7 @@ kotlin {
     val commonTest by getting {
       dependencies {
         implementation("org.spekframework.spek2:spek-dsl")
-        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8-1.4.0-rc")
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
         implementation("org.spekframework.spek2:spek-runtime")
         implementation(kotlin("test"))
       }
@@ -32,7 +32,7 @@ kotlin {
       compilations["test"].defaultSourceSet {
         dependencies {
           runtimeOnly(kotlin("reflect"))
-          implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.8-1.4.0-rc")
+          implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9")
           implementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.0.0")
           implementation("org.mockito:mockito-core:2.23.4")
           runtimeOnly("org.spekframework.spek2:spek-runner-junit5")
