Add requirePublicTests property to submit extension

sourcegrade · Apr 11, 2022 · 5bb9796 · 5bb9796
1 parent 1919fc5
commit 5bb9796
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/kotlin/org/sourcegrade/submitter/PrepareSubmissionTask.kt b/src/main/kotlin/org/sourcegrade/submitter/PrepareSubmissionTask.kt
@@ -44,7 +44,10 @@ abstract class PrepareSubmissionTask : Jar() {
     init {
         val submit = project.extensions.getByType<SubmitExtension>()
         if (submit.requireTests) {
-            dependsOn(project.tasks.withType<Test>())
+            project.tasks.findByName("test")?.let { dependsOn(it) }
+        }
+        if (submit.requirePublicTests) {
+            project.tasks.findByName("publicTest")?.let { dependsOn(it) }
         }
         group = "submit"
         val sourceSets = project.extensions.getByName("sourceSets") as SourceSetContainer

diff --git a/src/main/kotlin/org/sourcegrade/submitter/Submit.kt b/src/main/kotlin/org/sourcegrade/submitter/Submit.kt
@@ -27,6 +27,7 @@ interface SubmitExtension {
     var firstName: String?
     var lastName: String?
     var requireTests: Boolean
+    var requirePublicTests: Boolean
     var archiveExtension: String?
 }
 
@@ -37,5 +38,6 @@ internal data class SubmitExtensionImpl(
     override var firstName: String? = null,
     override var lastName: String? = null,
     override var requireTests: Boolean = true,
+    override var requirePublicTests: Boolean = false,
     override var archiveExtension: String? = null,
 ) : SubmitExtension