From 0e8be076517429c448840e4a77b12dfad7623f52 Mon Sep 17 00:00:00 2001
From: Oleg Golberg <ogolberg@toasttab.com>
Date: Mon, 19 Jan 2026 13:46:14 -0500
Subject: [PATCH] g9

---
 buildSrc/build.gradle.kts                            |  6 ++++--
 .../src/main/kotlin/kotlin-conventions.gradle.kts    | 12 ++++++++----
 gradle/libs.versions.toml                            |  4 ++--
 gradle/wrapper/gradle-wrapper.properties             |  2 +-
 testkit-plugin/build.gradle.kts                      |  2 --
 .../filtering/build.gradle.kts                       |  1 +
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 036fef1..bc74b43 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     `kotlin-dsl`
 }
@@ -8,8 +10,8 @@ repositories {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "11"
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_11
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
index 2162e7b..9f1f2ae 100644
--- a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
@@ -1,5 +1,7 @@
 import org.gradle.api.JavaVersion
 import org.gradle.kotlin.dsl.repositories
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 repositories {
@@ -24,10 +26,10 @@ java {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "11"
-        languageVersion = "1.8"
-        apiVersion = "1.8"
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_11
+        languageVersion = KotlinVersion.KOTLIN_2_0
+        apiVersion = KotlinVersion.KOTLIN_2_0
     }
 }
 
@@ -40,4 +42,6 @@ tasks {
 dependencies {
     testImplementation(libs.junit)
     testImplementation(libs.strikt.core)
+
+    testRuntimeOnly(libs.junit.runtime)
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d75b690..c88c68e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.10"
+kotlin = "2.3.0"
 
 nexus = "1.3.0"
 ktlint = "0.50.0"
@@ -19,10 +19,10 @@ spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.re
 gradle-publish = { module = "com.gradle.publish:plugin-publish-plugin", version = "1.2.0" }
 
 jacoco-core = { module = "org.jacoco:org.jacoco.core", version.ref = "jacoco" }
-jacoco-agent = { module = "org.jacoco:org.jacoco.agent", version.ref = "jacoco" }
 
 # test
 junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
+junit-runtime = { module = "org.junit.platform:junit-platform-launcher" }
 strikt-core = { module = "io.strikt:strikt-core", version.ref = "strikt" }
 
 [plugins]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 48c0a02..5dc98db 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/testkit-plugin/build.gradle.kts b/testkit-plugin/build.gradle.kts
index de85140..643cd7a 100644
--- a/testkit-plugin/build.gradle.kts
+++ b/testkit-plugin/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
 
 dependencies {
     implementation(gradleApi())
-    testImplementation(libs.strikt.core)
 }
 
 sourceSets {
@@ -25,7 +24,6 @@ buildConfig {
 
 tasks {
     test {
-        useJUnitPlatform()
         systemProperty("test-projects", layout.projectDirectory.dir("src/test/test-projects").asFile.path)
     }
 }
diff --git a/testkit-plugin/src/test/test-projects/TestkitPluginIntegrationTest/filtering/build.gradle.kts b/testkit-plugin/src/test/test-projects/TestkitPluginIntegrationTest/filtering/build.gradle.kts
index 3cce898..72c4886 100644
--- a/testkit-plugin/src/test/test-projects/TestkitPluginIntegrationTest/filtering/build.gradle.kts
+++ b/testkit-plugin/src/test/test-projects/TestkitPluginIntegrationTest/filtering/build.gradle.kts
@@ -22,4 +22,5 @@ testkitTests {
 
 dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }