diff --git a/build.gradle.kts b/build.gradle.kts index 1304ba6..11bda42 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.9.4" +version = "2021.10.0" plugins { kotlin("jvm") version "1.5.31" @@ -25,7 +25,7 @@ repositories { } dependencies { implementation("org.jetbrains.kotlin:kotlin-reflect:1.5.31") - implementation("io.github.classgraph:classgraph:4.8.117") + implementation("io.github.classgraph:classgraph:4.8.120") implementation("io.github.kostaskougios:cloning:1.10.3") testImplementation("io.kotest:kotest-runner-junit5:4.6.3") diff --git a/src/main/kotlin/Solution.kt b/src/main/kotlin/Solution.kt index 2f7c286..1bfe8d2 100644 --- a/src/main/kotlin/Solution.kt +++ b/src/main/kotlin/Solution.kt @@ -289,7 +289,7 @@ fun Class<*>.prettyPrint(): String = if (isArray) { fun Executable.isKotlinCompanionAccessor(): Boolean { check(declaringClass.isKotlin()) { "Should only check Kotlin classes: ${declaringClass.name}" } - return name.startsWith("access${"$"}get") + return name.startsWith("access${"$"}get") || name.startsWith("access${"$"}set") } fun Executable.isDataClassGenerated() = name == "equals" || 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 62f5186..d08cb5f 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.9.3 \ No newline at end of file +version=2021.9.4 \ No newline at end of file diff --git a/src/test/java/edu/illinois/cs/cs125/jenisol/core/Helpers.kt b/src/test/java/edu/illinois/cs/cs125/jenisol/core/Helpers.kt index 0ef375c..8f50379 100644 --- a/src/test/java/edu/illinois/cs/cs125/jenisol/core/Helpers.kt +++ b/src/test/java/edu/illinois/cs/cs125/jenisol/core/Helpers.kt @@ -57,6 +57,7 @@ fun Solution.doubleTest(klass: Class<*>): TestResults { first.forEachIndexed { index, firstResult -> val secondResult = second[index] submission(klass).compare(firstResult.parameters, secondResult.parameters) shouldBe true + firstResult.runnerID shouldBe secondResult.runnerID } return first }