Prep for Kotlin 2.1.0 (#288)

Author: ZacSweers

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '21'
+          java-version: '22'
 
       - name: Check
         run: ./gradlew check

CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+**Unreleased**
+--------------
+
+- Remove `irOnly` option from `KotlinJsCompilation`.
+- Default to the current language/api version if one isn't specified in KSP2 invocations.
+- Update to Kotlin `2.1.0`.
+- Update to KSP `2.1.0-1.0.29`.
+
 0.6.0
 -----
 

build.gradle.kts

@@ -1,17 +1,25 @@
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
+import org.jetbrains.dokka.gradle.DokkaExtension
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin.jvm) apply false
-    alias(libs.plugins.dokka) apply false
+    alias(libs.plugins.dokka)
     alias(libs.plugins.mavenPublish) apply false
 }
 
+dokka {
+    dokkaPublications.html {
+        outputDirectory.set(rootDir.resolve("docs/api/0.x"))
+        includes.from(project.layout.projectDirectory.file("README.md"))
+    }
+}
+
 subprojects {
     pluginManager.withPlugin("java") {
-        configure<JavaPluginExtension> { toolchain { languageVersion.set(JavaLanguageVersion.of(21)) } }
+        configure<JavaPluginExtension> { toolchain { languageVersion.set(JavaLanguageVersion.of(22)) } }
 
         tasks.withType<JavaCompile>().configureEach { options.release.set(8) }
     }
@@ -45,8 +53,8 @@ subprojects {
     pluginManager.withPlugin("com.vanniktech.maven.publish") {
         apply(plugin = "org.jetbrains.dokka")
 
-        tasks.withType<DokkaTask>().configureEach {
-            outputDirectory.set(rootDir.resolve("../docs/0.x"))
+        configure<DokkaExtension> {
+            dokkaPublicationDirectory.set(layout.buildDirectory.dir("dokkaDir"))
             dokkaSourceSets.configureEach {
                 skipDeprecated.set(true)
             }
@@ -58,3 +66,8 @@ subprojects {
         }
     }
 }
+
+dependencies {
+    dokka(projects.core)
+    dokka(projects.ksp)
+}

core/build.gradle.kts

@@ -46,10 +46,6 @@ dependencies {
 tasks.withType<KotlinCompile>().configureEach {
     val isTest = name.contains("test", ignoreCase = true)
     compilerOptions {
-        freeCompilerArgs.add(
-            // https://github.com/tschuchortdev/kotlin-compile-testing/pull/63
-            "-Xno-optimized-callable-references"
-        )
         if (isTest) {
             optIn.add("org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi")
         }

core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt

@@ -30,9 +30,6 @@ class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
   /** Print declarations' reachability info to stdout during performing DCE */
   var irDcePrintReachabilityInfo: Boolean = false
 
-  /** Disables pre-IR backend */
-  var irOnly: Boolean = true
-
   /** Specify a compilation module name for IR backend */
   var irModuleName: String? = null
 
@@ -77,7 +74,6 @@ class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
     args.irProduceJs = irProduceJs
     args.irDce = irDce
     args.irDcePrintReachabilityInfo = irDcePrintReachabilityInfo
-    args.irOnly = irOnly
     args.moduleName = moduleName
     args.irModuleName = irModuleName
     args.generateDts = generateDts

gradle.properties

@@ -4,8 +4,12 @@ kapt.include.compile.classpath=false
 
 systemProp.kct.test.useKsp2=true
 
+# Dokka flags
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+
 GROUP=dev.zacsweers.kctfork
-VERSION_NAME=1.0.0-SNAPSHOT
+VERSION_NAME=0.7.0-SNAPSHOT
 POM_DESCRIPTION=A library that enables testing of Kotlin annotation processors, compiler plugins and code generation.
 POM_INCEPTION_YEAR=2019
 POM_URL=https\://github.com/zacsweers/kotlin-compile-testing

gradle/libs.versions.toml

@@ -1,13 +1,13 @@
 [versions]
 idea = "242.8057" # (see https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html)
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 kotlinpoet = "2.0.0"
-ksp = "2.0.21-1.0.28"
+ksp = "2.1.0-1.0.29"
 
 [plugins]
 buildconfig = { id = "com.github.gmazzo.buildconfig", version = "3.1.0" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
+dokka = { id = "org.jetbrains.dokka", version = "2.0.0-Beta" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

ksp/src/main/kotlin/com/tschuchort/compiletesting/Ksp2.kt

@@ -50,8 +50,8 @@ class Ksp2PrecursorTool : PrecursorTool, KspTool {
 
           jvmTarget = compilation.jvmTarget
           jdkHome = compilation.jdkHome
-          languageVersion = compilation.languageVersion ?: "2.0"
-          apiVersion = compilation.apiVersion ?: "2.0"
+          languageVersion = compilation.languageVersion ?: KotlinVersion.CURRENT.languageVersion()
+          apiVersion = compilation.apiVersion ?: KotlinVersion.CURRENT.languageVersion()
 
           // TODO adopt new roots model
           moduleName = compilation.moduleName ?: "main"
@@ -118,6 +118,10 @@ class Ksp2PrecursorTool : PrecursorTool, KspTool {
   }
 }
 
+private fun KotlinVersion.languageVersion(): String {
+  return "$major.$minor"
+}
+
 /** Enables KSP2. */
 @OptIn(ExperimentalCompilerApi::class)
 fun KotlinCompilation.useKsp2() {

release.sh

@@ -19,7 +19,7 @@ git commit -am "Prepare for release $NEW_VERSION."
 git tag -a "$NEW_VERSION" -m "Version $NEW_VERSION"
 
 # Publish
-./gradlew publish -x dokkaHtml
+./gradlew publish --no-configuration-cache
 
 # Prepare next snapshot
 echo "Restoring snapshot version $SNAPSHOT_VERSION"