fix more merge issues

Author: riccardobl

.github/workflows/main.yml

@@ -244,7 +244,7 @@ jobs:
           # Normal build plus ZIP distribution and merged javadoc
           ./gradlew -PuseCommitHashAsVersionName=true -PskipPrebuildLibraries=true \
           -x checkstyleMain -x checkstyleTest \
-          build createZipDistribution mergedJavadoc
+          build mergedJavadoc
 
           if [ "${{ matrix.deploy }}" = "true" ];
           then

nge-examples/build.gradle

@@ -90,4 +90,15 @@ java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(21)
     }
+}
+
+// Override global source/target and release for this module so Gradle
+// resolves JVM-21 variants (some platform artifacts require JVM 21+).
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.release = 21
 }