From 1b613ed06b34239a1adf90e1c5d17ec3ea058745 Mon Sep 17 00:00:00 2001
From: darksaid98 <darksaid9889@gmail.com>
Date: Tue, 6 Feb 2024 15:12:02 +0100
Subject: [PATCH] fix(build): jOOQ task dependency

---
 build.gradle.kts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 64c4c31..1845b7b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -87,6 +87,10 @@ tasks {
         dependsOn(shadowJar)
     }
 
+    jooqCodegen {
+        dependsOn(flywayMigrate)
+    }
+
     compileJava {
         options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything
 
@@ -94,6 +98,8 @@ tasks {
         // See https://openjdk.java.net/jeps/247 for more information.
         options.release.set(17)
         options.compilerArgs.addAll(arrayListOf("-Xlint:all", "-Xlint:-processing", "-Xdiags:verbose"))
+
+        dependsOn(jooqCodegen) // Generate jOOQ sources before compilation
     }
 
     javadoc {
@@ -213,10 +219,6 @@ jooq {
     }
 }
 
-tasks.withType<CodegenTask>().configureEach {
-    dependsOn.add(tasks.flywayMigrate) // Ensure database schema has been prepared by Flyway before generating the jOOQ sources
-}
-
 // Apply custom version arg
 val versionArg = if (hasProperty("customVersion"))
     (properties["customVersion"] as String).uppercase() // Uppercase version string