Fix SubmissionInfo.json not being generated and release 0.2.0

sourcegrade · May 17, 2021 · 5e422d5 · 5e422d5
1 parent 675539e
commit 5e422d5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "org.jagrkt"
-version = "0.1.0"
+version = "0.2.0"
 
 repositories {
   mavenCentral()
@@ -40,7 +40,7 @@ gradlePlugin {
       id = "org.jagrkt.submitter"
       displayName = "JagrKt Submitter"
       description = "Gradle plugin for submitting source code for the JagrKt AutoGrader"
-      implementationClass = "org.jagrkt.submitter.Submitter"
+      implementationClass = "org.jagrkt.submitter.SubmitterPlugin"
     }
   }
 }

diff --git a/src/main/kotlin/org/jagrkt/submitter/PrepareSubmissionTask.kt b/src/main/kotlin/org/jagrkt/submitter/PrepareSubmissionTask.kt
@@ -19,6 +19,8 @@
 
 package org.jagrkt.submitter
 
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.buildJsonArray
 import kotlinx.serialization.json.buildJsonObject
@@ -30,7 +32,7 @@ import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.named
 
-internal fun Project.createPrepareSubmissionTask(configuration: SubmitConfiguration) {
+internal fun Project.createPrepareSubmissionTask(configuration: SubmitConfigurationImpl) {
   tasks.create<Jar>("prepareSubmission") {
     outputs.upToDateWhen { false }
     group = "submit"
@@ -62,6 +64,11 @@ $errors
     with(configuration) {
       archiveFileName.set("$assignmentId-$lastName-$firstName-submission.jar")
     }
+    project.buildDir.resolve("resources/main/submission-info.json").apply {
+      parentFile.mkdirs()
+      writeText(Json.encodeToString(configuration))
+      from(path)
+    }
     with(test.allSource) {
       val testClasses = buildJsonArray {
         for (file in files) {

diff --git a/src/main/kotlin/org/jagrkt/submitter/Submit.kt b/src/main/kotlin/org/jagrkt/submitter/Submit.kt
@@ -19,6 +19,7 @@
 
 package org.jagrkt.submitter
 
+import kotlinx.serialization.Serializable
 import org.gradle.api.Project
 
 interface SubmitConfiguration {
@@ -28,7 +29,8 @@ interface SubmitConfiguration {
   var lastName: String?
 }
 
-private data class SubmitConfigurationImpl(
+@Serializable
+internal data class SubmitConfigurationImpl(
   override var assignmentId: String? = null,
   override var studentId: String? = null,
   override var firstName: String? = null,

diff --git a/.../kotlin/org/jagrkt/submitter/Submitter.kt → ...n/org/jagrkt/submitter/SubmitterPlugin.kt b/.../kotlin/org/jagrkt/submitter/Submitter.kt → ...n/org/jagrkt/submitter/SubmitterPlugin.kt
@@ -22,7 +22,7 @@ package org.jagrkt.submitter
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
-class Submitter : Plugin<Project> {
+class SubmitterPlugin : Plugin<Project> {
   override fun apply(target: Project) {
   }
 }