tighten build around application.yml

edward3h · Aug 21, 2024 · e11b70b · e11b70b
1 parent a74ec6c
commit e11b70b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/buildSrc/src/main/java/org/ethelred/buildsupport/EmbeddedPostgresPlugin.java b/buildSrc/src/main/java/org/ethelred/buildsupport/EmbeddedPostgresPlugin.java
@@ -13,8 +13,8 @@ public void apply(Project project) {
         project.getGradle().getSharedServices().registerIfAbsent("embeddedPostgres", EmbeddedPostgresService.class);
 
         var processorConfigTask = project.getTasks().register("processorConfig", ProcessorConfigTask.class, task -> {
-            task.getConfigFile().set(project.getLayout().getBuildDirectory().file("config.json"));
-            task.getApplicationConfigFile().convention(project.getLayout().getBuildDirectory().file("resources/test/application-test.yml"));
+            task.getConfigFile().set(project.getLayout().getBuildDirectory().file("processorConfig/config.json"));
+            task.getApplicationConfigFile().convention(project.getLayout().getBuildDirectory().file("processorConfig/application-test.yml"));
             task.getDependencyInjectionStyle().convention("JAKARTA");
             task.getLiquibaseChangelog().convention(project.getLayout().getProjectDirectory().file("src/main/resources/changelog.xml"));
         });

diff --git a/buildSrc/src/main/java/org/ethelred/buildsupport/ProcessorConfigTask.java b/buildSrc/src/main/java/org/ethelred/buildsupport/ProcessorConfigTask.java
@@ -19,7 +19,7 @@ public abstract class ProcessorConfigTask extends DefaultTask {
     abstract RegularFileProperty getConfigFile();
 
     @OutputFile
-    abstract RegularFileProperty getApplicationConfigFile();
+    public abstract RegularFileProperty getApplicationConfigFile();
 
     @InputFile
     abstract RegularFileProperty getLiquibaseChangelog();

diff --git a/test-micronaut/build.gradle.kts b/test-micronaut/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.ethelred.buildsupport.ProcessorConfigTask
+
 plugins {
     id("java-convention")
     id("org.ethelred.embeddedpostgres")
@@ -15,4 +17,10 @@ dependencies {
     testRuntimeOnly("io.micronaut.sql:micronaut-jdbc-hikari")
     testRuntimeOnly(libs.postgresql)
     testRuntimeOnly(libs.yaml)
+}
+
+val processorConfig = tasks.named<ProcessorConfigTask>("processorConfig")
+
+tasks.named<ProcessResources>("processTestResources") {
+    from(processorConfig.get().getApplicationConfigFile())
 }