From 5452d12da1b2f687dcaac33d92676ea52b298d14 Mon Sep 17 00:00:00 2001 From: Geoffrey Challen Date: Mon, 3 Oct 2022 14:45:25 -0500 Subject: [PATCH] Update dependencies. --- build.gradle.kts | 2 +- lib/build.gradle.kts | 4 ++-- lib/src/main/kotlin/Validation.kt | 9 +++++---- plugin/build.gradle.kts | 1 - server/build.gradle.kts | 6 +++--- .../edu.illinois.cs.cs125.questioner.server.version | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index dbacb2d..226eebe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } subprojects { group = "com.github.cs125-illinois.questioner" - version = "2022.9.11" + version = "2022.10.0" tasks.withType { kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 26209d1..12ae686 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -9,11 +9,11 @@ dependencies { implementation("com.squareup.moshi:moshi-kotlin:1.14.0") implementation("org.apache.commons:commons-text:1.10.0") implementation("io.github.java-diff-utils:java-diff-utils:4.12") - implementation("org.ow2.asm:asm:9.3") + implementation("org.ow2.asm:asm:9.4") api("com.beyondgrader.resource-agent:agent:2022.9.3") api("com.github.cs125-illinois.jeed:core:2022.9.9") - api("com.github.cs125-illinois:jenisol:2022.9.4") + api("com.github.cs125-illinois:jenisol:2022.10.0") api("io.kotest:kotest-runner-junit5:5.4.2") api("com.google.truth:truth:1.1.3") api("com.github.cs125-illinois:libcs1:2022.9.1") diff --git a/lib/src/main/kotlin/Validation.kt b/lib/src/main/kotlin/Validation.kt index ea89627..6c7aea8 100644 --- a/lib/src/main/kotlin/Validation.kt +++ b/lib/src/main/kotlin/Validation.kt @@ -349,16 +349,17 @@ suspend fun Question.validate(defaultSeed: Int, maxMutationCount: Int): Validati result.results.tests()!!.indexOfFirst { !it.passed } + 1 ) }.filterNotNull() + + if (deferredException != null) { + throw deferredException!! + } + val requiredTestCount = incorrectResults .filter { !it.results.timeout && !it.results.succeeded } .mapNotNull { it.results.tests()?.size } .maxOrNull() ?: error("No incorrect results") val testCount = requiredTestCount.coerceAtLeast(minTestCount) - if (deferredException != null) { - throw deferredException!! - } - // Rerun solutions to set timeouts and output limits // sets solution runtime, output lines, executed lines, and allocation val calibrationStart = Instant.now() diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 48ee270..ded1ae2 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -10,7 +10,6 @@ plugins { dependencies { antlr("org.antlr:antlr4:4.11.1") - implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.10") implementation(gradleApi()) implementation(project(":lib")) implementation("org.jetbrains:markdown:0.3.1") { diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 786cd03..e037fbd 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -18,14 +18,14 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.10") implementation(project(":lib")) - implementation("io.ktor:ktor-server-netty:2.1.1") - implementation("io.ktor:ktor-server-content-negotiation:2.1.1") + implementation("io.ktor:ktor-server-netty:2.1.2") + implementation("io.ktor:ktor-server-content-negotiation:2.1.2") implementation("com.squareup.moshi:moshi-kotlin:1.14.0") implementation("com.github.cs125-illinois:ktor-moshi:2022.9.0") implementation("org.mongodb:mongodb-driver:3.12.11") implementation("org.slf4j:slf4j-api:2.0.3") - implementation("ch.qos.logback:logback-classic:1.4.1") + implementation("ch.qos.logback:logback-classic:1.4.3") implementation("io.github.microutils:kotlin-logging:3.0.0") } task("createProperties") { diff --git a/server/src/main/resources/edu.illinois.cs.cs125.questioner.server.version b/server/src/main/resources/edu.illinois.cs.cs125.questioner.server.version index 5256ca8..cbe5ac6 100644 --- a/server/src/main/resources/edu.illinois.cs.cs125.questioner.server.version +++ b/server/src/main/resources/edu.illinois.cs.cs125.questioner.server.version @@ -1 +1 @@ -version=2022.9.11 \ No newline at end of file +version=2022.10.0 \ No newline at end of file