Support JDK 20 and JDK 21 (#177)

From JDK 20 onwards the `LAMBDA` feature enum constant is no longer recognized. Falling back to the `RECORDS` enum constant should guarantee support for the next few JDK releases. Upgrading Byte Buddy from 1.12.18 to 1.14.9 introduces Java 21 byte code support.
bsideup · Oct 26, 2023 · 67e4018 · 67e4018
1 parent 3cfcbfd
commit 67e4018
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/example/build.gradle b/example/build.gradle
@@ -7,7 +7,7 @@ configure([tasks.compileJava]) {
     options.release = 8
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(19)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 

diff --git a/jabel-javac-plugin/build.gradle b/jabel-javac-plugin/build.gradle
@@ -6,7 +6,7 @@ plugins {
 sourceCompatibility = targetCompatibility = 8
 
 dependencies {
-    implementation platform('net.bytebuddy:byte-buddy-parent:1.12.18')
+    implementation platform('net.bytebuddy:byte-buddy-parent:1.14.9')
     implementation 'net.bytebuddy:byte-buddy'
     implementation 'net.bytebuddy:byte-buddy-agent'
     implementation 'net.java.dev.jna:jna:5.12.1'

diff --git a/jabel-javac-plugin/src/main/java/com/github/bsideup/jabel/JabelCompilerPlugin.java b/jabel-javac-plugin/src/main/java/com/github/bsideup/jabel/JabelCompilerPlugin.java
@@ -173,8 +173,13 @@ static void checkSourceLevel(
                 @Advice.Argument(value = 1, readOnly = false) Source.Feature feature
         ) {
             if (feature.allowedInSource(Source.JDK8)) {
-                //noinspection UnusedAssignment
-                feature = Source.Feature.LAMBDA;
+                if (Source.MIN.compareTo(Source.JDK8) < 0) {
+                  //noinspection UnusedAssignment
+                  feature = Source.Feature.LAMBDA;
+                } else {
+                  //noinspection UnusedAssignment
+                  feature = Source.Feature.RECORDS;
+                }
             }
         }
     }