KAPT: Run tests on JDK 21

Previously, some tests have also been disabled on JDK 11+, since we did not filter out empty filesets, which led to failed assertion inside JDK. #KT-57389
JetBrains · Nov 22, 2023 · 705c804 · 705c804
1 parent 120c99d
commit 705c804
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 4 deletions.
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -382,7 +382,7 @@ fun main(args: Array<String>) {
                 model("kotlinRunner")
             }
 
-            testClass<AbstractIrKotlinKaptContextTest>(annotations = annotations) {
+            testClass<AbstractIrKotlinKaptContextTest> {
                 model("kotlinRunner")
             }
 

diff --git a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/annotationProcessing.kt b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/annotationProcessing.kt
@@ -297,7 +297,7 @@ fun KaptContext.parseJavaFiles(javaSourceFiles: List<File>): JavacList<JCTree.JC
 }
 
 private fun KaptContext.initModulesIfNeeded(files: JavacList<JCTree.JCCompilationUnit>): JavacList<JCTree.JCCompilationUnit> {
-    if (isJava9OrLater()) {
+    if (files.isNotEmpty() && isJava9OrLater()) {
         val initModulesMethod = compiler.javaClass.getMethod("initModules", JavacList::class.java)
 
         @Suppress("UNCHECKED_CAST")

diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts
@@ -62,6 +62,7 @@ testsJar {}
 kaptTestTask("test", JavaLanguageVersion.of(8))
 kaptTestTask("testJdk11", JavaLanguageVersion.of(11))
 kaptTestTask("testJdk17", JavaLanguageVersion.of(17))
+kaptTestTask("testJdk21", JavaLanguageVersion.of(21))
 
 fun Project.kaptTestTask(name: String, javaLanguageVersion: JavaLanguageVersion) {
     val service = extensions.getByType<JavaToolchainService>()

diff --git a/...est/org/jetbrains/kotlin/kapt3/test/runners/AbstractClassFileToSourceStubConverterTest.kt b/...est/org/jetbrains/kotlin/kapt3/test/runners/AbstractClassFileToSourceStubConverterTest.kt
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.kapt3.test.KaptRegularExtensionForTestConfigurator
 import org.jetbrains.kotlin.kapt3.test.KaptTestDirectives.MAP_DIAGNOSTIC_LOCATIONS
 import org.jetbrains.kotlin.kapt3.test.KaptTestDirectives.USE_JVM_IR
 import org.jetbrains.kotlin.kapt3.test.handlers.ClassFileToSourceKaptStubHandler
+import org.jetbrains.kotlin.kapt3.util.doOpenInternalPackagesIfRequired
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
@@ -26,6 +27,10 @@ import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurat
 abstract class AbstractClassFileToSourceStubConverterTestBase(
     targetBackend: TargetBackend
 ) : AbstractKotlinCompilerWithTargetBackendTest(targetBackend) {
+    init {
+        doOpenInternalPackagesIfRequired()
+    }
+
     override fun TestConfigurationBuilder.configuration() {
         globalDefaults {
             frontend = FrontendKinds.ClassicFrontend

diff --git a/...t3-compiler/test/org/jetbrains/kotlin/kapt3/test/runners/AbstractKotlinKaptContextTest.kt b/...t3-compiler/test/org/jetbrains/kotlin/kapt3/test/runners/AbstractKotlinKaptContextTest.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.kapt3.test.runners
 
+import org.jetbrains.kotlin.kapt3.util.doOpenInternalPackagesIfRequired
 import org.jetbrains.kotlin.kapt3.test.*
 import org.jetbrains.kotlin.kapt3.test.KaptTestDirectives.MAP_DIAGNOSTIC_LOCATIONS
 import org.jetbrains.kotlin.kapt3.test.handlers.KaptContextHandler
@@ -20,6 +21,10 @@ import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurat
 abstract class AbstractKotlinKaptContextTestBase(
     targetBackend: TargetBackend
 ) : AbstractKotlinCompilerWithTargetBackendTest(targetBackend) {
+    init {
+        doOpenInternalPackagesIfRequired()
+    }
+
     override fun TestConfigurationBuilder.configuration() {
         globalDefaults {
             frontend = FrontendKinds.ClassicFrontend

diff --git a/...r/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/IrKotlinKaptContextTestGenerated.java b/...r/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/IrKotlinKaptContextTestGenerated.java
diff --git a/plugins/kapt4/build.gradle.kts b/plugins/kapt4/build.gradle.kts
@@ -57,6 +57,7 @@ testsJar {}
 kaptTestTask("test", JavaLanguageVersion.of(8))
 kaptTestTask("testJdk11", JavaLanguageVersion.of(11))
 kaptTestTask("testJdk17", JavaLanguageVersion.of(17))
+kaptTestTask("testJdk21", JavaLanguageVersion.of(21))
 
 fun Project.kaptTestTask(name: String, javaLanguageVersion: JavaLanguageVersion) {
     val service = extensions.getByType<JavaToolchainService>()

diff --git a/...apt4/AbstractKotlinKaptContextTestBase.kt → ...pt4/AbstractKotlinKapt4ContextTestBase.kt b/...apt4/AbstractKotlinKaptContextTestBase.kt → ...pt4/AbstractKotlinKapt4ContextTestBase.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.kapt4
 
+import org.jetbrains.kotlin.kapt3.util.doOpenInternalPackagesIfRequired
 import org.jetbrains.kotlin.kapt3.test.*
 import org.jetbrains.kotlin.kapt3.test.KaptTestDirectives.MAP_DIAGNOSTIC_LOCATIONS
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
@@ -22,6 +23,10 @@ open class AbstractKotlinKapt4ContextTest : AbstractKotlinKapt4ContextTestBase(T
 abstract class AbstractKotlinKapt4ContextTestBase(
     targetBackend: TargetBackend
 ) : AbstractKotlinCompilerWithTargetBackendTest(targetBackend) {
+    init {
+        doOpenInternalPackagesIfRequired()
+    }
+
     override fun TestConfigurationBuilder.configuration() {
         globalDefaults {
             frontend = FrontendKinds.FIR