diff --git a/build.gradle.kts b/build.gradle.kts index f1ca413..f376f49 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ import java.util.Properties import org.jetbrains.kotlin.gradle.tasks.KotlinCompile group = "com.github.cs125-illinois" -version = "2021.12.2" +version = "2022.1.0" plugins { kotlin("jvm") version "1.6.10" @@ -15,7 +15,7 @@ plugins { checkstyle id("com.github.sherter.google-java-format") version "0.9" - id("com.github.ben-manes.versions") version "0.39.0" + id("com.github.ben-manes.versions") version "0.41.0" id("io.gitlab.arturbosch.detekt") version "1.19.0" } repositories { diff --git a/src/main/kotlin/Submission.kt b/src/main/kotlin/Submission.kt index 8994ccb..3e43fa0 100644 --- a/src/main/kotlin/Submission.kt +++ b/src/main/kotlin/Submission.kt @@ -159,7 +159,7 @@ class Submission(val solution: Solution, val submission: Class<*>) { if (submission.kotlin.isData && executable.isDataClassGenerated()) { return@forEach } - } catch (e: UnsupportedOperationException) {} + } catch (_: UnsupportedOperationException) {} if (executable.name == "compareTo") { return@forEach } @@ -285,7 +285,7 @@ class Submission(val solution: Solution, val submission: Class<*>) { } else { null }?.value - if (customCompare != null && solution.returned != null && submission.returned != null) { + if (customCompare != null && submission.returned != null) { @Suppress("TooGenericExceptionCaught") try { customCompare.invoke(null, solution.returned, submission.returned) @@ -378,6 +378,9 @@ class Submission(val solution: Solution, val submission: Class<*>) { var receiverGoalMet = false @Suppress("UnusedPrivateMember") for (unused in 0..(settings.receiverCount * settings.receiverRetries)) { + if (Thread.interrupted()) { + return runners.toResults(settings) + } TestRunner( runners.size, this, diff --git a/src/main/resources/edu.illinois.cs.cs125.jenisol.core.version b/src/main/resources/edu.illinois.cs.cs125.jenisol.core.version index d289c7a..0119189 100644 --- a/src/main/resources/edu.illinois.cs.cs125.jenisol.core.version +++ b/src/main/resources/edu.illinois.cs.cs125.jenisol.core.version @@ -1 +1 @@ -version=2021.12.2 \ No newline at end of file +version=2022.1.0 \ No newline at end of file