Update build scripts and Marshal

build.gradle.kts

@@ -1,5 +1,4 @@
 import org.gradle.plugins.ide.idea.model.IdeaModel
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.nio.file.Files
 import kotlin.io.path.Path
 
@@ -8,7 +7,6 @@ plugins {
     `maven-publish`
     signing
     id("me.champeau.jmh") version "0.7.2" apply false
-    embeddedKotlin("jvm") apply false
 }
 
 val projGroupId: String by project
@@ -29,8 +27,6 @@ val kotlinTargetJdkVersion: String by rootProject
 
 val targetJavaVersion = jdkVersion.toInt()
 
-val overrunMarshalVersion: String by rootProject
-
 group = projGroupId
 version = projVersion
 
@@ -122,23 +118,19 @@ enum class Artifact(
     }
 }
 
-Artifact.values().forEach { project(it.subprojectName).ext["subName"] = "-${it.subprojectName.substring(1)}" }
-project(Artifact.CORE.subprojectName).ext["subName"] = ""
-project(":samples").ext["subName"] = "-samples"
+val artifactNameMap = buildMap {
+    Artifact.values().forEach { put(it.subprojectName, it.artifactName) }
+    put(":samples", "overrungl-samples")
+}
 
-buildList {
-    addAll(Artifact.values().map { it.subprojectName })
-    add(":samples")
-}.forEach {
-    project(it) {
-        apply(plugin = "org.jetbrains.kotlin.jvm")
+artifactNameMap.forEach { (subprojectName, artifactName) ->
+    project(subprojectName) {
         apply(plugin = "java-library")
         apply(plugin = "idea")
         apply(plugin = "me.champeau.jmh")
 
         group = projGroupId
         version = projVersion
-        val artifactName = "$projArtifactId${ext["subName"]}"
 
         repositories {
             mavenCentral()
@@ -148,15 +140,12 @@ buildList {
             maven { url = uri("https://maven.aliyun.com/repository/central") }
         }
 
-        val annotationProcessor by configurations
-        val api by configurations
         val compileOnly by configurations
-        val implementation by configurations
         dependencies {
             compileOnly("org.jetbrains:annotations:24.1.0")
-            api("io.github.over-run:marshal:$overrunMarshalVersion")
             if (project.name != "core") {
-                implementation(project(Artifact.CORE.subprojectName))
+                compileOnly(project(Artifact.CORE.subprojectName))
+                constraints { api("io.github.over-run:overrungl:$projVersion") }
             }
         }
 
@@ -166,10 +155,6 @@ buildList {
             options.release.set(targetJavaVersion)
         }
 
-        tasks.withType<KotlinCompile> {
-            kotlinOptions { jvmTarget = kotlinTargetJdkVersion }
-        }
-
         tasks.withType<Test> {
             if (jdkEnablePreview.toBoolean()) jvmArgs("--enable-preview")
         }
@@ -329,16 +314,14 @@ publishing.publications {
             version = projVersion
             description = module.projectDescription
             project(module.subprojectName) {
-                artifact(tasks["jar"])
-                artifact(tasks["sourcesJar"]) { classifier = "sources" }
-                artifact(tasks["javadocJar"]) { classifier = "javadoc" }
+                from(components["java"])
             }
             module.nativeBinding?.platforms?.forEach {
                 val nativeName = module.nativeFileName(it)!!
                 val file = File("${rootProject.projectDir}/natives/$nativeName")
                 if (file.exists()) {
                     val nativeParent = File(nativeName).parent
-                    artifact(tasks.create<Jar>("nativeJar${module.mavenName}${it.taskSuffix}") {
+                    artifact(tasks.register<Jar>("nativeJar${module.mavenName}${it.taskSuffix}") {
                         archiveBaseName.set(module.artifactName)
                         archiveClassifier.set(it.classifier)
                         from(file) { into(nativeParent) }
@@ -347,16 +330,6 @@ publishing.publications {
             }
             pom {
                 setupPom(module.projectName, module.projectDescription, "jar")
-                if (module != Artifact.CORE) {
-                    withXml {
-                        asNode().appendNode("dependencies").appendNode("dependency").apply {
-                            appendNode("groupId", "io.github.over-run")
-                            appendNode("artifactId", "overrungl")
-                            appendNode("version", projVersion)
-                            appendNode("scope", "compile")
-                        }
-                    }
-                }
             }
         }
     }
@@ -421,6 +394,7 @@ publishing.repositories {
             else "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
         )
     }
+    mavenLocal()
 }
 
 signing {

gradle.properties

@@ -18,5 +18,5 @@ jdkEnablePreview=true
 jdkEarlyAccessDoc=jdk22
 kotlinTargetJdkVersion=21
 
-overrunMarshalVersion=0.1.0-alpha.15-jdk22
+overrunMarshalVersion=0.1.0-alpha.17-jdk22
 overrunPlatformVersion=1.0.0

modules/overrungl.core/build.gradle.kts

@@ -1,5 +1,7 @@
+val overrunMarshalVersion: String by rootProject
 val overrunPlatformVersion: String by rootProject
 
 dependencies {
+    api("io.github.over-run:marshal:$overrunMarshalVersion")
     api("io.github.over-run:platform:$overrunPlatformVersion")
 }

modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFW.java

@@ -29,6 +29,7 @@
 
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
+import java.lang.invoke.MethodHandles;
 
 import static java.lang.foreign.ValueLayout.*;
 import static overrungl.glfw.Handles.*;
@@ -43,7 +44,7 @@ public interface GLFW {
     /**
      * The instance of GLFW.
      */
-    GLFW INSTANCE = Downcall.load(lookup);
+    GLFW INSTANCE = Downcall.load(MethodHandles.lookup(), lookup);
 
     /**
      * The major version number of the GLFW header.

modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWNative.java

@@ -24,6 +24,7 @@
 import overrun.marshal.gen.Type;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.invoke.MethodHandles;
 
 /**
  * This is the header file of the native access functions.
@@ -39,7 +40,7 @@ public interface GLFWNative {
     /**
      * The instance of GLFWNative.
      */
-    GLFWNative INSTANCE = Downcall.load(Handles.lookup);
+    GLFWNative INSTANCE = Downcall.load(MethodHandles.lookup(), Handles.lookup);
 
     /**
      * Returns the adapter device name of the specified monitor.

modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWVulkan.java

@@ -23,6 +23,7 @@
 import overrun.marshal.gen.Type;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.invoke.MethodHandles;
 
 /**
  * The GLFW Vulkan binding.
@@ -34,7 +35,7 @@ public interface GLFWVulkan {
     /**
      * The instance of GLFWVulkan.
      */
-    GLFWVulkan INSTANCE = Downcall.load(Handles.lookup);
+    GLFWVulkan INSTANCE = Downcall.load(MethodHandles.lookup(), Handles.lookup);
 
     /**
      * Returns the address of the specified Vulkan instance function.

modules/overrungl.nfd/src/main/java/overrungl/nfd/NFD.java

@@ -30,6 +30,7 @@
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.ValueLayout;
 import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
 import java.util.Map;
 
 import static java.lang.foreign.ValueLayout.*;
@@ -131,7 +132,7 @@ public interface NFD {
     /**
      * The instance of NFD.
      */
-    NFD INSTANCE = Downcall.load(NFDInternal.LOOKUP, Map.of(
+    NFD INSTANCE = Downcall.load(MethodHandles.lookup(), NFDInternal.LOOKUP, Map.of(
         "NFD_PathSet_GetPathN", FunctionDescriptor.of(JAVA_INT, ADDRESS, PATH_SET_SIZE, ADDRESS),
         "NFD_PathSet_FreePathN", FunctionDescriptor.ofVoid(ADDRESS),
         "NFD_FreePathU8", FunctionDescriptor.ofVoid(ADDRESS),

modules/overrungl.opengl/build.gradle.kts

@@ -1,3 +1,9 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    embeddedKotlin("jvm") apply false
+}
+
 val jdkVersion: String by rootProject
 val jdkEnablePreview: String by rootProject
 val kotlinTargetJdkVersion: String by rootProject
@@ -6,6 +12,10 @@ sourceSets {
     create("generator")
 }
 
+tasks.withType<KotlinCompile> {
+    kotlinOptions { jvmTarget = kotlinTargetJdkVersion }
+}
+
 tasks.named<JavaCompile>("compileGeneratorJava") {
     javaCompiler.set(javaToolchains.compilerFor {
         targetCompatibility = kotlinTargetJdkVersion

modules/overrungl.opengl/src/main/java/overrungl/opengl/GLLoader.java

@@ -22,6 +22,7 @@
 
 import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.ValueLayout;
+import java.lang.invoke.MethodHandles;
 import java.util.Map;
 
 /**
@@ -49,6 +50,7 @@ public final class GLLoader {
         "glMapNamedBuffer", FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.JAVA_INT, ValueLayout.JAVA_INT),
         "glMapNamedBufferRange", FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.JAVA_INT, ValueLayout.JAVA_LONG, ValueLayout.JAVA_LONG, ValueLayout.JAVA_INT)
     );
+    private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
 
     /**
      * Loads OpenGL flags.
@@ -68,7 +70,7 @@ public static GLFlags loadFlags(GLLoadFunc load) {
      */
     @Nullable
     public static GL load(GLFlags flags) {
-        return flags.GL10 ? Downcall.load(GL.class, flags.load.lookup(), DESCRIPTOR_MAP) : null;
+        return flags.GL10 ? Downcall.load(LOOKUP, GL.class, flags.load.lookup(), DESCRIPTOR_MAP) : null;
     }
 
     /**
@@ -79,7 +81,7 @@ public static GL load(GLFlags flags) {
      */
     @Nullable
     public static GLLegacy loadLegacy(GLFlags flags) {
-        return flags.GL10 ? Downcall.load(GLLegacy.class, flags.load.lookup(), DESCRIPTOR_MAP) : null;
+        return flags.GL10 ? Downcall.load(LOOKUP, GLLegacy.class, flags.load.lookup(), DESCRIPTOR_MAP) : null;
     }
 
     /**
@@ -90,6 +92,6 @@ public static GLLegacy loadLegacy(GLFlags flags) {
      */
     @Nullable
     public static GLExtension loadExtension(GLFlags flags) {
-        return flags.foundExtension ? Downcall.load(GLExtension.class, flags.load.lookup(), DESCRIPTOR_MAP) : null;
+        return flags.foundExtension ? Downcall.load(LOOKUP, GLExtension.class, flags.load.lookup(), DESCRIPTOR_MAP) : null;
     }
 }

modules/overrungl.stb/src/main/java/overrungl/stb/STBEasyFont.java

@@ -22,6 +22,7 @@
 import overrun.marshal.gen.Sized;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.invoke.MethodHandles;
 
 /**
  * Easy-to-deploy,
@@ -58,7 +59,7 @@ interface STBEasyFont {
     /**
      * The instance of STBEasyFont.
      */
-    STBEasyFont INSTANCE = Downcall.load(Handles.lookup);
+    STBEasyFont INSTANCE = Downcall.load(MethodHandles.lookup(), Handles.lookup);
 
     /**
      * {@return spacing}

modules/overrungl.stb/src/main/java/overrungl/stb/STBImage.java

@@ -25,6 +25,7 @@
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.SegmentAllocator;
 import java.lang.foreign.ValueLayout;
+import java.lang.invoke.MethodHandles;
 
 /**
  * The STB image reader.
@@ -36,7 +37,7 @@ public interface STBImage {
     /**
      * The instance of STBImage.
      */
-    STBImage INSTANCE = Downcall.load(Handles.lookup);
+    STBImage INSTANCE = Downcall.load(MethodHandles.lookup(), Handles.lookup);
     // only used for desiredChannels
     /**
      * Image channels

modules/overrungl.stb/src/main/java/overrungl/stb/STBImageResize2.java

@@ -21,6 +21,7 @@
 import overrungl.NativeType;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.invoke.MethodHandles;
 
 /**
  * The STB image resizer.
@@ -32,7 +33,7 @@ public interface STBImageResize2 {
     /**
      * The instance of STBImageResize2.
      */
-    STBImageResize2 INSTANCE = Downcall.load(Handles.lookup);
+    STBImageResize2 INSTANCE = Downcall.load(MethodHandles.lookup(), Handles.lookup);
 
     //===============================================================
     //  Simple-complexity API

modules/overrungl.stb/src/main/java/overrungl/stb/STBImageWrite.java

@@ -25,6 +25,7 @@
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.SegmentAllocator;
+import java.lang.invoke.MethodHandles;
 
 /**
  * The STB image writer.
@@ -36,7 +37,7 @@ public interface STBImageWrite {
     /**
      * The instance of STBImageWrite.
      */
-    STBImageWrite INSTANCE = Downcall.load(Handles.lookup);
+    STBImageWrite INSTANCE = Downcall.load(MethodHandles.lookup(), Handles.lookup);
 
     @Convert(Type.INT)
     @Entrypoint("stbi_get_write_tga_with_rle")

modules/overrungl.stb/src/main/java/overrungl/stb/STBPerlin.java

@@ -19,6 +19,8 @@
 import overrun.marshal.Downcall;
 import overrun.marshal.gen.Entrypoint;
 
+import java.lang.invoke.MethodHandles;
+
 /**
  * The STB perlin noise generator.
  *
@@ -29,7 +31,7 @@ public interface STBPerlin {
     /**
      * The instance of STBPerlin.
      */
-    STBPerlin INSTANCE = Downcall.load(Handles.lookup);
+    STBPerlin INSTANCE = Downcall.load(MethodHandles.lookup(), Handles.lookup);
 
     /**
      * This function computes a random value at the coordinate (x,y,z).<br>

modules/overrungl.stb/src/main/java/overrungl/stb/STBRectPack.java

@@ -19,6 +19,8 @@
 import overrun.marshal.Downcall;
 import overrun.marshal.gen.Entrypoint;
 
+import java.lang.invoke.MethodHandles;
+
 /**
  * Useful for e.g. packing rectangular textures into an atlas.
  * Does not do rotation.
@@ -32,7 +34,7 @@ public interface STBRectPack {
     /**
      * The instance of STBRectPack.
      */
-    STBRectPack INSTANCE = Downcall.load(Handles.lookup);
+    STBRectPack INSTANCE = Downcall.load(MethodHandles.lookup(), Handles.lookup);
     /**
      * Mostly for internal use, but this is the maximum supported coordinate value.
      */

modules/overrungl.stb/src/main/java/overrungl/stb/STBTrueType.java

@@ -23,6 +23,7 @@
 import overrungl.NativeType;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.invoke.MethodHandles;
 
 /**
  * =======================================================================
@@ -312,7 +313,7 @@ public interface STBTrueType {
     /**
      * The instance of STBTrueType.
      */
-    STBTrueType INSTANCE = Downcall.load(Handles.lookup);
+    STBTrueType INSTANCE = Downcall.load(MethodHandles.lookup(), Handles.lookup);
     /**
      * STBTT_vmove
      */