Export module's org.graalvm.sdk package org.graalvm.nativeimage.impl

The package is no longer exported by default, see oracle/graal@58bed51
quarkusio · Jun 27, 2022 · 8f3f3f0 · 8f3f3f0
1 parent f94a8d0
commit 8f3f3f0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java
@@ -119,12 +119,16 @@ GeneratedResourceBuildItem generateNativeResourcesList(List<NativeImageResourceB
     }
 
     @BuildStep(onlyIf = NativeOrNativeSourcesBuildGraal22_2OrLater.class)
-    JPMSExportBuildItem addExportsToNativeImage(List<JniRuntimeAccessBuildItem> jniRuntimeAccessibleClasses) {
+    void addExportsToNativeImage(BuildProducer<JPMSExportBuildItem> features,
+            List<JniRuntimeAccessBuildItem> jniRuntimeAccessibleClasses,
+            List<LambdaCapturingTypeBuildItem> lambdaCapturingTypeBuildItems,
+            List<NativeImageResourcePatternsBuildItem> resourcePatterns) {
+        // required in order to access org.graalvm.nativeimage.impl.RuntimeSerializationSupport and org.graalvm.nativeimage.impl.ConfigurationCondition
+        features.produce(new JPMSExportBuildItem("org.graalvm.sdk", "org.graalvm.nativeimage.impl"));
         // required in order to access com.oracle.svm.core.jni.JNIRuntimeAccess
         if (jniRuntimeAccessibleClasses != null && !jniRuntimeAccessibleClasses.isEmpty()) {
-            return new JPMSExportBuildItem("org.graalvm.nativeimage.builder", "com.oracle.svm.core.jni");
+            features.produce(new JPMSExportBuildItem("org.graalvm.nativeimage.builder", "com.oracle.svm.core.jni"));
         }
-        return null;
     }
 
     private boolean graalVM22_2OrLater() {