Merge branch 'main' into release

Jolanrensen · Jolanrensen · commit f1f405f7a157 · 2022-08-01T14:00:29.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,5 @@
 @file:Suppress("UnstableApiUsage")
 
-import org.jetbrains.dokka.gradle.DokkaTask
-
 buildscript {
     repositories {
         mavenCentral()
@@ -31,7 +29,6 @@ repositories {
     mavenCentral()
 }
 
-
 allprojects {
     plugins.withId(mavenPublishBase) {
         group = Versions.groupID
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -32,9 +32,12 @@ dependencies {
     }
 }
 
-tasks.withType<ScalaCompile> {
-    sourceSets {
-        targetCompatibility = Versions.jvmTarget
+
+java {
+    toolchain {
+        languageVersion.set(
+            JavaLanguageVersion.of(Versions.jvmTarget)
+        )
     }
 }
 
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
@@ -31,8 +31,10 @@ dependencies {
     }
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = Versions.jvmTarget
+kotlin {
+    jvmToolchain {
+        languageVersion.set(
+            JavaLanguageVersion.of(Versions.jvmTarget)
+        )
     }
 }
diff --git a/jupyter/build.gradle.kts b/jupyter/build.gradle.kts
@@ -136,9 +136,11 @@ tasks.compileTestKotlin {
     }
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = Versions.jvmTarget
+kotlin {
+    jvmToolchain {
+        languageVersion.set(
+            JavaLanguageVersion.of(Versions.jvmTarget)
+        )
     }
 }
 
diff --git a/kotlin-spark-api/build.gradle.kts b/kotlin-spark-api/build.gradle.kts
@@ -4,7 +4,6 @@ import com.igormaznitsa.jcp.gradle.JcpTask
 import com.vanniktech.maven.publish.JavadocJar.Dokka
 import com.vanniktech.maven.publish.KotlinJvm
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin
@@ -135,9 +134,11 @@ tasks.compileTestKotlin {
     }
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = Versions.jvmTarget
+kotlin {
+    jvmToolchain {
+        languageVersion.set(
+            JavaLanguageVersion.of(Versions.jvmTarget)
+        )
     }
 }
 
diff --git a/scala-tuples-in-kotlin/build.gradle.kts b/scala-tuples-in-kotlin/build.gradle.kts
@@ -40,12 +40,15 @@ dependencies {
 }
 
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = Versions.jvmTarget
+kotlin {
+    jvmToolchain {
+        languageVersion.set(
+            JavaLanguageVersion.of(Versions.jvmTarget)
+        )
     }
 }
 
+
 tasks.withType<AbstractDokkaLeafTask> {
     dokkaSourceSets {
         all {

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,12 @@ dependencies {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`-tasks.withType<ScalaCompile> {`
`36`		`- sourceSets {`
`37`		`- targetCompatibility = Versions.jvmTarget`
	`35`	`+`
	`36`	`+java {`
	`37`	`+ toolchain {`
	`38`	`+ languageVersion.set(`
	`39`	`+ JavaLanguageVersion.of(Versions.jvmTarget)`
	`40`	`+ )`
`38`	`41`	`}`
`39`	`42`	`}`
`40`	`43`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,10 @@ dependencies {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`-tasks.withType<KotlinCompile> {`
`35`		`- kotlinOptions {`
`36`		`- jvmTarget = Versions.jvmTarget`
	`34`	`+kotlin {`
	`35`	`+ jvmToolchain {`
	`36`	`+ languageVersion.set(`
	`37`	`+ JavaLanguageVersion.of(Versions.jvmTarget)`
	`38`	`+ )`
`37`	`39`	`}`
`38`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,11 @@ tasks.compileTestKotlin {`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`-tasks.withType<KotlinCompile> {`
`140`		`- kotlinOptions {`
`141`		`- jvmTarget = Versions.jvmTarget`
	`139`	`+kotlin {`
	`140`	`+ jvmToolchain {`
	`141`	`+ languageVersion.set(`
	`142`	`+ JavaLanguageVersion.of(Versions.jvmTarget)`
	`143`	`+ )`
`142`	`144`	`}`
`143`	`145`	`}`
`144`	`146`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import com.igormaznitsa.jcp.gradle.JcpTask`
`4`	`4`	`import com.vanniktech.maven.publish.JavadocJar.Dokka`
`5`	`5`	`import com.vanniktech.maven.publish.KotlinJvm`
`6`	`6`	`import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask`
`7`		`-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`8`	`7`
`9`	`8`	`plugins {`
`10`	`9`	`kotlin`
`@@ -135,9 +134,11 @@ tasks.compileTestKotlin {`
`135`	`134`	`}`
`136`	`135`	`}`
`137`	`136`
`138`		`-tasks.withType<KotlinCompile> {`
`139`		`- kotlinOptions {`
`140`		`- jvmTarget = Versions.jvmTarget`
	`137`	`+kotlin {`
	`138`	`+ jvmToolchain {`
	`139`	`+ languageVersion.set(`
	`140`	`+ JavaLanguageVersion.of(Versions.jvmTarget)`
	`141`	`+ )`
`141`	`142`	`}`
`142`	`143`	`}`
`143`	`144`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,15 @@ dependencies {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`
`43`		`-tasks.withType<KotlinCompile> {`
`44`		`- kotlinOptions {`
`45`		`- jvmTarget = Versions.jvmTarget`
	`43`	`+kotlin {`
	`44`	`+ jvmToolchain {`
	`45`	`+ languageVersion.set(`
	`46`	`+ JavaLanguageVersion.of(Versions.jvmTarget)`
	`47`	`+ )`
`46`	`48`	`}`
`47`	`49`	`}`
`48`	`50`
	`51`	`+`
`49`	`52`	`tasks.withType<AbstractDokkaLeafTask> {`
`50`	`53`	`dokkaSourceSets {`
`51`	`54`	`all {`