Use fixated Kotlin compiler 2.0.20 for compiling Dokka

Kotlin · Nov 1, 2024 · 866ae14 · 866ae14
1 parent 0ddbc9c
commit 866ae14
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 2 deletions.
diff --git a/build-logic/src/main/kotlin/dokkabuild.gradle-plugin.gradle.kts b/build-logic/src/main/kotlin/dokkabuild.gradle-plugin.gradle.kts
@@ -3,6 +3,7 @@
  */
 
 import dokkabuild.utils.excludeGradleEmbeddedDependencies
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
@@ -12,10 +13,13 @@ plugins {
 }
 
 kotlin {
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    compilerVersion = libs.versions.gradlePlugin.kotlin.compiler
+    @Suppress("DEPRECATION", "DEPRECATION_ERROR")
     compilerOptions {
         // Must use Kotlin 1.4 to support Gradle 7
-        languageVersion = @Suppress("DEPRECATION") KotlinVersion.KOTLIN_1_4
-        apiVersion = @Suppress("DEPRECATION") KotlinVersion.KOTLIN_1_4
+        languageVersion = KotlinVersion.KOTLIN_1_4
+        apiVersion = KotlinVersion.KOTLIN_1_4
     }
 }
 

diff --git a/build-logic/src/main/kotlin/dokkabuild.kotlin-jvm.gradle.kts b/build-logic/src/main/kotlin/dokkabuild.kotlin-jvm.gradle.kts
@@ -2,6 +2,8 @@
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     id("dokkabuild.java")
     kotlin("jvm")
@@ -11,6 +13,11 @@ val rootProjectsWithoutDependencyOnDokkaCore = listOf("dokka-integration-tests")
 
 kotlin {
     explicitApi()
+
+    if (dokkaBuild.kotlinLanguageLevel.isPresent) {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerVersion = libs.versions.gradlePlugin.kotlin.compiler
+    }
     compilerOptions {
         allWarningsAsErrors = true
         languageVersion = dokkaBuild.kotlinLanguageLevel

diff --git a/dokka-runners/dokka-gradle-plugin/gradle.properties b/dokka-runners/dokka-gradle-plugin/gradle.properties
@@ -9,6 +9,7 @@ version=2.0.20-SNAPSHOT
 org.jetbrains.dokka.javaToolchain.mainCompiler=8
 org.jetbrains.dokka.javaToolchain.testLauncher=8
 org.jetbrains.dokka.kotlinLanguageLevel=1.4
+kotlin.compiler.runViaBuildToolsApi=true
 
 # Gradle settings
 org.gradle.jvmargs=-Dfile.encoding=UTF-8

diff --git a/dokka-runners/runner-cli/gradle.properties b/dokka-runners/runner-cli/gradle.properties
@@ -9,3 +9,4 @@ version=2.0.20-SNAPSHOT
 org.jetbrains.dokka.javaToolchain.mainCompiler=8
 org.jetbrains.dokka.javaToolchain.testLauncher=8
 org.jetbrains.dokka.kotlinLanguageLevel=1.4
+kotlin.compiler.runViaBuildToolsApi=true
diff --git a/dokka-runners/runner-maven-plugin/gradle.properties b/dokka-runners/runner-maven-plugin/gradle.properties
@@ -7,3 +7,4 @@ version=2.0.20-SNAPSHOT
 org.jetbrains.dokka.javaToolchain.mainCompiler=8
 org.jetbrains.dokka.javaToolchain.testLauncher=8
 org.jetbrains.dokka.kotlinLanguageLevel=1.4
+kotlin.compiler.runViaBuildToolsApi=true
diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,7 @@ version=2.0.20-SNAPSHOT
 org.jetbrains.dokka.javaToolchain.mainCompiler=8
 org.jetbrains.dokka.javaToolchain.testLauncher=8
 org.jetbrains.dokka.kotlinLanguageLevel=1.4
+kotlin.compiler.runViaBuildToolsApi=true
 
 # Code style
 kotlin.code.style=official

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,9 @@
 [versions]
 
 gradlePlugin-kotlin = "2.0.20"
+# We use a different compiler version to use Kotlin Language/API version 1.4 to compile modules
+# to be able to be compatible with Gradle 7.
+gradlePlugin-kotlin-compiler = "2.0.20"
 # See: https://kotlinlang.org/docs/gradle-configure-project.html#apply-the-plugin
 gradlePlugin-android = "7.1.3"
 gradlePlugin-dokka = "1.9.20"