From 69fdc274eca85c41d8025c6e904661cc4cc3aeab Mon Sep 17 00:00:00 2001 From: Geoffrey Challen Date: Tue, 17 Aug 2021 10:14:39 -0500 Subject: [PATCH] Update dependencies. --- build.gradle.kts | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/kotlin/Solution.kt | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1a079b2..b677b62 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,19 +3,19 @@ import java.io.StringWriter import java.util.Properties group = "com.github.cs125-illinois" -version = "2021.7.2" +version = "2021.8.0" plugins { kotlin("jvm") version "1.5.21" java `maven-publish` - id("org.jmailen.kotlinter") version "3.4.5" + id("org.jmailen.kotlinter") version "3.5.0" checkstyle id("com.github.sherter.google-java-format") version "0.9" id("com.github.ben-manes.versions") version "0.39.0" - id("io.gitlab.arturbosch.detekt") version "1.17.1" + id("io.gitlab.arturbosch.detekt") version "1.18.0" } repositories { mavenCentral() @@ -25,7 +25,7 @@ repositories { dependencies { implementation(kotlin("stdlib")) implementation(kotlin("reflect")) - implementation("io.github.classgraph:classgraph:4.8.110") + implementation("io.github.classgraph:classgraph:4.8.115") implementation("io.github.kostaskougios:cloning:1.10.3") testImplementation("io.kotest:kotest-runner-junit5:4.6.1") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2cbe264..e9d8f28 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip diff --git a/src/main/kotlin/Solution.kt b/src/main/kotlin/Solution.kt index 66736be..158a9db 100644 --- a/src/main/kotlin/Solution.kt +++ b/src/main/kotlin/Solution.kt @@ -467,8 +467,8 @@ fun compareReturn( solutionReturn is Class<*> && submissionReturn is Class<*> && solutionReturn.isArray && solutionReturn.getArrayType() == solution && submissionReturn.isArray && - submissionReturn.getArrayType() == submission - && solutionReturn.getArrayDimension() == submissionReturn.getArrayDimension() -> true + submissionReturn.getArrayType() == submission && + solutionReturn.getArrayDimension() == submissionReturn.getArrayDimension() -> true solutionReturn is TypeVariable<*> && submissionReturn is TypeVariable<*> -> solutionReturn.bounds.contentEquals(submissionReturn.bounds) else -> false @@ -488,8 +488,8 @@ fun compareParameters( .all { (solutionType, submissionType) -> when { solutionType == submissionType -> true - solutionType !is ParameterizedType && submissionType is ParameterizedType - && submissionType.rawType == solutionType -> { + solutionType !is ParameterizedType && submissionType is ParameterizedType && + submissionType.rawType == solutionType -> { submissionType.actualTypeArguments.all { it is Any } } else -> false