Merge branch 'main' into release

Author: Jolanrensen

buildSrc/build.gradle.kts

@@ -1,4 +1,5 @@
 import org.gradle.kotlin.dsl.`kotlin-dsl`
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
  `kotlin-dsl`

core/build.gradle.kts

@@ -32,6 +32,12 @@ dependencies {
  }
 }
 
+tasks.withType<ScalaCompile> {
+ sourceSets {
+ targetCompatibility = Versions.jvmTarget
+ }
+}
+
 val scalaMainSources = sourceSets.main.get().scala.sourceDirectories
 
 val preprocessMain by tasks.creating(JcpTask::class) {

jupyter/build.gradle.kts

@@ -138,7 +138,7 @@ tasks.compileTestKotlin {
 
 tasks.withType<KotlinCompile> {
  kotlinOptions {
- jvmTarget = "11"
+ jvmTarget = Versions.jvmTarget
  }
 }
 

kotlin-spark-api/build.gradle.kts

@@ -137,7 +137,7 @@ tasks.compileTestKotlin {
 
 tasks.withType<KotlinCompile> {
  kotlinOptions {
- jvmTarget = "11"
+ jvmTarget = Versions.jvmTarget
  }
 }
 

scala-tuples-in-kotlin/build.gradle.kts

@@ -42,7 +42,7 @@ dependencies {
 
 tasks.withType<KotlinCompile> {
  kotlinOptions {
- jvmTarget = "11"
+ jvmTarget = Versions.jvmTarget
  }
 }