release: 0.3.1 Apparently the main sourceset is off limits when depen…

…ding on tests
sourcegrade · May 19, 2021 · 6f55880 · 6f55880
1 parent 823e47b
commit 6f55880
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "org.jagrkt"
-version = "0.3.0"
+version = "0.3.1"
 
 repositories {
   mavenCentral()

diff --git a/src/main/kotlin/org/jagrkt/submitter/PrepareSubmissionTask.kt b/src/main/kotlin/org/jagrkt/submitter/PrepareSubmissionTask.kt
@@ -35,6 +35,11 @@ import org.gradle.kotlin.dsl.named
 import org.gradle.kotlin.dsl.withType
 
 internal fun Project.createPrepareSubmissionTask(configuration: SubmitConfigurationImpl) {
+
+  val mainResourcesFile = project.buildDir.resolve("resources/submit")
+  val submissionInfoFile = mainResourcesFile.resolve("submission-info.json")
+  val testMetaFile = mainResourcesFile.resolve("meta-meta.json")
+
   tasks.create<Jar>("prepareSubmission") {
     if (configuration.requireTests) {
       dependsOn(tasks.withType<Test>())
@@ -69,7 +74,7 @@ $errors
     with(configuration) {
       archiveFileName.set("$assignmentId-$lastName-$firstName-submission.jar")
     }
-    project.buildDir.resolve("resources/main/submission-info.json").apply {
+    submissionInfoFile.apply {
       parentFile.mkdirs()
       writeText(Json.encodeToString(configuration))
       from(path)
@@ -88,7 +93,7 @@ $errors
       val testMeta = buildJsonObject {
         put("testClasses", testClasses)
       }
-      project.buildDir.resolve("resources/main/test-meta.json").apply {
+      testMetaFile.apply {
         parentFile.mkdirs()
         writeText(testMeta.toString())
         from(path)