bump Kotlin to 1.9.23, enable additional Kotlin Multiplatform targets (#15)
* bump Kotlin to 1.9.23, enable additional Kotlin Multiplatform targets * replace soon-to-be-deprecated kotlinOptions with newer compilerOptions
This commit is contained in:
parent
171570159e
commit
8890fef665
6 changed files with 134 additions and 173 deletions
|
@ -3,7 +3,9 @@ package buildsrc.conventions.lang
|
|||
import buildsrc.utils.Rife2TestListener
|
||||
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
|
||||
import org.gradle.api.tasks.testing.logging.TestLogEvent
|
||||
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
|
||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
|
||||
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
|
||||
|
||||
|
@ -24,29 +26,21 @@ plugins {
|
|||
kotlin {
|
||||
//jvmToolchain(11)
|
||||
|
||||
targets.configureEach {
|
||||
compilations.configureEach {
|
||||
kotlinOptions {
|
||||
languageVersion = "1.6"
|
||||
}
|
||||
}
|
||||
applyDefaultHierarchyTemplate()
|
||||
|
||||
@OptIn(ExperimentalKotlinGradlePluginApi::class)
|
||||
compilerOptions {
|
||||
languageVersion = KotlinVersion.KOTLIN_1_6
|
||||
}
|
||||
|
||||
// configure all Kotlin/JVM Tests to use JUnit
|
||||
targets.withType<KotlinJvmTarget>().configureEach {
|
||||
testRuns.configureEach {
|
||||
executionTask.configure {
|
||||
useJUnitPlatform()
|
||||
useJUnitPlatform()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets.configureEach {
|
||||
languageSettings {
|
||||
// languageVersion =
|
||||
// apiVersion =
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue