open-toast · ogolberg · May 8, 2026 · May 8, 2026
diff --git a/.editorconfig b/.editorconfig
@@ -1,3 +1,4 @@
 [*.kt]
 ktlint_standard_trailing-comma-on-call-site = disabled
-ktlint_standard_trailing-comma-on-declaration-site = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+ktlint_function_naming_ignore_when_annotated_with = Test, ParameterizedWithGradleVersions
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     compilerOptions {
-        jvmTarget = JvmTarget.JVM_11
+        jvmTarget = JvmTarget.JVM_17
     }
 }
 
@@ -24,8 +24,8 @@ sourceSets {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {

diff --git a/coverage-plugin/src/main/kotlin/com/toasttab/gradle/testkit/FlushJacocoPlugin.kt b/coverage-plugin/src/main/kotlin/com/toasttab/gradle/testkit/FlushJacocoPlugin.kt
@@ -23,13 +23,15 @@ import org.gradle.api.flow.FlowParameters
 import org.gradle.api.flow.FlowScope
 import javax.inject.Inject
 
-class FlushJacocoPlugin @Inject constructor(
-    private val flowScope: FlowScope
-) : Plugin<Project> {
-    override fun apply(target: Project) {
-        flowScope.always(DumpAction::class.java) { }
+class FlushJacocoPlugin
+    @Inject
+    constructor(
+        private val flowScope: FlowScope
+    ) : Plugin<Project> {
+        override fun apply(target: Project) {
+            flowScope.always(DumpAction::class.java) { }
+        }
     }
-}
 
 class DumpAction : FlowAction<FlowParameters.None> {
     override fun execute(parameters: FlowParameters.None) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,8 +2,8 @@
 kotlin = "2.3.21"
 
 nexus = "2.0.0"
-ktlint = "0.50.0"
-spotless = "6.21.0"
+ktlint = "1.8.0"
+spotless = "8.4.0"
 
 jacoco = "0.8.14"
 

diff --git a/...ion-tests/src/test/kotlin/com/toasttab/gradle/testkit/FlushJacocoPluginIntegrationTest.kt b/...ion-tests/src/test/kotlin/com/toasttab/gradle/testkit/FlushJacocoPluginIntegrationTest.kt
@@ -48,28 +48,30 @@ class FlushJacocoPluginIntegrationTest {
                 """.trimIndent()
             )
 
-            TestProjectExtension.createProject(
-                projectDir = projectDir,
-                gradleVersion = GradleVersionArgument.of("8.7"),
-                cleanup = true,
-                coverageRecorder = recorder
-            ).build("build", "--configuration-cache", "--stacktrace")
+            TestProjectExtension
+                .createProject(
+                    projectDir = projectDir,
+                    gradleVersion = GradleVersionArgument.of("8.7"),
+                    cleanup = true,
+                    coverageRecorder = recorder
+                ).build("build", "--configuration-cache", "--stacktrace")
         }
 
         recorder.close()
 
         val classes = hashSetOf<String>()
 
         file.inputStream().buffered().use {
-            ExecutionDataReader(it).apply {
-                setExecutionDataVisitor { data ->
-                    if (data.name.startsWith("com/toasttab")) {
-                        classes.add(data.name)
+            ExecutionDataReader(it)
+                .apply {
+                    setExecutionDataVisitor { data ->
+                        if (data.name.startsWith("com/toasttab")) {
+                            classes.add(data.name)
+                        }
                     }
-                }
 
-                setSessionInfoVisitor { }
-            }.read()
+                    setSessionInfoVisitor { }
+                }.read()
         }
 
         expectThat(classes).contains(

diff --git a/jacoco-reflect/src/main/kotlin/com/toasttab/gradle/testkit/jacoco/JacocoRt.kt b/jacoco-reflect/src/main/kotlin/com/toasttab/gradle/testkit/jacoco/JacocoRt.kt
@@ -30,7 +30,10 @@ private class ReflectiveJacocoAgent(
 ) : JacocoAgent {
     private val options by lazy {
         // agent.options
-        agent.javaClass.getDeclaredField("options").apply { isAccessible = true }.get(agent)
+        agent.javaClass
+            .getDeclaredField("options")
+            .apply { isAccessible = true }
+            .get(agent)
     }
 
     override val location: String
@@ -53,11 +56,12 @@ object JacocoRt {
 
     private val agentLookup by lazy {
         runCatching {
-            val rt = try {
-                ClassLoader.getSystemClassLoader().loadClass(RT_CLASS)
-            } catch (e: ClassNotFoundException) {
-                JacocoRt::class.java.classLoader.loadClass(RT_CLASS)
-            }
+            val rt =
+                try {
+                    ClassLoader.getSystemClassLoader().loadClass(RT_CLASS)
+                } catch (e: ClassNotFoundException) {
+                    JacocoRt::class.java.classLoader.loadClass(RT_CLASS)
+                }
 
             ReflectiveJacocoAgent(rt.getMethod("getAgent").invoke(null))
         }

diff --git a/junit5/src/main/kotlin/com/toasttab/gradle/testkit/CoverageRecorder.kt b/junit5/src/main/kotlin/com/toasttab/gradle/testkit/CoverageRecorder.kt
@@ -33,34 +33,35 @@ private class ReaderTask(
     private val readingSession = AtomicBoolean(false)
     private val running = AtomicBoolean(true)
 
-    private val reader = object : RemoteControlReader(sock.getInputStream()) {
-        init {
-            setSessionInfoVisitor { s ->
-                readingSession.set(true)
-            }
+    private val reader =
+        object : RemoteControlReader(sock.getInputStream()) {
+            init {
+                setSessionInfoVisitor { s ->
+                    readingSession.set(true)
+                }
 
-            setExecutionDataVisitor { ex ->
-                synchronized(writer) {
-                    writer.visitClassExecution(ex)
+                setExecutionDataVisitor { ex ->
+                    synchronized(writer) {
+                        writer.visitClassExecution(ex)
+                    }
                 }
             }
-        }
 
-        override fun readBlock(blockid: Byte): Boolean {
-            if (blockid == 32.toByte()) {
-                // OK message which follows jacoco tcpclient dumping execution data
-                finishSession()
+            override fun readBlock(blockid: Byte): Boolean {
+                if (blockid == 32.toByte()) {
+                    // OK message which follows jacoco tcpclient dumping execution data
+                    finishSession()
+                }
+                return super.readBlock(blockid)
             }
-            return super.readBlock(blockid)
-        }
 
-        override fun read() =
-            try {
-                super.read()
-            } catch (e: Exception) {
-                false
-            }
-    }
+            override fun read() =
+                try {
+                    super.read()
+                } catch (e: Exception) {
+                    false
+                }
+        }
 
     init {
         start()
@@ -103,21 +104,23 @@ class CoverageRecorder(
 
     private val tasks = mutableListOf<ReaderTask>()
 
-    private val runner = thread {
-        while (!server.isClosed) {
-            val sock = try {
-                server.accept()
-            } catch (e: Exception) {
-                break
+    private val runner =
+        thread {
+            while (!server.isClosed) {
+                val sock =
+                    try {
+                        server.accept()
+                    } catch (e: Exception) {
+                        break
+                    }
+
+                tasks.add(ReaderTask(sock, writer))
             }
 
-            tasks.add(ReaderTask(sock, writer))
-        }
-
-        for (task in tasks) {
-            task.done()
+            for (task in tasks) {
+                task.done()
+            }
         }
-    }
 
     val port: Int get() = server.localPort
 

diff --git a/junit5/src/main/kotlin/com/toasttab/gradle/testkit/GradleVersion.kt b/junit5/src/main/kotlin/com/toasttab/gradle/testkit/GradleVersion.kt
@@ -22,4 +22,7 @@ annotation class GradleVersion(
 )
 
 @Retention(AnnotationRetention.RUNTIME)
-annotation class Property(val key: String, val value: String)
+annotation class Property(
+    val key: String,
+    val value: String
+)
diff --git a/junit5/src/main/kotlin/com/toasttab/gradle/testkit/GradleVersionArgument.kt b/junit5/src/main/kotlin/com/toasttab/gradle/testkit/GradleVersionArgument.kt
@@ -21,18 +21,20 @@ class GradleVersionArgument private constructor(
 ) {
     fun property(key: String): String? = properties[key]
 
-    override fun toString() = when {
-        version == null -> "default"
-        properties.isEmpty() -> version
-        else -> "$version${properties.entries.joinToString(prefix = " [", postfix = "]") { "${it.key}=${it.value}" }}"
-    }
+    override fun toString() =
+        when {
+            version == null -> "default"
+            properties.isEmpty() -> version
+            else -> "$version${properties.entries.joinToString(prefix = " [", postfix = "]") { "${it.key}=${it.value}" }}"
+        }
 
     companion object {
-        fun of(version: String, properties: Map<String, String> = emptyMap()) =
-            GradleVersionArgument(version, properties)
+        fun of(
+            version: String,
+            properties: Map<String, String> = emptyMap()
+        ) = GradleVersionArgument(version, properties)
 
-        fun of(spec: GradleVersion) =
-            GradleVersionArgument(spec.version, spec.properties.associate { it.key to it.value })
+        fun of(spec: GradleVersion) = GradleVersionArgument(spec.version, spec.properties.associate { it.key to it.value })
 
         val DEFAULT = GradleVersionArgument(null)
     }

diff --git a/junit5/src/main/kotlin/com/toasttab/gradle/testkit/ProjectLocator.kt b/junit5/src/main/kotlin/com/toasttab/gradle/testkit/ProjectLocator.kt
@@ -20,15 +20,22 @@ import java.nio.file.Path
 import kotlin.io.path.Path
 
 interface ProjectLocator {
-    fun projectPath(root: String, context: ExtensionContext): Path
+    fun projectPath(
+        root: String,
+        context: ExtensionContext
+    ): Path
 }
 
 class SimpleNameProjectLocator : ProjectLocator {
-    override fun projectPath(root: String, context: ExtensionContext) =
-        Path(root, context.requiredTestClass.simpleName, context.requiredTestMethod.name)
+    override fun projectPath(
+        root: String,
+        context: ExtensionContext
+    ) = Path(root, context.requiredTestClass.simpleName, context.requiredTestMethod.name)
 }
 
 class FullyQualifiedNameProjectLocator : ProjectLocator {
-    override fun projectPath(root: String, context: ExtensionContext) =
-        Path(root, context.requiredTestClass.name.replace('.', '/'), context.requiredTestMethod.name)
+    override fun projectPath(
+        root: String,
+        context: ExtensionContext
+    ) = Path(root, context.requiredTestClass.name.replace('.', '/'), context.requiredTestMethod.name)
 }
diff --git a/junit5/src/main/kotlin/com/toasttab/gradle/testkit/TestKitDisplayNameGenerator.kt b/junit5/src/main/kotlin/com/toasttab/gradle/testkit/TestKitDisplayNameGenerator.kt
@@ -19,10 +19,14 @@ import org.junit.jupiter.api.DisplayNameGenerator.Standard
 import java.lang.reflect.Method
 
 class TestKitDisplayNameGenerator : Standard() {
-    override fun generateDisplayNameForMethod(cls: Class<*>, method: Method) =
-        method.name + method.parameterTypes.filter {
-            it != TestProject::class.java
-        }.joinToString(", ", prefix = "(", postfix = ")") {
-            it.simpleName
-        }
+    override fun generateDisplayNameForMethod(
+        cls: Class<*>,
+        method: Method
+    ) = method.name +
+        method.parameterTypes
+            .filter {
+                it != TestProject::class.java
+            }.joinToString(", ", prefix = "(", postfix = ")") {
+                it.simpleName
+            }
 }
diff --git a/junit5/src/main/kotlin/com/toasttab/gradle/testkit/TestProject.kt b/junit5/src/main/kotlin/com/toasttab/gradle/testkit/TestProject.kt
@@ -51,15 +51,17 @@ class TestProject(
 
     private fun createRunner(vararg args: String) = createRunner().withArguments(initArgs + args)
 
-    private fun createRunner() = GradleRunner.create()
-        .withProjectDir(dir.toFile())
-        .forwardStdOutput(output)
-        .forwardStdError(output).apply {
-            if (gradleVersion.version != null) {
-                withGradleVersion(gradleVersion.version)
-            }
-        }
-        .withArguments()
+    private fun createRunner() =
+        GradleRunner
+            .create()
+            .withProjectDir(dir.toFile())
+            .forwardStdOutput(output)
+            .forwardStdError(output)
+            .apply {
+                if (gradleVersion.version != null) {
+                    withGradleVersion(gradleVersion.version)
+                }
+            }.withArguments()
 
     fun logOutputOnce() {
         if (!outputLogged.getAndSet(true)) {