Update marshal; [OpenGL] Update generator

Over-Run · Feb 25, 2024 · fe1a7fd · fe1a7fd
1 parent 25e63c5
commit fe1a7fd
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/modules/overrungl.opengl/build.gradle.kts → generators/opengl/build.gradle.kts b/modules/overrungl.opengl/build.gradle.kts → generators/opengl/build.gradle.kts
@@ -4,31 +4,29 @@ 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))
     })
 }
 
 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/...enerator/kotlin/overrungl/opengl/GLAMD.kt → ...src/main/kotlin/overrungl/opengl/GLAMD.kt b/...enerator/kotlin/overrungl/opengl/GLAMD.kt → ...src/main/kotlin/overrungl/opengl/GLAMD.kt
diff --git a/...enerator/kotlin/overrungl/opengl/GLARB.kt → ...src/main/kotlin/overrungl/opengl/GLARB.kt b/...enerator/kotlin/overrungl/opengl/GLARB.kt → ...src/main/kotlin/overrungl/opengl/GLARB.kt
diff --git a/...enerator/kotlin/overrungl/opengl/GLEXT.kt → ...src/main/kotlin/overrungl/opengl/GLEXT.kt b/...enerator/kotlin/overrungl/opengl/GLEXT.kt → ...src/main/kotlin/overrungl/opengl/GLEXT.kt
diff --git a/...generator/kotlin/overrungl/opengl/GLNV.kt → .../src/main/kotlin/overrungl/opengl/GLNV.kt b/...generator/kotlin/overrungl/opengl/GLNV.kt → .../src/main/kotlin/overrungl/opengl/GLNV.kt
diff --git a/...otlin/overrungl/opengl/OpenGLGenerator.kt → ...otlin/overrungl/opengl/OpenGLGenerator.kt b/...otlin/overrungl/opengl/OpenGLGenerator.kt → ...otlin/overrungl/opengl/OpenGLGenerator.kt
diff --git 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
@@ -16,3 +16,5 @@ file("modules").listFiles().forEach {
     include(s)
     project(":$s").projectDir = it
 }
+
+include("generators:opengl")