Include generated classes on every compile

MineInAbyss · May 26, 2023 · a41ad24 · a41ad24
1 parent 8f1c43d
commit a41ad24
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,5 @@
+import io.papermc.paperweight.util.registering
+
 plugins {
     id("com.mineinabyss.conventions.kotlin.jvm")
     id("com.mineinabyss.conventions.nms")
@@ -37,11 +39,25 @@ dependencies {
     api(project(":protocolburrito-api"))
 }
 
-sourceSets["main"].java.srcDir(file("$rootDir/protocolburrito-generator/build/generated/burrito/main"))
+sourceSets["main"].java.srcDir(file("$buildDir/generated/burrito/main"))
 
 tasks {
     assemble {
         dependsOn(reobfJar)
+    }
+    build {
         dependsOn(project(":protocolburrito-plugin").tasks.build)
     }
+
+    val generateBurrito by registering<JavaExec> {
+        mainClass.set("com.mineinabyss.protocolburrito.generation.MainKt")
+        classpath = project("protocolburrito-generator").sourceSets["main"].runtimeClasspath
+        outputs.dir("$buildDir/generated/burrito/main")
+    }
+    sourcesJar {
+        dependsOn(generateBurrito)
+    }
+    compileKotlin {
+        dependsOn(generateBurrito)
+    }
 }
diff --git a/protocolburrito-generator/build.gradle.kts b/protocolburrito-generator/build.gradle.kts
@@ -25,14 +25,7 @@ configurations {
 }
 
 tasks {
-    val generateBurrito by registering<JavaExec>() {
-        mainClass.set("com.mineinabyss.protocolburrito.generation.MainKt")
-        classpath(files(configurations.runtimeClasspath, jar))
-    }
     reobfJar {
         onlyIf { false }
     }
-    build {
-        dependsOn(generateBurrito)
-    }
 }
diff --git a/protocolburrito-plugin/build.gradle.kts b/protocolburrito-plugin/build.gradle.kts
@@ -11,9 +11,3 @@ dependencies {
     implementation(project(":"))
     implementation(libs.bundles.idofront.core)
 }
-
-tasks {
-    assemble {
-        dependsOn(project(":protocolburrito-generator").tasks.assemble)
-    }
-}