Use --enable-preview for jdk19+ and replace deprecated -d option with…

… --output
krakowski · Aug 4, 2022 · baaaa15 · baaaa15
1 parent 5d145ec
commit baaaa15
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Since the plugin is available on [Gradle's Plugin Portal](https://plugins.gradle
 
 ```gradle
 plugins {
-  id "io.github.krakowski.jextract" version "0.2.7"
+  id "io.github.krakowski.jextract" version "0.3.0"
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "io.github.krakowski"
-version = "0.2.7"
+version = "0.3.0"
 
 repositories {
     mavenCentral()

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1 +1 @@
-rootProject.name = "gradle-jextract"
+rootProject.name = "gradle-jextract"
diff --git a/src/main/kotlin/io/github/krakowski/jextract/JextractPlugin.kt b/src/main/kotlin/io/github/krakowski/jextract/JextractPlugin.kt
@@ -67,18 +67,17 @@ class JextractPlugin : Plugin<Project> {
                 }
             }
 
-            // We need to add the foreign module, so the compiler sees its classes and
+            // We need to enable the preview mode, so the compiler sees jdk.lang.foreign classes and
             // the java compiler should only be invoked after jextract generated its source files
             target.tasks.withType<JavaCompile> {
                 dependsOn(jextractTask)
-                options.compilerArgs.add("--add-modules")
-                options.compilerArgs.add("jdk.incubator.foreign")
+                options.compilerArgs.add("--enable-preview")
             }
 
             target.tasks.withType<Test> {
                 jvmArgs = listOf(
                     "--enable-native-access=ALL-UNNAMED",
-                    "--add-modules", "jdk.incubator.foreign"
+                    "--enable-preview"
                 )
             }
         }
@@ -88,10 +87,10 @@ class JextractPlugin : Plugin<Project> {
 
             val extension = target.extensions.getByType<JavaApplication>()
 
-            // We need to add the foreign module, so that the classes are visible at runtime
+            // We need to enable the preview mode, so that the jdk.lang.foreign classes are visible at runtime
             extension.applicationDefaultJvmArgs += listOf(
                     "--enable-native-access=ALL-UNNAMED",
-                    "--add-modules", "jdk.incubator.foreign"
+                    "--enable-preview"
             )
         }
     }

diff --git a/src/main/kotlin/io/github/krakowski/jextract/JextractTask.kt b/src/main/kotlin/io/github/krakowski/jextract/JextractTask.kt
@@ -58,15 +58,16 @@ abstract class JextractTask : DefaultTask() {
         }
 
         // Search for jextract in PATH if JDK has no bundled binary
-        val pathExecutable = System.getenv(ENV_PATH)
+        val envPath = System.getenv(ENV_PATH)
+        val pathExecutable = envPath
                 .split(File.pathSeparator)
                 .map { path -> Paths.get(path, executable) }
                 .filter { path -> Files.exists(path) }
 
         try {
             return pathExecutable.first()
         } catch (exception: NoSuchElementException) {
-            throw GradleException("jextract binary could not be found in PATH or at ${bundledExecutable}")
+            throw GradleException("jextract binary could not be found in PATH or at ${bundledExecutable}\n\t↳ PATH=${envPath}")
         }
     }
 
@@ -160,7 +161,7 @@ abstract class JextractTask : DefaultTask() {
             }
 
             // Set output directory
-            arguments += "-d"
+            arguments += "--output"
             arguments += outputDir.get().toString()
 
             execute("${jextractBinary} ${arguments.joinToString(" ")} ${definition.header.get()}")