Up to 6.6.0 shared plugin to run tests on 21 (#217)

* Up to 6.6.0 shared plugin to run tests on 21

* Use a toolchain for Kotlin and drop the magic add-opens

* Add magic properties back

* Run Ksp tests on 21?

* Unused import

* Next minor

gradle.properties

@@ -1,4 +1,4 @@
-projectVersion=2.1.1-SNAPSHOT
+projectVersion=2.2.0-SNAPSHOT
 projectGroup=io.micronaut.crac
 
 title=Micronaut CRaC
@@ -7,8 +7,20 @@ projectUrl=https://micronaut.io
 githubSlug=micronaut-projects/micronaut-crac
 developers=Tim Yates,Sergio del Amo
 
-
 # If needed, set additional properties
 
 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx1g
+
+# No matter which Java toolchain we use, the Kotlin Daemon is always invoked by the current JDK.
+# Therefor to fix Kapt errors when running tests under Java 21, we need to open up some modules for the Kotlin Daemon.
+kotlin.daemon.jvmargs=--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED\
+ --add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

gradle/libs.versions.toml

@@ -20,7 +20,7 @@ managed-crac = "1.4.0"
 
 micronaut-logging = "1.0.0"
 
-testcontainers = "1.19.0"
+testcontainers = "1.19.1"
 
 [libraries]
 # Core

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'io.micronaut.build.shared.settings' version '6.5.7'
+    id 'io.micronaut.build.shared.settings' version '6.6.0'
 }
 
 enableFeaturePreview('TYPESAFE_PROJECT_ACCESSORS')
@@ -21,9 +21,7 @@ include 'test-suite-dbcp-jooq'
 include 'test-suite-docker'
 include 'test-suite-groovy'
 include 'test-suite-hikari-jooq'
-if (JavaVersion.current() < JavaVersion.VERSION_21) {
-    include 'test-suite-kotlin'
-}
+include 'test-suite-kotlin'
 include 'test-suite-kotlin-ksp'
 include 'test-suite-redis'
 

test-suite-kotlin/build.gradle.kts

@@ -10,3 +10,9 @@ dependencies {
     testImplementation(mnTest.micronaut.test.junit5)
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
+
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}