aboutsummaryrefslogtreecommitdiff
path: root/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
diff options
context:
space:
mode:
authoraSemy <897017+aSemy@users.noreply.github.com>2023-03-16 20:18:16 +0100
committerGitHub <noreply@github.com>2023-03-16 20:18:16 +0100
commit18d01bf269a88c0fba0ae860a1fda644d31a37c2 (patch)
tree013fb2bf6d7f4a77d4a7f4ff91a762ffb0bfe0a2 /build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
parent12e2a3c6b8bf1533148ddf29c77e73f5045754a6 (diff)
downloaddokka-18d01bf269a88c0fba0ae860a1fda644d31a37c2.tar.gz
dokka-18d01bf269a88c0fba0ae860a1fda644d31a37c2.tar.bz2
dokka-18d01bf269a88c0fba0ae860a1fda644d31a37c2.zip
Fix test runtime Java versions (#2918)
Fixes #2917 Co-authored-by: Goooler <wangzongler@gmail.com>
Diffstat (limited to 'build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts')
-rw-r--r--build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts7
1 files changed, 2 insertions, 5 deletions
diff --git a/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
index c40ce57c..c07fc092 100644
--- a/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
+++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
@@ -1,7 +1,6 @@
package org.jetbrains.conventions
import org.jetbrains.configureDokkaVersion
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
@@ -12,8 +11,6 @@ plugins {
configureDokkaVersion()
-val language_version: String by project
-
tasks.withType<KotlinCompile>().configureEach {
compilerOptions {
freeCompilerArgs.addAll(
@@ -26,7 +23,7 @@ tasks.withType<KotlinCompile>().configureEach {
)
)
allWarningsAsErrors.set(true)
- languageVersion.set(KotlinVersion.fromVersion(language_version))
- apiVersion.set(KotlinVersion.fromVersion(language_version))
+ languageVersion.set(dokkaBuild.kotlinLanguageLevel)
+ apiVersion.set(dokkaBuild.kotlinLanguageLevel)
}
}