Update to Detekt 2.0.

Also enable much stricter checks.

Author: Jadarma

aockt-test/src/main/kotlin/AdventSpec.kt

@@ -49,7 +49,7 @@ import kotlin.time.Duration
  * @param T    The implementation class of the [Solution] to be tested.
  * @param body A context in which to configure the tests.
  */
-@Suppress("UnnecessaryAbstractClass")
+@Suppress("AbstractClassCanBeConcreteClass")
 @OptIn(ExperimentalKotest::class)
 @AocktDsl
 public abstract class AdventSpec<T : Solution>(

aockt-test/src/main/kotlin/internal/AdventDayID.kt

@@ -20,7 +20,7 @@ internal data class AdventDayID(
 
     override fun toString(): String = "Y${year}D${day.toString().padStart(2, '0')}"
 
-    @Suppress("MagicNumber")
+    @Suppress("MagicNumber", "UnnamedParameterUse")
     override fun compareTo(other: AdventDayID): Int = compareValuesBy(this, other) { year * 100 + day }
 
     private companion object {

aockt-test/src/main/kotlin/internal/AdventPartScopeImpl.kt

@@ -16,6 +16,6 @@ internal class AdventPartScopeImpl : AdventPartScope {
     }
 
     /** Applies the [block] function for each registered example. */
-    inline fun forEachIndexed(block: (Int, PuzzleInput, String) -> Unit) =
+    inline fun forEachIndexed(block: (Int, PuzzleInput, String) -> Unit): Unit =
         examples.forEachIndexed { index, example -> block(index, example.first, example.second) }
 }

aockt-test/src/main/kotlin/internal/AdventSpecConfig.kt

@@ -26,6 +26,7 @@ internal data class AdventSpecConfig(
     }
 
     /** Return a copy of this config with all non-null overrides given applied. */
+    @Suppress("DataClassContainsFunctions")
     fun override(
         efficiencyBenchmark: Duration?,
         executionMode: ExecMode?,

aockt-test/src/main/kotlin/internal/AdventSpecExt.kt

@@ -114,6 +114,7 @@ internal fun AdventSpec<*>.definePart(
  * @param examples     A configuration block defining the example values.
  */
 @OptIn(ExperimentalKotest::class)
+@Suppress("SuspendFunWithCoroutineScopeReceiver")
 private suspend fun FunSpecContainerScope.defineExamples(
     config: AdventSpecConfig,
     partFunction: (String) -> Any,
@@ -148,6 +149,7 @@ private suspend fun FunSpecContainerScope.defineExamples(
  * @param correctAnswer The actual puzzle solution, if known.
  */
 @OptIn(ExperimentalKotest::class)
+@Suppress("SuspendFunWithCoroutineScopeReceiver")
 private suspend fun FunSpecContainerScope.defineInput(
     config: AdventSpecConfig,
     expensive: Boolean,
@@ -156,11 +158,11 @@ private suspend fun FunSpecContainerScope.defineInput(
     correctAnswer: PuzzleAnswer?,
 ) {
     context("The solution").config(enabled = config.executionMode != ExecMode.ExamplesOnly) {
-        val solutionKnown = correctAnswer != null
+        val isSolutionKnown = correctAnswer != null
         var answer: PuzzleAnswer? = null
         var duration: Duration? = null
 
-        test(name = if (solutionKnown) "Is correct" else "Computes an answer") {
+        test(name = if (isSolutionKnown) "Is correct" else "Computes an answer") {
             runCatching {
                 val (value, time) = measureTimedValue { partFunction(input.toString()) }
                 answer = PuzzleAnswer(value.toString())
@@ -172,15 +174,15 @@ private suspend fun FunSpecContainerScope.defineInput(
                     .build()
             }
 
-            if (solutionKnown) {
+            if (isSolutionKnown) {
                 withClue("Got different answer than the known solution.") {
                     answer shouldBe correctAnswer
                 }
             }
         }
 
         // If solution is unverified, create a dummy ignored test to display the value in the test report.
-        if (!solutionKnown && answer != null) {
+        if (!isSolutionKnown && answer != null) {
             xtest("Has unverified answer ($answer)") {}
         }
 
@@ -192,7 +194,7 @@ private suspend fun FunSpecContainerScope.defineInput(
         }
 
         val benchmark = config.efficiencyBenchmark
-        val durationSuffix = if (answer != null) duration.toString() else "N/A"
+        val durationSuffix = duration?.takeIf { answer != null }?.toString() ?: "N/A"
         test("Is reasonably efficient ($durationSuffix)").config(enabled = enableSpeedTesting) {
             withClue("The solution did not complete under the configured benchmark of $benchmark") {
                 @Suppress("UnsafeCallOnNullableType")

aockt-test/src/main/kotlin/internal/AocktDisplayNameFormatter.kt

@@ -24,16 +24,18 @@ internal class AocktDisplayNameFormatter(private val disabled: Boolean = false)
             return null
         }
 
-        return buildString {
-            append(AdventDayID(annotation.year, annotation.day))
-            if (annotation.title.isNotEmpty()) {
-                append(": ")
-                append(annotation.title)
-            }
-            if (annotation.variant != "default") {
-                append(" (")
-                append(annotation.variant)
-                append(')')
+        return with(annotation) {
+            buildString {
+                append(AdventDayID(year, day))
+                if (title.isNotEmpty()) {
+                    append(": ")
+                    append(title)
+                }
+                if (variant != "default") {
+                    append(" (")
+                    append(variant)
+                    append(')')
+                }
             }
         }
     }

aockt-test/src/main/kotlin/internal/Exceptions.kt

@@ -3,6 +3,7 @@ package io.github.jadarma.aockt.test.internal
 import io.github.jadarma.aockt.core.Solution
 import io.github.jadarma.aockt.test.AdventSpec
 import io.github.jadarma.aockt.test.AdventDay
+import io.kotest.common.reflection.bestName
 import kotlin.reflect.KClass
 
 /** Base [Exception] type for all exceptions related to AocKt. */
@@ -16,7 +17,7 @@ internal class ConfigurationException(message: String? = null) : AocktException(
  * It is required in order to determine test input.
  */
 internal class MissingAdventDayAnnotationException(kclass: KClass<out AdventSpec<*>>) : AocktException(
-    message = "Class ${kclass.qualifiedName} is an AdventSpec but is missing the AdventDay annotation.",
+    message = "Class ${kclass.bestName()} is an AdventSpec but is missing the AdventDay annotation.",
 )
 
 /**
@@ -25,13 +26,13 @@ internal class MissingAdventDayAnnotationException(kclass: KClass<out AdventSpec
  * Add a no-arg constructor to it or declare it as an object.
  */
 internal class MissingNoArgConstructorException(kclass: KClass<out Solution>) : AocktException(
-    message = "Class ${kclass.qualifiedName} is a Solution but it is missing a no-arg constructor.",
+    message = "Class ${kclass.bestName()} is a Solution but it is missing a no-arg constructor.",
 )
 
 /**
  * An [AdventSpec] declared the same part scope twice.
  * The [AdventSpec.partOne] and [AdventSpec.partTwo] should be used at most once per spec.
  */
 internal class DuplicatePartDefinitionException(spec: KClass<*>, part: AdventDayPart) : AocktException(
-    message = "In ${spec.qualifiedName}, part$part has been declared twice.",
+    message = "In ${spec.bestName()}, part$part has been declared twice.",
 )

aockt-test/src/main/kotlin/internal/TestData.kt

@@ -1,4 +1,5 @@
 package io.github.jadarma.aockt.test.internal
+
 import io.github.jadarma.aockt.core.Solution
 
 /**

aockt-test/src/test/kotlin/integration/MultipleSolutions.kt

@@ -46,7 +46,7 @@ class Y9999D01SequencesTest : Y9999D01Spec<Y9999D01UsingSequences>()
  * Part 2: Return the product of the numbers.
  * ```
  */
-@Suppress("UnnecessaryAbstractClass")
+@Suppress("AbstractClassCanBeInterface")
 abstract class Y9999D01Spec<T : Solution> : AdventSpec<T>({
 
     partOne {

gradle/build-logic/src/main/kotlin/conventions.detekt.gradle.kts

@@ -1,24 +1,44 @@
-import io.gitlab.arturbosch.detekt.Detekt
+import dev.detekt.gradle.Detekt
 import org.gradle.kotlin.dsl.kotlin
-import org.gradle.kotlin.dsl.withType
 
 plugins {
     kotlin("jvm")
-    id("io.gitlab.arturbosch.detekt")
+    id("dev.detekt")
 }
 
 detekt {
-    buildUponDefaultConfig = true
+    buildUponDefaultConfig = false
     parallel = true
     baseline = file("$rootDir/gradle/detekt/baseline/${project.name}.xml")
-    config.from(
-        files(
+}
+
+tasks {
+    val detektMain: Detekt by named<Detekt>("detektMain") {
+        config.setFrom(
             "$rootDir/gradle/detekt/config/detekt.yml",
             "$rootDir/gradle/detekt/config/${project.name}.yml",
         )
-    )
-}
+    }
+    val detektTest: Detekt by named<Detekt>("detektTest") {
+        config.setFrom(
+            "$rootDir/gradle/detekt/config/detekt.yml",
+            "$rootDir/gradle/detekt/config/${project.name}.yml",
+            "$rootDir/gradle/detekt/config/detekt-test.yml",
+        )
+    }
+
+    check.configure {
+        // Replace the default detekt dependency and instead force the use of type resolution.
+        dependsOn(detektMain, detektTest)
+        setDependsOn(dependsOn.filterNot { it is TaskProvider<*> && it.name == "detekt" })
+    }
 
-tasks.withType<Detekt>().configureEach {
-    jvmTarget = CompileOptions.Kotlin.jvmTarget.target
+    withType<Detekt>().configureEach {
+        reports {
+            html.required = true
+            sarif.required = true
+            md.required = false
+            xml.required = false
+        }
+    }
 }