From fe1a7fd571a4ad313798cbda0635077e62c95480 Mon Sep 17 00:00:00 2001
From: squid233 <60126026+squid233@users.noreply.github.com>
Date: Sun, 25 Feb 2024 13:23:54 +0800
Subject: [PATCH] Update marshal; [OpenGL] Update generator

---
 .../opengl}/build.gradle.kts                         | 12 +++++-------
 .../src/main}/kotlin/overrungl/opengl/GLAMD.kt       |  0
 .../src/main}/kotlin/overrungl/opengl/GLARB.kt       |  0
 .../src/main}/kotlin/overrungl/opengl/GLEXT.kt       |  0
 .../opengl/src/main}/kotlin/overrungl/opengl/GLNV.kt |  0
 .../main}/kotlin/overrungl/opengl/OpenGLGenerator.kt |  0
 gradle.properties                                    |  2 +-
 settings.gradle.kts                                  |  2 ++
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename {modules/overrungl.opengl => generators/opengl}/build.gradle.kts (79%)
 rename {modules/overrungl.opengl/src/generator => generators/opengl/src/main}/kotlin/overrungl/opengl/GLAMD.kt (100%)
 rename {modules/overrungl.opengl/src/generator => generators/opengl/src/main}/kotlin/overrungl/opengl/GLARB.kt (100%)
 rename {modules/overrungl.opengl/src/generator => generators/opengl/src/main}/kotlin/overrungl/opengl/GLEXT.kt (100%)
 rename {modules/overrungl.opengl/src/generator => generators/opengl/src/main}/kotlin/overrungl/opengl/GLNV.kt (100%)
 rename {modules/overrungl.opengl/src/generator => generators/opengl/src/main}/kotlin/overrungl/opengl/OpenGLGenerator.kt (100%)

diff --git a/modules/overrungl.opengl/build.gradle.kts b/generators/opengl/build.gradle.kts
similarity index 79%
rename from modules/overrungl.opengl/build.gradle.kts
rename to generators/opengl/build.gradle.kts
index cbaf2818..3ace3e81 100644
--- a/modules/overrungl.opengl/build.gradle.kts
+++ b/generators/opengl/build.gradle.kts
@@ -4,19 +4,17 @@ plugins {
     embeddedKotlin("jvm")
 }
 
+repositories { mavenCentral() }
+
 val jdkVersion: String by rootProject
 val jdkEnablePreview: String by rootProject
 val kotlinTargetJdkVersion: String by rootProject
 
-sourceSets {
-    create("generator")
-}
-
 tasks.withType<KotlinCompile> {
     kotlinOptions { jvmTarget = kotlinTargetJdkVersion }
 }
 
-tasks.named<JavaCompile>("compileGeneratorJava") {
+tasks.withType<JavaCompile> {
     javaCompiler.set(javaToolchains.compilerFor {
         targetCompatibility = kotlinTargetJdkVersion
         languageVersion.set(JavaLanguageVersion.of(jdkVersion))
@@ -24,11 +22,11 @@ tasks.named<JavaCompile>("compileGeneratorJava") {
 }
 
 tasks.register<JavaExec>("generate") {
-    classpath(sourceSets["generator"].runtimeClasspath)
+    classpath(sourceSets["main"].runtimeClasspath)
     javaLauncher.set(javaToolchains.launcherFor {
         languageVersion.set(JavaLanguageVersion.of(jdkVersion))
     })
     if (jdkEnablePreview.toBoolean()) jvmArgs("--enable-preview")
     mainClass.set("overrungl.opengl.OpenGLGeneratorKt")
-    workingDir = File("src/main/java/overrungl/opengl")
+    workingDir = project(":opengl").projectDir.resolve("src/main/java/overrungl/opengl")
 }
diff --git a/modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/GLAMD.kt b/generators/opengl/src/main/kotlin/overrungl/opengl/GLAMD.kt
similarity index 100%
rename from modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/GLAMD.kt
rename to generators/opengl/src/main/kotlin/overrungl/opengl/GLAMD.kt
diff --git a/modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/GLARB.kt b/generators/opengl/src/main/kotlin/overrungl/opengl/GLARB.kt
similarity index 100%
rename from modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/GLARB.kt
rename to generators/opengl/src/main/kotlin/overrungl/opengl/GLARB.kt
diff --git a/modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/GLEXT.kt b/generators/opengl/src/main/kotlin/overrungl/opengl/GLEXT.kt
similarity index 100%
rename from modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/GLEXT.kt
rename to generators/opengl/src/main/kotlin/overrungl/opengl/GLEXT.kt
diff --git a/modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/GLNV.kt b/generators/opengl/src/main/kotlin/overrungl/opengl/GLNV.kt
similarity index 100%
rename from modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/GLNV.kt
rename to generators/opengl/src/main/kotlin/overrungl/opengl/GLNV.kt
diff --git a/modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/OpenGLGenerator.kt b/generators/opengl/src/main/kotlin/overrungl/opengl/OpenGLGenerator.kt
similarity index 100%
rename from modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/OpenGLGenerator.kt
rename to generators/opengl/src/main/kotlin/overrungl/opengl/OpenGLGenerator.kt
diff --git a/gradle.properties b/gradle.properties
index 82f19517..0a81762d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,5 +18,5 @@ jdkEnablePreview=true
 jdkEarlyAccessDoc=jdk22
 kotlinTargetJdkVersion=21
 
-overrunMarshalVersion=0.1.0-alpha.20-jdk22
+overrunMarshalVersion=0.1.0-alpha.21-jdk22
 overrunPlatformVersion=1.0.0
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0b35251c..6aaa341d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,3 +16,5 @@ file("modules").listFiles().forEach {
     include(s)
     project(":$s").projectDir = it
 }
+
+include("generators:opengl")