Configure JVM toolchain directly in the kotlin block (#4808)

Author: osipxd

build-logic/src/main/kotlin/ktorbuild.kmp.gradle.kts

@@ -4,6 +4,7 @@
 
 @file:OptIn(ExperimentalKotlinGradlePluginApi::class)
 
+import ktorbuild.KtorBuildExtension
 import ktorbuild.internal.*
 import ktorbuild.internal.gradle.maybeNamed
 import ktorbuild.targets.*
@@ -18,6 +19,7 @@ plugins {
 }
 
 kotlin {
+    jvmToolchain(KtorBuildExtension.DEFAULT_JDK)
     explicitApi()
 
     compilerOptions {
@@ -29,15 +31,6 @@ kotlin {
 
     applyHierarchyTemplate(KtorTargets.hierarchyTemplate)
     addTargets(ktorBuild.targets)
-
-    // Specify JVM toolchain later to prevent it from being evaluated before it was configured.
-    // TODO: Remove `afterEvaluate` when the BCV issue triggering JVM toolchain evaluation is fixed
-    //   https://github.com/Kotlin/binary-compatibility-validator/issues/286
-    afterEvaluate {
-        jvmToolchain {
-            languageVersion = ktorBuild.jvmToolchain
-        }
-    }
 }
 
 val targets = ktorBuild.targets

build-logic/src/main/kotlin/ktorbuild/KtorBuildExtension.kt

@@ -4,22 +4,18 @@
 
 package ktorbuild
 
-import ktorbuild.internal.gradle.finalizedOnRead
 import ktorbuild.targets.KtorTargets
 import org.gradle.api.JavaVersion
 import org.gradle.api.model.ObjectFactory
-import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.kotlin.dsl.newInstance
-import org.gradle.kotlin.dsl.property
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import javax.inject.Inject
 
-abstract class KtorBuildExtension(
-    objects: ObjectFactory,
+abstract class KtorBuildExtension private constructor(
     providers: ProviderFactory,
     val targets: KtorTargets,
 ) {
@@ -28,7 +24,7 @@ abstract class KtorBuildExtension(
     constructor(
         objects: ObjectFactory,
         providers: ProviderFactory,
-    ) : this(objects, providers, targets = objects.newInstance())
+    ) : this(providers, targets = objects.newInstance())
 
     private val buildingOnTeamCity: Provider<Boolean> =
         providers.environmentVariable("TEAMCITY_VERSION").map(String::isNotBlank)
@@ -39,19 +35,6 @@ abstract class KtorBuildExtension(
             .orElse(buildingOnTeamCity)
             .orElse(false)
 
-    /**
-     * The JDK version to be used to build the project.
-     * By default, the minimal supported JDK version is used.
-     */
-    val jvmToolchain: Property<JavaLanguageVersion> =
-        objects.property<JavaLanguageVersion>()
-            .convention(DEFAULT_JDK)
-            .finalizedOnRead()
-
-    fun jvmToolchain(version: Int) {
-        jvmToolchain.set(JavaLanguageVersion.of(version))
-    }
-
     /**
      * The JDK version to be used for testing.
      *
@@ -93,12 +76,12 @@ abstract class KtorBuildExtension(
         const val NAME = "ktorBuild"
 
         /** The default (minimal) JDK version used for building the project. */
-        private val DEFAULT_JDK = JavaLanguageVersion.of(8)
+        const val DEFAULT_JDK = 8
 
-        /** The default (minimal) Kotlin version used as API version. */
+        /** The default (minimal) Kotlin version used as an API version. */
         private val DEFAULT_KOTLIN_API_VERSION = KotlinVersion.KOTLIN_2_0
 
-        /** The default Kotlin version used as Language version. */
+        /** The default Kotlin version used as a Language version. */
         private val DEFAULT_KOTLIN_LANGUAGE_VERSION = KotlinVersion.KOTLIN_2_1
     }
 }

build-logic/src/main/kotlin/ktorbuild/internal/Accessors.kt

@@ -6,6 +6,7 @@ package ktorbuild.internal
 
 import ktorbuild.KtorBuildExtension
 import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.kotlin.dsl.getByType
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
@@ -16,5 +17,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 internal val Project.ktorBuild: KtorBuildExtension get() = extensions.getByType()
 
+internal val Project.java: JavaPluginExtension get() = extensions.getByType()
+
 internal fun Project.kotlin(configure: KotlinMultiplatformExtension.() -> Unit) =
     extensions.configure("kotlin", configure)

build-logic/src/main/kotlin/ktorbuild/internal/gradle/Property.kt

@@ -6,6 +6,7 @@ package ktorbuild.targets
 
 import ktorbuild.ProjectTag
 import ktorbuild.addProjectTag
+import ktorbuild.internal.java
 import ktorbuild.internal.kotlin
 import ktorbuild.internal.ktorBuild
 import ktorbuild.internal.libs
@@ -44,7 +45,7 @@ private fun Project.configureTests() {
         maxHeapSize = "2g"
         exclude("**/*StressTest*")
         useJUnitPlatform()
-        configureJavaToolchain(ktorBuild.jvmToolchain, ktorBuild.jvmTestToolchain)
+        configureJavaToolchain(java.toolchain.languageVersion, ktorBuild.jvmTestToolchain)
     }
 
     tasks.register<Test>("stressTest") {
@@ -57,7 +58,7 @@ private fun Project.configureTests() {
         systemProperty("enable.stress.tests", "true")
         include("**/*StressTest*")
         useJUnitPlatform()
-        configureJavaToolchain(ktorBuild.jvmToolchain, ktorBuild.jvmTestToolchain)
+        configureJavaToolchain(java.toolchain.languageVersion, ktorBuild.jvmTestToolchain)
     }
 }
 

build-logic/src/main/kotlin/ktorbuild/targets/JvmConfig.kt

@@ -7,12 +7,10 @@ plugins {
     id("test-server")
 }
 
-ktorBuild {
+kotlin {
     // Package java.net.http was introduced in Java 11
     jvmToolchain(11)
-}
 
-kotlin {
     sourceSets {
         jvmMain.dependencies {
             api(project(":ktor-client:ktor-client-core"))

ktor-client/ktor-client-java/build.gradle.kts

@@ -8,12 +8,10 @@ plugins {
     id("ktorbuild.project.library")
 }
 
-ktorBuild {
+kotlin {
     // The minimal JVM version required for Jetty 10+
     jvmToolchain(11)
-}
 
-kotlin {
     sourceSets {
         jvmMain.dependencies {
             api(project(":ktor-client:ktor-client-core"))

ktor-client/ktor-client-jetty-jakarta/build.gradle.kts

@@ -8,12 +8,10 @@ plugins {
     id("ktorbuild.project.library")
 }
 
-ktorBuild {
+kotlin {
     // The minimal JVM version required for Jetty 10+
     jvmToolchain(11)
-}
 
-kotlin {
     sourceSets {
         jvmMain.dependencies {
             api(project(":ktor-server:ktor-server-core"))

ktor-server/ktor-server-jetty-jakarta/build.gradle.kts

@@ -8,12 +8,10 @@ plugins {
     id("ktorbuild.project.internal")
 }
 
-ktorBuild {
+kotlin {
     // The minimal JVM version required for Jetty 10+
     jvmToolchain(11)
-}
 
-kotlin {
     sourceSets {
         jvmTest.dependencies {
             api(project(":ktor-server:ktor-server-test-base"))

ktor-server/ktor-server-jetty-jakarta/ktor-server-jetty-test-http2-jakarta/build.gradle.kts

@@ -6,12 +6,10 @@ plugins {
     id("ktorbuild.project.server-plugin")
 }
 
-ktorBuild {
+kotlin {
     // The minimal JDK version required for jte 3.0+
     jvmToolchain(17)
-}
 
-kotlin {
     sourceSets {
         jvmMain.dependencies {
             api(libs.jte)

ktor-server/ktor-server-plugins/ktor-server-jte/build.gradle.kts

@@ -6,12 +6,10 @@ plugins {
     id("ktorbuild.project.server-plugin")
 }
 
-ktorBuild {
+kotlin {
     // The minimal JDK version required for Swagger Codegen
     jvmToolchain(11)
-}
 
-kotlin {
     sourceSets {
         jvmMain.dependencies {
             implementation(project(":ktor-server:ktor-server-plugins:ktor-server-html-builder"))

ktor-server/ktor-server-plugins/ktor-server-openapi/build.gradle.kts

@@ -8,11 +8,9 @@ plugins {
     id("ktorbuild.project.library")
 }
 
-ktorBuild {
+kotlin {
     jvmToolchain(11)
-}
 
-kotlin {
     sourceSets {
         jvmMain.dependencies {
             api(project(":ktor-server:ktor-server-core"))

ktor-server/ktor-server-servlet-jakarta/build.gradle.kts

@@ -8,12 +8,10 @@ plugins {
     id("ktorbuild.project.library")
 }
 
-ktorBuild {
+kotlin {
     // The minimal JVM version required for Tomcat 10
     jvmToolchain(11)
-}
 
-kotlin {
     sourceSets {
         jvmMain.dependencies {
             api(project(":ktor-server:ktor-server-core"))