Fixing task dependencies

metaborg · Apr 16, 2024 · 228a913 · 228a913
1 parent 4de8129
commit 228a913
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/...fax2/src/main/kotlin/mb/spoofax/compiler/gradle/spoofax2/plugin/Spoofax2LanguagePlugin.kt b/...fax2/src/main/kotlin/mb/spoofax/compiler/gradle/spoofax2/plugin/Spoofax2LanguagePlugin.kt
@@ -151,6 +151,7 @@ open class Spoofax2LanguagePlugin : Plugin<Project> {
       from(project.zipTree("$unpackSpoofaxLanguageDir/target/metaborg/stratego.jar"))
       exclude("META-INF")
     }
+
     val copyMainTask = project.tasks.register<Copy>("copyMainResources") {
       dependsOn(unpackSpoofaxLanguageTask)
       into(project.the<SourceSetContainer>()["main"].java.outputDir)
@@ -159,9 +160,16 @@ open class Spoofax2LanguagePlugin : Plugin<Project> {
         into(".") { with(strategoCopySpec) }
       }
     }
-    project.tasks.getByName(JavaPlugin.CLASSES_TASK_NAME).dependsOn(copyMainTask)
-    project.tasks.getByName(JavaPlugin.JAR_TASK_NAME).dependsOn(copyMainTask)
-    project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(copyMainTask)
+    project.pluginManager.withPlugin("java") {
+      project.tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME) { dependsOn(copyMainTask) }
+      project.tasks.named(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME) { dependsOn(copyMainTask) }
+      project.tasks.named(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME) { dependsOn(copyMainTask) }
+    }
+    project.pluginManager.withPlugin("kotlin-kapt") {
+      project.tasks.named("kaptGenerateStubsTestKotlin") { dependsOn(copyMainTask) }
+      project.tasks.named("kaptTestKotlin") { dependsOn(copyMainTask) }
+    }
+
     val copyTestTask = project.tasks.register<Copy>("copyTestResources") {
       dependsOn(unpackSpoofaxLanguageTask)
       into(project.the<SourceSetContainer>()["test"].java.outputDir)
@@ -170,6 +178,9 @@ open class Spoofax2LanguagePlugin : Plugin<Project> {
         into(".") { with(strategoCopySpec) }
       }
     }
-    project.tasks.getByName(JavaPlugin.TEST_CLASSES_TASK_NAME).dependsOn(copyTestTask)
+
+    project.pluginManager.withPlugin("java") {
+      project.tasks.named(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME) { dependsOn(copyTestTask) }
+    }
   }
 }
diff --git a/core/spoofax.compiler/build.gradle.kts b/core/spoofax.compiler/build.gradle.kts
@@ -78,6 +78,7 @@ val generateVersionPropertiesTask = tasks.register("generateVersionProperties")
 }
 tasks.compileJava.configure { dependsOn(generateVersionPropertiesTask) }
 tasks.compileTestJava.configure { dependsOn(generateVersionPropertiesTask) }
+tasks.processResources.configure { dependsOn(generateVersionPropertiesTask) }
 
 // Custom properties class that does not write the current date, fixing incrementality.
 class NonShittyProperties : Properties() {