v0.9.78

kotlin-graphics · Nov 3, 2023 · a89b28e · a89b28e
1 parent a3c1fda
commit a89b28e
Show file tree

Hide file tree

Showing 19 changed files with 18,206 additions and 17 deletions.
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,9 +6,9 @@ import org.lwjgl.Lwjgl.Module.jemalloc
 import org.lwjgl.lwjgl
 
 plugins {
-    kotlin("jvm") version embeddedKotlinVersion
+    embeddedKotlin("jvm")
     id("org.lwjgl.plugin") version "0.0.34"
-    id("elect86.magik") version "0.3.2"
+    id("elect86.magik") version "0.3.3"
     `maven-publish`
 //    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
     lwjgl { implementation(jemalloc) }
-    testImplementation(kotlin("test"))
+    testImplementation(embeddedKotlin("test"))
 }
 
 kotlin.jvmToolchain { languageVersion.set(JavaLanguageVersion.of(8)) }

diff --git a/buildSrc/src/main/kotlin/kool/gen/GenerateCode.kt b/buildSrc/src/main/kotlin/kool/gen/GenerateCode.kt
@@ -3,6 +3,7 @@ package kool.gen
 import kool.*
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.Directory
+import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.file.ProjectLayout
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.OutputDirectory
@@ -14,19 +15,22 @@ abstract class GenerateCode: DefaultTask() {
 
     init {
         group = "build"
-        description = "Generate glm code"
+        description = "Generate code"
     }
 
     @get:Inject
     abstract val layout: ProjectLayout
 
+    @get:Inject
+    abstract val files: FileSystemOperations
+
     @get:OutputDirectory
-    val targetDir: Provider<Directory>
-        get() = layout.buildDirectory.dir("generated/common")
+    val targetDir: Directory = layout.projectDirectory.dir("src/mainGen/kotlin")
 
     @TaskAction
     fun generate() {
-        val target = targetDir.get().asFile
+        files.delete { delete(targetDir) }
+        val target = targetDir.asFile
 
         ubuffers(target)
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
-distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,7 +10,7 @@ pluginManagement {
 
 gradle.rootProject {
     group = "kotlin.graphics"
-    version = "0.9.77"
+    version = "0.9.78"
 }
 
 //includeBuild("../build-logic")