sourcegrade · alexstaeding · Sep 11, 2023 · Sep 1, 2023 · Sep 11, 2023 · Sep 11, 2023
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -1,7 +1,3 @@
 plugins {
     `kotlin-dsl`
 }
-
-dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
-}
diff --git a/build-logic/src/main/kotlin/jagr-publish.gradle.kts b/build-logic/src/main/kotlin/jagr-publish.gradle.kts
@@ -1,9 +1,15 @@
 import java.net.URI
 
 plugins {
+    java
     `maven-publish`
 }
 
+extensions.configure<JavaPluginExtension> {
+    withJavadocJar()
+    withSourcesJar()
+}
+
 extensions.configure<PublishingExtension> {
     repositories {
         maven {
@@ -16,7 +22,8 @@ extensions.configure<PublishingExtension> {
             url = URI(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
         }
     }
-    publications.withType<MavenPublication> {
+    publications.register<MavenPublication>("maven") {
+        from(components["java"])
         pom {
             name.set("jagr")
             description.set("An automated tool for grading programming assignments")

diff --git a/build-logic/src/main/kotlin/kotlin-js.base-conventions.gradle.kts b/build-logic/src/main/kotlin/kotlin-js.base-conventions.gradle.kts
diff --git a/build-logic/src/main/kotlin/kotlin-jvm.base-conventions.gradle.kts b/build-logic/src/main/kotlin/kotlin-jvm.base-conventions.gradle.kts
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,19 +1,19 @@
 import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     application
-    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.kotlin.kapt) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.shadow)
     alias(libs.plugins.style)
-    id("kotlin-jvm.base-conventions")
 }
 
 dependencies {
-    jvmMainRuntimeOnly(project("jagr-core"))
-    jvmMainImplementation(project("jagr-launcher"))
-    jvmMainImplementation(libs.clikt)
+    runtimeOnly(project("jagr-core"))
+    implementation(project("jagr-launcher"))
+    implementation(libs.clikt)
 }
 
 application {
@@ -55,7 +55,6 @@ val projectVersion = file("version").readLines().first()
 project.extra["apiVersion"] = projectVersion.replace("\\.[1-9]\\d*-SNAPSHOT|\\.0|\\.\\d*\$".toRegex(), "")
 
 allprojects {
-    apply(plugin = "org.jetbrains.kotlin.multiplatform")
     apply(plugin = "org.sourcegrade.style")
 
     group = "org.sourcegrade"
@@ -64,4 +63,15 @@ allprojects {
     project.findProperty("buildNumber")
         ?.takeIf { version.toString().contains("SNAPSHOT") }
         ?.also { version = version.toString().replace("SNAPSHOT", "RC$it") }
+
+    tasks {
+        withType<KotlinCompile> {
+            kotlinOptions.jvmTarget = "11"
+        }
+        withType<JavaCompile> {
+            options.encoding = "UTF-8"
+            sourceCompatibility = "11"
+            targetCompatibility = "11"
+        }
+    }
 }
diff --git a/buildSrc/src/main/kotlin/org/sourcegrade/jagr/script/DependencyConfigurationExtensions.kt b/buildSrc/src/main/kotlin/org/sourcegrade/jagr/script/DependencyConfigurationExtensions.kt
@@ -28,19 +28,19 @@ import org.gradle.kotlin.dsl.project
  * Add a x.y versioned project api dependency to a x.y.z versioned project.
  */
 fun DependencyHandler.apiProject(project: Project, path: String) =
-    addConfiguration("jvmMainApi", project, path)
+    addConfiguration("api", project, path)
 
 /**
  * Add a x.y versioned project implementation dependency to a x.y.z versioned project.
  */
 fun DependencyHandler.implementationProject(project: Project, path: String) =
-    addConfiguration("jvmMainImplementation", project, path)
+    addConfiguration("implementation", project, path)
 
 /**
  * Add a x.y versioned runtimeOnly dependency to a x.y.z versioned project.
  */
 fun DependencyHandler.runtimeOnlyProject(project: Project, path: String) =
-    addConfiguration("jvmMainRuntimeOnly", project, path)
+    addConfiguration("runtimeOnly", project, path)
 
 /**
  * Add a x.y versioned project dependency to a x.y.z versioned project.

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,20 +1,20 @@
 plugins {
+    kotlin("jvm")
     kotlin("plugin.serialization")
     id("jagr-publish")
     id("jagr-sign")
-    id("kotlin-jvm.base-conventions")
 }
 
 dependencies {
-    jvmMainApi(project(":jagr-launcher"))
-    jvmMainImplementation(libs.csv)
-    jvmMainImplementation(libs.asm.util)
-    jvmMainImplementation(libs.serialization)
-    jvmMainImplementation(libs.jansi)
-    jvmMainImplementation(libs.juniversalchardet)
-    jvmMainImplementation(kotlin("reflect"))
-    jvmMainImplementation(files("../gradle/wrapper/gradle-wrapper.jar"))
-    jvmMainRuntimeOnly(libs.apiguardian)
+    api(project(":jagr-launcher"))
+    implementation(libs.csv)
+    implementation(libs.asm.util)
+    implementation(libs.serialization)
+    implementation(libs.jansi)
+    implementation(libs.juniversalchardet)
+    implementation(kotlin("reflect"))
+    implementation(files("../gradle/wrapper/gradle-wrapper.jar"))
+    runtimeOnly(libs.apiguardian)
 }
 tasks {
     test {

diff --git a/...org/sourcegrade/jagr/core/CommonModule.kt → ...org/sourcegrade/jagr/core/CommonModule.kt b/...org/sourcegrade/jagr/core/CommonModule.kt → ...org/sourcegrade/jagr/core/CommonModule.kt
diff --git a/...lin/org/sourcegrade/jagr/core/Parallel.kt → ...lin/org/sourcegrade/jagr/core/Parallel.kt b/...lin/org/sourcegrade/jagr/core/Parallel.kt → ...lin/org/sourcegrade/jagr/core/Parallel.kt
diff --git a/...ourcegrade/jagr/core/compiler/Encoding.kt → ...ourcegrade/jagr/core/compiler/Encoding.kt b/...ourcegrade/jagr/core/compiler/Encoding.kt → ...ourcegrade/jagr/core/compiler/Encoding.kt
diff --git a/...ore/compiler/InfoJsonResourceExtractor.kt → ...ore/compiler/InfoJsonResourceExtractor.kt b/...ore/compiler/InfoJsonResourceExtractor.kt → ...ore/compiler/InfoJsonResourceExtractor.kt
diff --git a/...core/compiler/MutableResourceCollector.kt → ...core/compiler/MutableResourceCollector.kt b/...core/compiler/MutableResourceCollector.kt → ...core/compiler/MutableResourceCollector.kt
diff --git a/.../jagr/core/compiler/ProcessedContainer.kt → .../jagr/core/compiler/ProcessedContainer.kt b/.../jagr/core/compiler/ProcessedContainer.kt → .../jagr/core/compiler/ProcessedContainer.kt
diff --git a/...e/jagr/core/compiler/ResourceCollector.kt → ...e/jagr/core/compiler/ResourceCollector.kt b/...e/jagr/core/compiler/ResourceCollector.kt → ...e/jagr/core/compiler/ResourceCollector.kt
diff --git a/...gr/core/compiler/ResourceCollectorImpl.kt → ...gr/core/compiler/ResourceCollectorImpl.kt b/...gr/core/compiler/ResourceCollectorImpl.kt → ...gr/core/compiler/ResourceCollectorImpl.kt
diff --git a/...e/jagr/core/compiler/ResourceExtractor.kt → ...e/jagr/core/compiler/ResourceExtractor.kt b/...e/jagr/core/compiler/ResourceExtractor.kt → ...e/jagr/core/compiler/ResourceExtractor.kt
diff --git a/...de/jagr/core/compiler/RuntimeContainer.kt → ...de/jagr/core/compiler/RuntimeContainer.kt b/...de/jagr/core/compiler/RuntimeContainer.kt → ...de/jagr/core/compiler/RuntimeContainer.kt
diff --git a/.../jagr/core/compiler/java/CompiledClass.kt → .../jagr/core/compiler/java/CompiledClass.kt b/.../jagr/core/compiler/java/CompiledClass.kt → .../jagr/core/compiler/java/CompiledClass.kt
diff --git a/...r/java/ExtendedStandardJavaFileManager.kt → ...r/java/ExtendedStandardJavaFileManager.kt b/...r/java/ExtendedStandardJavaFileManager.kt → ...r/java/ExtendedStandardJavaFileManager.kt
diff --git a/...re/compiler/java/JavaCompiledContainer.kt → ...re/compiler/java/JavaCompiledContainer.kt b/...re/compiler/java/JavaCompiledContainer.kt → ...re/compiler/java/JavaCompiledContainer.kt
diff --git a/...ore/compiler/java/JavaRuntimeContainer.kt → ...ore/compiler/java/JavaRuntimeContainer.kt b/...ore/compiler/java/JavaRuntimeContainer.kt → ...ore/compiler/java/JavaRuntimeContainer.kt
diff --git a/...core/compiler/java/JavaSourceContainer.kt → ...core/compiler/java/JavaSourceContainer.kt b/...core/compiler/java/JavaSourceContainer.kt → ...core/compiler/java/JavaSourceContainer.kt
diff --git a/...jagr/core/compiler/java/JavaSourceFile.kt → ...jagr/core/compiler/java/JavaSourceFile.kt b/...jagr/core/compiler/java/JavaSourceFile.kt → ...jagr/core/compiler/java/JavaSourceFile.kt
diff --git a/...gr/core/compiler/java/JavaSourceLinker.kt → ...gr/core/compiler/java/JavaSourceLinker.kt b/...gr/core/compiler/java/JavaSourceLinker.kt → ...gr/core/compiler/java/JavaSourceLinker.kt
diff --git a/...e/compiler/java/RuntimeClassLoaderImpl.kt → ...e/compiler/java/RuntimeClassLoaderImpl.kt b/...e/compiler/java/RuntimeClassLoaderImpl.kt → ...e/compiler/java/RuntimeClassLoaderImpl.kt
diff --git a/...gr/core/compiler/java/RuntimeJarLoader.kt → ...gr/core/compiler/java/RuntimeJarLoader.kt b/...gr/core/compiler/java/RuntimeJarLoader.kt → ...gr/core/compiler/java/RuntimeJarLoader.kt
diff --git a/...gr/core/compiler/java/RuntimeResources.kt → ...gr/core/compiler/java/RuntimeResources.kt b/...gr/core/compiler/java/RuntimeResources.kt → ...gr/core/compiler/java/RuntimeResources.kt
diff --git a/...ompiler/java/SourceLinkingClassVisitor.kt → ...ompiler/java/SourceLinkingClassVisitor.kt b/...ompiler/java/SourceLinkingClassVisitor.kt → ...ompiler/java/SourceLinkingClassVisitor.kt
diff --git a/...de/jagr/core/executor/BatchCompilation.kt → ...de/jagr/core/executor/BatchCompilation.kt b/...de/jagr/core/executor/BatchCompilation.kt → ...de/jagr/core/executor/BatchCompilation.kt
diff --git a/.../core/executor/GradingQueueFactoryImpl.kt → .../core/executor/GradingQueueFactoryImpl.kt b/.../core/executor/GradingQueueFactoryImpl.kt → .../core/executor/GradingQueueFactoryImpl.kt
diff --git a/...de/jagr/core/executor/GradingQueueImpl.kt → ...de/jagr/core/executor/GradingQueueImpl.kt b/...de/jagr/core/executor/GradingQueueImpl.kt → ...de/jagr/core/executor/GradingQueueImpl.kt
diff --git a/.../jagr/core/executor/GradingRequestImpl.kt → .../jagr/core/executor/GradingRequestImpl.kt b/.../jagr/core/executor/GradingRequestImpl.kt → .../jagr/core/executor/GradingRequestImpl.kt
diff --git a/...rade/jagr/core/executor/TimeoutHandler.kt → ...rade/jagr/core/executor/TimeoutHandler.kt b/...rade/jagr/core/executor/TimeoutHandler.kt → ...rade/jagr/core/executor/TimeoutHandler.kt
diff --git a/...r/core/export/rubric/BasicHTMLExporter.kt → ...r/core/export/rubric/BasicHTMLExporter.kt b/...r/core/export/rubric/BasicHTMLExporter.kt → ...r/core/export/rubric/BasicHTMLExporter.kt
diff --git a/...r/core/export/rubric/GermanCSVExporter.kt → ...r/core/export/rubric/GermanCSVExporter.kt b/...r/core/export/rubric/GermanCSVExporter.kt → ...r/core/export/rubric/GermanCSVExporter.kt
diff --git a/.../core/export/rubric/MoodleJSONExporter.kt → .../core/export/rubric/MoodleJSONExporter.kt b/.../core/export/rubric/MoodleJSONExporter.kt → .../core/export/rubric/MoodleJSONExporter.kt
diff --git a/...t/submission/EclipseSubmissionExporter.kt → ...t/submission/EclipseSubmissionExporter.kt b/...t/submission/EclipseSubmissionExporter.kt → ...t/submission/EclipseSubmissionExporter.kt
diff --git a/...rt/submission/GradleSubmissionExporter.kt → ...rt/submission/GradleSubmissionExporter.kt b/...rt/submission/GradleSubmissionExporter.kt → ...rt/submission/GradleSubmissionExporter.kt
diff --git a/.../org/sourcegrade/jagr/core/extra/Extra.kt → .../org/sourcegrade/jagr/core/extra/Extra.kt b/.../org/sourcegrade/jagr/core/extra/Extra.kt → .../org/sourcegrade/jagr/core/extra/Extra.kt
diff --git a/...rade/jagr/core/extra/ExtrasManagerImpl.kt → ...rade/jagr/core/extra/ExtrasManagerImpl.kt b/...rade/jagr/core/extra/ExtrasManagerImpl.kt → ...rade/jagr/core/extra/ExtrasManagerImpl.kt
diff --git a/...urcegrade/jagr/core/extra/MoodleUnpack.kt → ...urcegrade/jagr/core/extra/MoodleUnpack.kt b/...urcegrade/jagr/core/extra/MoodleUnpack.kt → ...urcegrade/jagr/core/extra/MoodleUnpack.kt
diff --git a/...org/sourcegrade/jagr/core/extra/Unpack.kt → ...org/sourcegrade/jagr/core/extra/Unpack.kt b/...org/sourcegrade/jagr/core/extra/Unpack.kt → ...org/sourcegrade/jagr/core/extra/Unpack.kt
diff --git a/...ore/io/SerializationFactoryLocatorImpl.kt → ...ore/io/SerializationFactoryLocatorImpl.kt b/...ore/io/SerializationFactoryLocatorImpl.kt → ...ore/io/SerializationFactoryLocatorImpl.kt
diff --git a/.../jagr/core/rubric/CriterionBuilderImpl.kt → .../jagr/core/rubric/CriterionBuilderImpl.kt b/.../jagr/core/rubric/CriterionBuilderImpl.kt → .../jagr/core/rubric/CriterionBuilderImpl.kt
diff --git a/.../jagr/core/rubric/CriterionFactoryImpl.kt → .../jagr/core/rubric/CriterionFactoryImpl.kt b/.../jagr/core/rubric/CriterionFactoryImpl.kt → .../jagr/core/rubric/CriterionFactoryImpl.kt
diff --git a/...terionHolderPointCalculatorFactoryImpl.kt → ...terionHolderPointCalculatorFactoryImpl.kt b/...terionHolderPointCalculatorFactoryImpl.kt → ...terionHolderPointCalculatorFactoryImpl.kt
diff --git a/...cegrade/jagr/core/rubric/CriterionImpl.kt → ...cegrade/jagr/core/rubric/CriterionImpl.kt b/...cegrade/jagr/core/rubric/CriterionImpl.kt → ...cegrade/jagr/core/rubric/CriterionImpl.kt
diff --git a/...agr/core/rubric/GradeResultFactoryImpl.kt → ...agr/core/rubric/GradeResultFactoryImpl.kt b/...agr/core/rubric/GradeResultFactoryImpl.kt → ...agr/core/rubric/GradeResultFactoryImpl.kt
diff --git a/...grade/jagr/core/rubric/GradeResultImpl.kt → ...grade/jagr/core/rubric/GradeResultImpl.kt b/...grade/jagr/core/rubric/GradeResultImpl.kt → ...grade/jagr/core/rubric/GradeResultImpl.kt
diff --git a/...grade/jagr/core/rubric/GradeResultMath.kt → ...grade/jagr/core/rubric/GradeResultMath.kt b/...grade/jagr/core/rubric/GradeResultMath.kt → ...grade/jagr/core/rubric/GradeResultMath.kt
diff --git a/...e/jagr/core/rubric/GradedCriterionImpl.kt → ...e/jagr/core/rubric/GradedCriterionImpl.kt b/...e/jagr/core/rubric/GradedCriterionImpl.kt → ...e/jagr/core/rubric/GradedCriterionImpl.kt
diff --git a/...rade/jagr/core/rubric/GradedRubricImpl.kt → ...rade/jagr/core/rubric/GradedRubricImpl.kt b/...rade/jagr/core/rubric/GradedRubricImpl.kt → ...rade/jagr/core/rubric/GradedRubricImpl.kt
diff --git a/...gr/core/rubric/JUnitTestRefFactoryImpl.kt → ...gr/core/rubric/JUnitTestRefFactoryImpl.kt b/...gr/core/rubric/JUnitTestRefFactoryImpl.kt → ...gr/core/rubric/JUnitTestRefFactoryImpl.kt
diff --git a/...ade/jagr/core/rubric/RubricBuilderImpl.kt → ...ade/jagr/core/rubric/RubricBuilderImpl.kt b/...ade/jagr/core/rubric/RubricBuilderImpl.kt → ...ade/jagr/core/rubric/RubricBuilderImpl.kt
diff --git a/...ade/jagr/core/rubric/RubricFactoryImpl.kt → ...ade/jagr/core/rubric/RubricFactoryImpl.kt b/...ade/jagr/core/rubric/RubricFactoryImpl.kt → ...ade/jagr/core/rubric/RubricFactoryImpl.kt
diff --git a/...ourcegrade/jagr/core/rubric/RubricImpl.kt → ...ourcegrade/jagr/core/rubric/RubricImpl.kt b/...ourcegrade/jagr/core/rubric/RubricImpl.kt → ...ourcegrade/jagr/core/rubric/RubricImpl.kt
diff --git a/...agr/core/rubric/TestExecutionMessaging.kt → ...agr/core/rubric/TestExecutionMessaging.kt b/...agr/core/rubric/TestExecutionMessaging.kt → ...agr/core/rubric/TestExecutionMessaging.kt
diff --git a/...re/rubric/grader/AbstractGraderBuilder.kt → ...re/rubric/grader/AbstractGraderBuilder.kt b/...re/rubric/grader/AbstractGraderBuilder.kt → ...re/rubric/grader/AbstractGraderBuilder.kt
diff --git a/...rubric/grader/DescendingPriorityGrader.kt → ...rubric/grader/DescendingPriorityGrader.kt b/...rubric/grader/DescendingPriorityGrader.kt → ...rubric/grader/DescendingPriorityGrader.kt
diff --git a/...r/core/rubric/grader/GraderFactoryImpl.kt → ...r/core/rubric/grader/GraderFactoryImpl.kt b/...r/core/rubric/grader/GraderFactoryImpl.kt → ...r/core/rubric/grader/GraderFactoryImpl.kt
diff --git a/...bric/grader/TestAwareGraderBuilderImpl.kt → ...bric/grader/TestAwareGraderBuilderImpl.kt b/...bric/grader/TestAwareGraderBuilderImpl.kt → ...bric/grader/TestAwareGraderBuilderImpl.kt
diff --git a/...core/rubric/grader/TestAwareGraderImpl.kt → ...core/rubric/grader/TestAwareGraderImpl.kt b/...core/rubric/grader/TestAwareGraderImpl.kt → ...core/rubric/grader/TestAwareGraderImpl.kt
diff --git a/.../jagr/core/testing/FallbackJUnitResult.kt → .../jagr/core/testing/FallbackJUnitResult.kt b/.../jagr/core/testing/FallbackJUnitResult.kt → .../jagr/core/testing/FallbackJUnitResult.kt
diff --git a/...agr/core/testing/FallbackRuntimeTester.kt → ...agr/core/testing/FallbackRuntimeTester.kt b/...agr/core/testing/FallbackRuntimeTester.kt → ...agr/core/testing/FallbackRuntimeTester.kt
diff --git a/...de/jagr/core/testing/FallbackTestCycle.kt → ...de/jagr/core/testing/FallbackTestCycle.kt b/...de/jagr/core/testing/FallbackTestCycle.kt → ...de/jagr/core/testing/FallbackTestCycle.kt
diff --git a/...egrade/jagr/core/testing/GraderJarImpl.kt → ...egrade/jagr/core/testing/GraderJarImpl.kt b/...egrade/jagr/core/testing/GraderJarImpl.kt → ...egrade/jagr/core/testing/GraderJarImpl.kt
diff --git a/...rade/jagr/core/testing/JUnitResultImpl.kt → ...rade/jagr/core/testing/JUnitResultImpl.kt b/...rade/jagr/core/testing/JUnitResultImpl.kt → ...rade/jagr/core/testing/JUnitResultImpl.kt
diff --git a/...de/jagr/core/testing/JavaRuntimeTester.kt → ...de/jagr/core/testing/JavaRuntimeTester.kt b/...de/jagr/core/testing/JavaRuntimeTester.kt → ...de/jagr/core/testing/JavaRuntimeTester.kt
diff --git a/...grade/jagr/core/testing/JavaSubmission.kt → ...grade/jagr/core/testing/JavaSubmission.kt b/...grade/jagr/core/testing/JavaSubmission.kt → ...grade/jagr/core/testing/JavaSubmission.kt
diff --git a/...egrade/jagr/core/testing/JavaTestCycle.kt → ...egrade/jagr/core/testing/JavaTestCycle.kt b/...egrade/jagr/core/testing/JavaTestCycle.kt → ...egrade/jagr/core/testing/JavaTestCycle.kt
diff --git a/...r/core/testing/RubricConfigurationImpl.kt → ...r/core/testing/RubricConfigurationImpl.kt b/...r/core/testing/RubricConfigurationImpl.kt → ...r/core/testing/RubricConfigurationImpl.kt
diff --git a/...de/jagr/core/testing/RuntimeGraderImpl.kt → ...de/jagr/core/testing/RuntimeGraderImpl.kt b/...de/jagr/core/testing/RuntimeGraderImpl.kt → ...de/jagr/core/testing/RuntimeGraderImpl.kt
diff --git a/...egrade/jagr/core/testing/RuntimeTester.kt → ...egrade/jagr/core/testing/RuntimeTester.kt b/...egrade/jagr/core/testing/RuntimeTester.kt → ...egrade/jagr/core/testing/RuntimeTester.kt
diff --git a/...gr/core/testing/TestStatusListenerImpl.kt → ...gr/core/testing/TestStatusListenerImpl.kt b/...gr/core/testing/TestStatusListenerImpl.kt → ...gr/core/testing/TestStatusListenerImpl.kt
diff --git a/...esting/ThreadedGlobalParameterResolver.kt → ...esting/ThreadedGlobalParameterResolver.kt b/...esting/ThreadedGlobalParameterResolver.kt → ...esting/ThreadedGlobalParameterResolver.kt
diff --git a/...r/core/transformer/BytecodeReplacement.kt → ...r/core/transformer/BytecodeReplacement.kt b/...r/core/transformer/BytecodeReplacement.kt → ...r/core/transformer/BytecodeReplacement.kt
diff --git a/...e/transformer/ClassRenamingTransformer.kt → ...e/transformer/ClassRenamingTransformer.kt b/...e/transformer/ClassRenamingTransformer.kt → ...e/transformer/ClassRenamingTransformer.kt
diff --git a/...ransformer/ClassTransformerFactoryImpl.kt → ...ransformer/ClassTransformerFactoryImpl.kt b/...ransformer/ClassTransformerFactoryImpl.kt → ...ransformer/ClassTransformerFactoryImpl.kt
diff --git a/...ore/transformer/CommonClassTransformer.kt → ...ore/transformer/CommonClassTransformer.kt b/...ore/transformer/CommonClassTransformer.kt → ...ore/transformer/CommonClassTransformer.kt
diff --git a/...ade/jagr/core/transformer/FieldElement.kt → ...ade/jagr/core/transformer/FieldElement.kt b/...ade/jagr/core/transformer/FieldElement.kt → ...ade/jagr/core/transformer/FieldElement.kt
diff --git a/...jagr/core/transformer/FieldInsnElement.kt → ...jagr/core/transformer/FieldInsnElement.kt b/...jagr/core/transformer/FieldInsnElement.kt → ...jagr/core/transformer/FieldInsnElement.kt
diff --git a/...ransformer/InjectSuperclassTransformer.kt → ...ransformer/InjectSuperclassTransformer.kt b/...ransformer/InjectSuperclassTransformer.kt → ...ransformer/InjectSuperclassTransformer.kt
diff --git a/...agr/core/transformer/MethodInsnElement.kt → ...agr/core/transformer/MethodInsnElement.kt b/...agr/core/transformer/MethodInsnElement.kt → ...agr/core/transformer/MethodInsnElement.kt
diff --git a/...ore/transformer/ReplacementTransformer.kt → ...ore/transformer/ReplacementTransformer.kt b/...ore/transformer/ReplacementTransformer.kt → ...ore/transformer/ReplacementTransformer.kt
diff --git a/...rmer/SubmissionVerificationTransformer.kt → ...rmer/SubmissionVerificationTransformer.kt b/...rmer/SubmissionVerificationTransformer.kt → ...rmer/SubmissionVerificationTransformer.kt
diff --git a/...gr/core/transformer/TransformerApplier.kt → ...gr/core/transformer/TransformerApplier.kt b/...gr/core/transformer/TransformerApplier.kt → ...gr/core/transformer/TransformerApplier.kt
diff --git a/core/src/jvmMain/resources/jagr.json → core/src/main/resources/jagr.json b/core/src/jvmMain/resources/jagr.json → core/src/main/resources/jagr.json
diff --git a/grader-api/build.gradle.kts b/grader-api/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
+    `java-library`
     id("jagr-publish")
     id("jagr-sign")
-    id("kotlin-jvm.base-conventions")
 }
 
 tasks {
@@ -15,9 +15,9 @@ val apiVersion: String by rootProject
 version = apiVersion
 
 dependencies {
-    jvmMainApi(libs.asm.core)
-    jvmMainApi(libs.guice)
-    jvmMainApi(libs.logging.api)
-    jvmMainApi(libs.bundles.junit)
-    jvmMainImplementation(libs.annotations)
+    api(libs.asm.core)
+    api(libs.guice)
+    api(libs.logging.api)
+    api(libs.bundles.junit)
+    implementation(libs.annotations)
 }
diff --git a/...ourcegrade/jagr/api/rubric/Criterion.java → ...ourcegrade/jagr/api/rubric/Criterion.java b/...ourcegrade/jagr/api/rubric/Criterion.java → ...ourcegrade/jagr/api/rubric/Criterion.java
diff --git a/...rade/jagr/api/rubric/CriterionHolder.java → ...rade/jagr/api/rubric/CriterionHolder.java b/...rade/jagr/api/rubric/CriterionHolder.java → ...rade/jagr/api/rubric/CriterionHolder.java
diff --git a/...ubric/CriterionHolderPointCalculator.java → ...ubric/CriterionHolderPointCalculator.java b/...ubric/CriterionHolderPointCalculator.java → ...ubric/CriterionHolderPointCalculator.java
diff --git a/...sourcegrade/jagr/api/rubric/Gradable.java → ...sourcegrade/jagr/api/rubric/Gradable.java b/...sourcegrade/jagr/api/rubric/Gradable.java → ...sourcegrade/jagr/api/rubric/Gradable.java
diff --git a/...rcegrade/jagr/api/rubric/GradeResult.java → ...rcegrade/jagr/api/rubric/GradeResult.java b/...rcegrade/jagr/api/rubric/GradeResult.java → ...rcegrade/jagr/api/rubric/GradeResult.java
diff --git a/...g/sourcegrade/jagr/api/rubric/Graded.java → ...g/sourcegrade/jagr/api/rubric/Graded.java b/...g/sourcegrade/jagr/api/rubric/Graded.java → ...g/sourcegrade/jagr/api/rubric/Graded.java
diff --git a/...rade/jagr/api/rubric/GradedCriterion.java → ...rade/jagr/api/rubric/GradedCriterion.java b/...rade/jagr/api/rubric/GradedCriterion.java → ...rade/jagr/api/rubric/GradedCriterion.java
diff --git a/...cegrade/jagr/api/rubric/GradedRubric.java → ...cegrade/jagr/api/rubric/GradedRubric.java b/...cegrade/jagr/api/rubric/GradedRubric.java → ...cegrade/jagr/api/rubric/GradedRubric.java
diff --git a/...g/sourcegrade/jagr/api/rubric/Grader.java → ...g/sourcegrade/jagr/api/rubric/Grader.java b/...g/sourcegrade/jagr/api/rubric/Grader.java → ...g/sourcegrade/jagr/api/rubric/Grader.java
diff --git a/...cegrade/jagr/api/rubric/JUnitTestRef.java → ...cegrade/jagr/api/rubric/JUnitTestRef.java b/...cegrade/jagr/api/rubric/JUnitTestRef.java → ...cegrade/jagr/api/rubric/JUnitTestRef.java
diff --git a/...urcegrade/jagr/api/rubric/PointRange.java → ...urcegrade/jagr/api/rubric/PointRange.java b/...urcegrade/jagr/api/rubric/PointRange.java → ...urcegrade/jagr/api/rubric/PointRange.java
diff --git a/...g/sourcegrade/jagr/api/rubric/Rubric.java → ...g/sourcegrade/jagr/api/rubric/Rubric.java b/...g/sourcegrade/jagr/api/rubric/Rubric.java → ...g/sourcegrade/jagr/api/rubric/Rubric.java
diff --git a/...grade/jagr/api/rubric/RubricProvider.java → ...grade/jagr/api/rubric/RubricProvider.java b/...grade/jagr/api/rubric/RubricProvider.java → ...grade/jagr/api/rubric/RubricProvider.java
diff --git a/...de/jagr/api/rubric/TestForSubmission.java → ...de/jagr/api/rubric/TestForSubmission.java b/...de/jagr/api/rubric/TestForSubmission.java → ...de/jagr/api/rubric/TestForSubmission.java
diff --git a/...de/jagr/api/testing/ClassTransformer.java → ...de/jagr/api/testing/ClassTransformer.java b/...de/jagr/api/testing/ClassTransformer.java → ...de/jagr/api/testing/ClassTransformer.java
diff --git a/...gr/api/testing/ClassTransformerOrder.java → ...gr/api/testing/ClassTransformerOrder.java b/...gr/api/testing/ClassTransformerOrder.java → ...gr/api/testing/ClassTransformerOrder.java
diff --git a/...grade/jagr/api/testing/CompileResult.java → ...grade/jagr/api/testing/CompileResult.java b/...grade/jagr/api/testing/CompileResult.java → ...grade/jagr/api/testing/CompileResult.java
diff --git a/...jagr/api/testing/RubricConfiguration.java → ...jagr/api/testing/RubricConfiguration.java b/...jagr/api/testing/RubricConfiguration.java → ...jagr/api/testing/RubricConfiguration.java
diff --git a/.../jagr/api/testing/RuntimeClassLoader.java → .../jagr/api/testing/RuntimeClassLoader.java b/.../jagr/api/testing/RuntimeClassLoader.java → .../jagr/api/testing/RuntimeClassLoader.java
diff --git a/...rcegrade/jagr/api/testing/SourceFile.java → ...rcegrade/jagr/api/testing/SourceFile.java b/...rcegrade/jagr/api/testing/SourceFile.java → ...rcegrade/jagr/api/testing/SourceFile.java
diff --git a/...rcegrade/jagr/api/testing/Submission.java → ...rcegrade/jagr/api/testing/Submission.java b/...rcegrade/jagr/api/testing/Submission.java → ...rcegrade/jagr/api/testing/Submission.java
diff --git a/...urcegrade/jagr/api/testing/TestCycle.java → ...urcegrade/jagr/api/testing/TestCycle.java b/...urcegrade/jagr/api/testing/TestCycle.java → ...urcegrade/jagr/api/testing/TestCycle.java
diff --git a/.../jagr/api/testing/TestStatusListener.java → .../jagr/api/testing/TestStatusListener.java b/.../jagr/api/testing/TestStatusListener.java → .../jagr/api/testing/TestStatusListener.java
diff --git a/...ing/extension/JagrExecutionCondition.java → ...ing/extension/JagrExecutionCondition.java b/...ing/extension/JagrExecutionCondition.java → ...ing/extension/JagrExecutionCondition.java
diff --git a/.../testing/extension/TestCycleResolver.java → .../testing/extension/TestCycleResolver.java b/.../testing/extension/TestCycleResolver.java → .../testing/extension/TestCycleResolver.java
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -32,8 +32,8 @@ junit = ["junit-core", "junit-engine", "junit-launcher"]
 [plugins]
 download = "de.undercouch.download:5.5.0"
 gradle-publish = "com.gradle.plugin-publish:1.2.1"
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
 style = "org.sourcegrade.style:3.0.0"
diff --git a/launcher/build.gradle.kts b/launcher/build.gradle.kts
@@ -1,27 +1,26 @@
 import org.sourcegrade.jagr.script.apiProject
 
 plugins {
+    kotlin("jvm")
     kotlin("kapt")
     kotlin("plugin.serialization")
     id("jagr-publish")
     id("jagr-sign")
-    id("kotlin-jvm.base-conventions")
 }
 
 dependencies {
     apiProject(project, "jagr-grader-api")
-    commonMainImplementation(kotlin("reflect"))
-    jvmMainApi(libs.coroutines)
-    jvmMainImplementation(libs.configurate.hocon)
-    jvmMainImplementation(libs.configurate.kotlin)
-    jvmMainImplementation(libs.annotations)
-    jvmMainImplementation(libs.serialization)
-    jvmMainImplementation(libs.logging.core)
+    api(libs.coroutines)
+    implementation(kotlin("reflect"))
+    implementation(libs.configurate.hocon)
+    implementation(libs.configurate.kotlin)
+    implementation(libs.annotations)
+    implementation(libs.serialization)
+    implementation(libs.logging.core)
     kapt(libs.logging.core)
 }
 
 tasks {
-    @Suppress("UnstableApiUsage")
     withType<ProcessResources> {
         from(rootProject.file("version")) {
             into("org/sourcegrade/jagr/")

diff --git a/launcher/gradle-plugin/build.gradle.kts b/launcher/gradle-plugin/build.gradle.kts
@@ -1,9 +1,10 @@
 plugins {
     `java-gradle-plugin`
-    kotlin("plugin.serialization")
+    alias(libs.plugins.gradle.publish)
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.kotlin.serialization)
     id("jagr-publish")
     // signing done by gradle-publish plugin
-    id("kotlin-jvm.base-conventions")
 }
 
 tasks {
@@ -13,12 +14,12 @@ tasks {
 }
 
 dependencies {
-    jvmMainCompileOnly(gradleKotlinDsl())
-    jvmMainImplementation(libs.serialization)
-    jvmMainImplementation(libs.logging.core)
-    jvmMainImplementation("de.undercouch:gradle-download-task:${libs.plugins.download.get().version}")
-    jvmMainRuntimeOnly(project(":jagr-core"))
-    jvmMainImplementation(project(":jagr-launcher"))
+    implementation(gradleKotlinDsl())
+    implementation(libs.serialization)
+    implementation(libs.logging.core)
+    implementation("de.undercouch:gradle-download-task:${libs.plugins.download.get().version}")
+    runtimeOnly(project(":jagr-core"))
+    implementation(project(":jagr-launcher"))
 }
 
 gradlePlugin {

diff --git a/...urcegrade/jagr/gradle/JagrGradlePlugin.kt → ...urcegrade/jagr/gradle/JagrGradlePlugin.kt b/...urcegrade/jagr/gradle/JagrGradlePlugin.kt → ...urcegrade/jagr/gradle/JagrGradlePlugin.kt
diff --git a/...egrade/jagr/gradle/SourceSetExtensions.kt → ...egrade/jagr/gradle/SourceSetExtensions.kt b/...egrade/jagr/gradle/SourceSetExtensions.kt → ...egrade/jagr/gradle/SourceSetExtensions.kt
diff --git a/...gradle/extension/AbstractConfiguration.kt → ...gradle/extension/AbstractConfiguration.kt b/...gradle/extension/AbstractConfiguration.kt → ...gradle/extension/AbstractConfiguration.kt
diff --git a/...adle/extension/DependencyConfiguration.kt → ...adle/extension/DependencyConfiguration.kt b/...adle/extension/DependencyConfiguration.kt → ...adle/extension/DependencyConfiguration.kt
diff --git a/...r/gradle/extension/GraderConfiguration.kt → ...r/gradle/extension/GraderConfiguration.kt b/...r/gradle/extension/GraderConfiguration.kt → ...r/gradle/extension/GraderConfiguration.kt
diff --git a/...gradle/extension/JagrDownloadExtension.kt → ...gradle/extension/JagrDownloadExtension.kt b/...gradle/extension/JagrDownloadExtension.kt → ...gradle/extension/JagrDownloadExtension.kt
diff --git a/...de/jagr/gradle/extension/JagrExtension.kt → ...de/jagr/gradle/extension/JagrExtension.kt b/...de/jagr/gradle/extension/JagrExtension.kt → ...de/jagr/gradle/extension/JagrExtension.kt
diff --git a/...gradle/extension/ProjectSourceSetTuple.kt → ...gradle/extension/ProjectSourceSetTuple.kt b/...gradle/extension/ProjectSourceSetTuple.kt → ...gradle/extension/ProjectSourceSetTuple.kt
diff --git a/...gradle/extension/RelativeProjectSearch.kt → ...gradle/extension/RelativeProjectSearch.kt b/...gradle/extension/RelativeProjectSearch.kt → ...gradle/extension/RelativeProjectSearch.kt
diff --git a/...adle/extension/SubmissionConfiguration.kt → ...adle/extension/SubmissionConfiguration.kt b/...adle/extension/SubmissionConfiguration.kt → ...adle/extension/SubmissionConfiguration.kt
diff --git a/...rade/jagr/gradle/task/JagrDownloadTask.kt → ...rade/jagr/gradle/task/JagrDownloadTask.kt b/...rade/jagr/gradle/task/JagrDownloadTask.kt → ...rade/jagr/gradle/task/JagrDownloadTask.kt
diff --git a/...grade/jagr/gradle/task/JagrTaskFactory.kt → ...grade/jagr/gradle/task/JagrTaskFactory.kt b/...grade/jagr/gradle/task/JagrTaskFactory.kt → ...grade/jagr/gradle/task/JagrTaskFactory.kt
diff --git a/.../jagr/gradle/task/TargetAssignmentTask.kt → .../jagr/gradle/task/TargetAssignmentTask.kt b/.../jagr/gradle/task/TargetAssignmentTask.kt → .../jagr/gradle/task/TargetAssignmentTask.kt
diff --git a/.../jagr/gradle/task/TargetSourceSetsTask.kt → .../jagr/gradle/task/TargetSourceSetsTask.kt b/.../jagr/gradle/task/TargetSourceSetsTask.kt → .../jagr/gradle/task/TargetSourceSetsTask.kt
diff --git a/...cegrade/jagr/gradle/task/WriteInfoTask.kt → ...cegrade/jagr/gradle/task/WriteInfoTask.kt b/...cegrade/jagr/gradle/task/WriteInfoTask.kt → ...cegrade/jagr/gradle/task/WriteInfoTask.kt
diff --git a/...agr/gradle/task/grader/GraderBuildTask.kt → ...agr/gradle/task/grader/GraderBuildTask.kt b/...agr/gradle/task/grader/GraderBuildTask.kt → ...agr/gradle/task/grader/GraderBuildTask.kt
diff --git a/...jagr/gradle/task/grader/GraderLibsTask.kt → ...jagr/gradle/task/grader/GraderLibsTask.kt b/...jagr/gradle/task/grader/GraderLibsTask.kt → ...jagr/gradle/task/grader/GraderLibsTask.kt
diff --git a/.../jagr/gradle/task/grader/GraderRunTask.kt → .../jagr/gradle/task/grader/GraderRunTask.kt b/.../jagr/gradle/task/grader/GraderRunTask.kt → .../jagr/gradle/task/grader/GraderRunTask.kt
diff --git a/...ade/jagr/gradle/task/grader/GraderTask.kt → ...ade/jagr/gradle/task/grader/GraderTask.kt b/...ade/jagr/gradle/task/grader/GraderTask.kt → ...ade/jagr/gradle/task/grader/GraderTask.kt
diff --git a/...gradle/task/grader/GraderWriteInfoTask.kt → ...gradle/task/grader/GraderWriteInfoTask.kt b/...gradle/task/grader/GraderWriteInfoTask.kt → ...gradle/task/grader/GraderWriteInfoTask.kt
diff --git a/.../task/grader/GradleLaunchConfiguration.kt → .../task/grader/GradleLaunchConfiguration.kt b/.../task/grader/GradleLaunchConfiguration.kt → .../task/grader/GradleLaunchConfiguration.kt
diff --git a/...le/task/submission/SubmissionBuildTask.kt → ...le/task/submission/SubmissionBuildTask.kt b/...le/task/submission/SubmissionBuildTask.kt → ...le/task/submission/SubmissionBuildTask.kt
diff --git a/.../gradle/task/submission/SubmissionTask.kt → .../gradle/task/submission/SubmissionTask.kt b/.../gradle/task/submission/SubmissionTask.kt → .../gradle/task/submission/SubmissionTask.kt
diff --git a/...ask/submission/SubmissionWriteInfoTask.kt → ...ask/submission/SubmissionWriteInfoTask.kt b/...ask/submission/SubmissionWriteInfoTask.kt → ...ask/submission/SubmissionWriteInfoTask.kt
diff --git a/...g/sourcegrade/jagr/launcher/env/Config.kt → ...g/sourcegrade/jagr/launcher/env/Config.kt b/...g/sourcegrade/jagr/launcher/env/Config.kt → ...g/sourcegrade/jagr/launcher/env/Config.kt
diff --git a/...rcegrade/jagr/launcher/env/Environment.kt → ...rcegrade/jagr/launcher/env/Environment.kt b/...rcegrade/jagr/launcher/env/Environment.kt → ...rcegrade/jagr/launcher/env/Environment.kt
diff --git a/...org/sourcegrade/jagr/launcher/env/Jagr.kt → ...org/sourcegrade/jagr/launcher/env/Jagr.kt b/...org/sourcegrade/jagr/launcher/env/Jagr.kt → ...org/sourcegrade/jagr/launcher/env/Jagr.kt
diff --git a/...sourcegrade/jagr/launcher/env/JagrImpl.kt → ...sourcegrade/jagr/launcher/env/JagrImpl.kt b/...sourcegrade/jagr/launcher/env/JagrImpl.kt → ...sourcegrade/jagr/launcher/env/JagrImpl.kt
diff --git a/.../jagr/launcher/env/LaunchConfiguration.kt → .../jagr/launcher/env/LaunchConfiguration.kt b/.../jagr/launcher/env/LaunchConfiguration.kt → .../jagr/launcher/env/LaunchConfiguration.kt
diff --git a/...egrade/jagr/launcher/env/ModuleFactory.kt → ...egrade/jagr/launcher/env/ModuleFactory.kt b/...egrade/jagr/launcher/env/ModuleFactory.kt → ...egrade/jagr/launcher/env/ModuleFactory.kt
diff --git a/...launcher/env/SystemResourceJagrFactory.kt → ...launcher/env/SystemResourceJagrFactory.kt b/...launcher/env/SystemResourceJagrFactory.kt → ...launcher/env/SystemResourceJagrFactory.kt
diff --git a/...egrade/jagr/launcher/executor/Executor.kt → ...egrade/jagr/launcher/executor/Executor.kt b/...egrade/jagr/launcher/executor/Executor.kt → ...egrade/jagr/launcher/executor/Executor.kt
diff --git a/...rade/jagr/launcher/executor/GradingJob.kt → ...rade/jagr/launcher/executor/GradingJob.kt b/...rade/jagr/launcher/executor/GradingJob.kt → ...rade/jagr/launcher/executor/GradingJob.kt
diff --git a/...de/jagr/launcher/executor/GradingQueue.kt → ...de/jagr/launcher/executor/GradingQueue.kt b/...de/jagr/launcher/executor/GradingQueue.kt → ...de/jagr/launcher/executor/GradingQueue.kt
diff --git a/.../jagr/launcher/executor/GradingRequest.kt → .../jagr/launcher/executor/GradingRequest.kt b/.../jagr/launcher/executor/GradingRequest.kt → .../jagr/launcher/executor/GradingRequest.kt
diff --git a/...e/jagr/launcher/executor/GradingResult.kt → ...e/jagr/launcher/executor/GradingResult.kt b/...e/jagr/launcher/executor/GradingResult.kt → ...e/jagr/launcher/executor/GradingResult.kt
diff --git a/.../launcher/executor/MultiWorkerExecutor.kt → .../launcher/executor/MultiWorkerExecutor.kt b/.../launcher/executor/MultiWorkerExecutor.kt → .../launcher/executor/MultiWorkerExecutor.kt
diff --git a/...uncher/executor/MutableRubricCollector.kt → ...uncher/executor/MutableRubricCollector.kt b/...uncher/executor/MutableRubricCollector.kt → ...uncher/executor/MutableRubricCollector.kt
diff --git a/...e/jagr/launcher/executor/ProcessWorker.kt → ...e/jagr/launcher/executor/ProcessWorker.kt b/...e/jagr/launcher/executor/ProcessWorker.kt → ...e/jagr/launcher/executor/ProcessWorker.kt
diff --git a/...gr/launcher/executor/ProcessWorkerPool.kt → ...gr/launcher/executor/ProcessWorkerPool.kt b/...gr/launcher/executor/ProcessWorkerPool.kt → ...gr/launcher/executor/ProcessWorkerPool.kt
diff --git a/...ade/jagr/launcher/executor/ProgressBar.kt → ...ade/jagr/launcher/executor/ProgressBar.kt b/...ade/jagr/launcher/executor/ProgressBar.kt → ...ade/jagr/launcher/executor/ProgressBar.kt
diff --git a/.../launcher/executor/ProgressBarProvider.kt → .../launcher/executor/ProgressBarProvider.kt b/.../launcher/executor/ProgressBarProvider.kt → .../launcher/executor/ProgressBarProvider.kt
diff --git a/.../launcher/executor/RotationProgressBar.kt → .../launcher/executor/RotationProgressBar.kt b/.../launcher/executor/RotationProgressBar.kt → .../launcher/executor/RotationProgressBar.kt
diff --git a/...jagr/launcher/executor/RubricCollector.kt → ...jagr/launcher/executor/RubricCollector.kt b/...jagr/launcher/executor/RubricCollector.kt → ...jagr/launcher/executor/RubricCollector.kt
diff --git a/.../launcher/executor/RubricCollectorImpl.kt → .../launcher/executor/RubricCollectorImpl.kt b/.../launcher/executor/RubricCollectorImpl.kt → .../launcher/executor/RubricCollectorImpl.kt
diff --git a/...e/jagr/launcher/executor/RuntimeGrader.kt → ...e/jagr/launcher/executor/RuntimeGrader.kt b/...e/jagr/launcher/executor/RuntimeGrader.kt → ...e/jagr/launcher/executor/RuntimeGrader.kt
diff --git a/.../jagr/launcher/executor/RuntimeInvoker.kt → .../jagr/launcher/executor/RuntimeInvoker.kt b/.../jagr/launcher/executor/RuntimeInvoker.kt → .../jagr/launcher/executor/RuntimeInvoker.kt
diff --git a/...gr/launcher/executor/RuntimeJarInvoker.kt → ...gr/launcher/executor/RuntimeJarInvoker.kt b/...gr/launcher/executor/RuntimeJarInvoker.kt → ...gr/launcher/executor/RuntimeJarInvoker.kt
diff --git a/...de/jagr/launcher/executor/SyncExecutor.kt → ...de/jagr/launcher/executor/SyncExecutor.kt b/...de/jagr/launcher/executor/SyncExecutor.kt → ...de/jagr/launcher/executor/SyncExecutor.kt
diff --git a/...uncher/executor/ThreadAwarePrintStream.kt → ...uncher/executor/ThreadAwarePrintStream.kt b/...uncher/executor/ThreadAwarePrintStream.kt → ...uncher/executor/ThreadAwarePrintStream.kt
diff --git a/...de/jagr/launcher/executor/ThreadWorker.kt → ...de/jagr/launcher/executor/ThreadWorker.kt b/...de/jagr/launcher/executor/ThreadWorker.kt → ...de/jagr/launcher/executor/ThreadWorker.kt
diff --git a/...agr/launcher/executor/ThreadWorkerPool.kt → ...agr/launcher/executor/ThreadWorkerPool.kt b/...agr/launcher/executor/ThreadWorkerPool.kt → ...agr/launcher/executor/ThreadWorkerPool.kt
diff --git a/...rcegrade/jagr/launcher/executor/Worker.kt → ...rcegrade/jagr/launcher/executor/Worker.kt b/...rcegrade/jagr/launcher/executor/Worker.kt → ...rcegrade/jagr/launcher/executor/Worker.kt
diff --git a/...rade/jagr/launcher/executor/WorkerPool.kt → ...rade/jagr/launcher/executor/WorkerPool.kt b/...rade/jagr/launcher/executor/WorkerPool.kt → ...rade/jagr/launcher/executor/WorkerPool.kt
diff --git a/...de/jagr/launcher/executor/WorkerStatus.kt → ...de/jagr/launcher/executor/WorkerStatus.kt b/...de/jagr/launcher/executor/WorkerStatus.kt → ...de/jagr/launcher/executor/WorkerStatus.kt
diff --git a/...r/launcher/executor/WorkerSynchronizer.kt → ...r/launcher/executor/WorkerSynchronizer.kt b/...r/launcher/executor/WorkerSynchronizer.kt → ...r/launcher/executor/WorkerSynchronizer.kt
diff --git a/...launcher/io/AbstractSerializationScope.kt → ...launcher/io/AbstractSerializationScope.kt b/...launcher/io/AbstractSerializationScope.kt → ...launcher/io/AbstractSerializationScope.kt
diff --git a/...agr/launcher/io/AssignmentArtifactInfo.kt → ...agr/launcher/io/AssignmentArtifactInfo.kt b/...agr/launcher/io/AssignmentArtifactInfo.kt → ...agr/launcher/io/AssignmentArtifactInfo.kt
diff --git a/...sourcegrade/jagr/launcher/io/DataUtils.kt → ...sourcegrade/jagr/launcher/io/DataUtils.kt b/...sourcegrade/jagr/launcher/io/DataUtils.kt → ...sourcegrade/jagr/launcher/io/DataUtils.kt
diff --git a/...cegrade/jagr/launcher/io/ExtrasManager.kt → ...cegrade/jagr/launcher/io/ExtrasManager.kt b/...cegrade/jagr/launcher/io/ExtrasManager.kt → ...cegrade/jagr/launcher/io/ExtrasManager.kt
diff --git a/.../jagr/launcher/io/GradedRubricExporter.kt → .../jagr/launcher/io/GradedRubricExporter.kt b/.../jagr/launcher/io/GradedRubricExporter.kt → .../jagr/launcher/io/GradedRubricExporter.kt
diff --git a/...ourcegrade/jagr/launcher/io/GraderInfo.kt → ...ourcegrade/jagr/launcher/io/GraderInfo.kt b/...ourcegrade/jagr/launcher/io/GraderInfo.kt → ...ourcegrade/jagr/launcher/io/GraderInfo.kt
diff --git a/...sourcegrade/jagr/launcher/io/GraderJar.kt → ...sourcegrade/jagr/launcher/io/GraderJar.kt b/...sourcegrade/jagr/launcher/io/GraderJar.kt → ...sourcegrade/jagr/launcher/io/GraderJar.kt
diff --git a/...rcegrade/jagr/launcher/io/GradingBatch.kt → ...rcegrade/jagr/launcher/io/GradingBatch.kt b/...rcegrade/jagr/launcher/io/GradingBatch.kt → ...rcegrade/jagr/launcher/io/GradingBatch.kt
diff --git a/...auncher/io/InputSerializationScopeImpl.kt → ...auncher/io/InputSerializationScopeImpl.kt b/...auncher/io/InputSerializationScopeImpl.kt → ...auncher/io/InputSerializationScopeImpl.kt
diff --git a/...cegrade/jagr/launcher/io/MagicAppender.kt → ...cegrade/jagr/launcher/io/MagicAppender.kt b/...cegrade/jagr/launcher/io/MagicAppender.kt → ...cegrade/jagr/launcher/io/MagicAppender.kt
diff --git a/...uncher/io/OutputSerializationScopeImpl.kt → ...uncher/io/OutputSerializationScopeImpl.kt b/...uncher/io/OutputSerializationScopeImpl.kt → ...uncher/io/OutputSerializationScopeImpl.kt
diff --git a/.../launcher/io/ProgressAwareOutputStream.kt → .../launcher/io/ProgressAwareOutputStream.kt b/.../launcher/io/ProgressAwareOutputStream.kt → .../launcher/io/ProgressAwareOutputStream.kt
diff --git a/...gr/launcher/io/RepositoryConfiguration.kt → ...gr/launcher/io/RepositoryConfiguration.kt b/...gr/launcher/io/RepositoryConfiguration.kt → ...gr/launcher/io/RepositoryConfiguration.kt
diff --git a/.../sourcegrade/jagr/launcher/io/Resource.kt → .../sourcegrade/jagr/launcher/io/Resource.kt b/.../sourcegrade/jagr/launcher/io/Resource.kt → .../sourcegrade/jagr/launcher/io/Resource.kt
diff --git a/...ade/jagr/launcher/io/ResourceContainer.kt → ...ade/jagr/launcher/io/ResourceContainer.kt b/...ade/jagr/launcher/io/ResourceContainer.kt → ...ade/jagr/launcher/io/ResourceContainer.kt
diff --git a/...cegrade/jagr/launcher/io/RubricLogging.kt → ...cegrade/jagr/launcher/io/RubricLogging.kt b/...cegrade/jagr/launcher/io/RubricLogging.kt → ...cegrade/jagr/launcher/io/RubricLogging.kt
diff --git a/.../jagr/launcher/io/SafeStringSerializer.kt → .../jagr/launcher/io/SafeStringSerializer.kt b/.../jagr/launcher/io/SafeStringSerializer.kt → .../jagr/launcher/io/SafeStringSerializer.kt
diff --git a/...de/jagr/launcher/io/SerializationScope.kt → ...de/jagr/launcher/io/SerializationScope.kt b/...de/jagr/launcher/io/SerializationScope.kt → ...de/jagr/launcher/io/SerializationScope.kt
diff --git a/...ade/jagr/launcher/io/SerializerFactory.kt → ...ade/jagr/launcher/io/SerializerFactory.kt b/...ade/jagr/launcher/io/SerializerFactory.kt → ...ade/jagr/launcher/io/SerializerFactory.kt
diff --git a/...cegrade/jagr/launcher/io/SourceSetInfo.kt → ...cegrade/jagr/launcher/io/SourceSetInfo.kt b/...cegrade/jagr/launcher/io/SourceSetInfo.kt → ...cegrade/jagr/launcher/io/SourceSetInfo.kt
diff --git a/...de/jagr/launcher/io/SubmissionExporter.kt → ...de/jagr/launcher/io/SubmissionExporter.kt b/...de/jagr/launcher/io/SubmissionExporter.kt → ...de/jagr/launcher/io/SubmissionExporter.kt
diff --git a/...egrade/jagr/launcher/io/SubmissionInfo.kt → ...egrade/jagr/launcher/io/SubmissionInfo.kt b/...egrade/jagr/launcher/io/SubmissionInfo.kt → ...egrade/jagr/launcher/io/SubmissionInfo.kt
diff --git a/.../jagr/launcher/io/ZipResourceContainer.kt → .../jagr/launcher/io/ZipResourceContainer.kt b/.../jagr/launcher/io/ZipResourceContainer.kt → .../jagr/launcher/io/ZipResourceContainer.kt
diff --git a/...er/src/jvmMain/resources/log4j2-child.xml → launcher/src/main/resources/log4j2-child.xml b/...er/src/jvmMain/resources/log4j2-child.xml → launcher/src/main/resources/log4j2-child.xml
diff --git a/...jvmMain/resources/log4j2-console-only.xml → ...rc/main/resources/log4j2-console-only.xml b/...jvmMain/resources/log4j2-console-only.xml → ...rc/main/resources/log4j2-console-only.xml
diff --git a/launcher/src/jvmMain/resources/log4j2.xml → launcher/src/main/resources/log4j2.xml b/launcher/src/jvmMain/resources/log4j2.xml → launcher/src/main/resources/log4j2.xml
diff --git a/.../org/sourcegrade/jagr/ChildProcGrading.kt → .../org/sourcegrade/jagr/ChildProcGrading.kt b/.../org/sourcegrade/jagr/ChildProcGrading.kt → .../org/sourcegrade/jagr/ChildProcGrading.kt
diff --git a/...Main/kotlin/org/sourcegrade/jagr/Files.kt → ...main/kotlin/org/sourcegrade/jagr/Files.kt b/...Main/kotlin/org/sourcegrade/jagr/Files.kt → ...main/kotlin/org/sourcegrade/jagr/Files.kt
diff --git a/...mMain/kotlin/org/sourcegrade/jagr/Main.kt → src/main/kotlin/org/sourcegrade/jagr/Main.kt b/...mMain/kotlin/org/sourcegrade/jagr/Main.kt → src/main/kotlin/org/sourcegrade/jagr/Main.kt
diff --git a/...n/org/sourcegrade/jagr/StandardGrading.kt → ...n/org/sourcegrade/jagr/StandardGrading.kt b/...n/org/sourcegrade/jagr/StandardGrading.kt → ...n/org/sourcegrade/jagr/StandardGrading.kt