From 8e26832f593bf305165a971c35e4f90850b81373 Mon Sep 17 00:00:00 2001
From: Duncan McGregor <duncan@oneeyedmen.com>
Date: Mon, 14 Apr 2025 12:52:08 +0100
Subject: [PATCH 1/3] Upgrade JUnit for Kotlin, add kotlinx.test

---
 Kotlin/build.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Kotlin/build.gradle.kts b/Kotlin/build.gradle.kts
index 618096d1..ed37f62a 100644
--- a/Kotlin/build.gradle.kts
+++ b/Kotlin/build.gradle.kts
@@ -14,7 +14,8 @@ repositories {
 
 dependencies {
 	implementation(kotlin("stdlib"))
-	testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+	testImplementation(kotlin("test"))
+	testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
 }
 
 tasks.test {

From 1dcc7ef316c6f77541e7a47d42dabec1e5c44727 Mon Sep 17 00:00:00 2001
From: Duncan McGregor <duncan@oneeyedmen.com>
Date: Mon, 14 Apr 2025 12:52:31 +0100
Subject: [PATCH 2/3] Upgrade Kotlin

---
 Kotlin/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kotlin/build.gradle.kts b/Kotlin/build.gradle.kts
index ed37f62a..56ca4fc7 100644
--- a/Kotlin/build.gradle.kts
+++ b/Kotlin/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	kotlin("jvm") version "1.9.10"
+	kotlin("jvm") version "2.1.20"
 	application
 }
 

From 1b01ed06cd8b0b2bb48a88cdb4c41549888c8ad4 Mon Sep 17 00:00:00 2001
From: Duncan McGregor <duncan@oneeyedmen.com>
Date: Mon, 14 Apr 2025 12:55:32 +0100
Subject: [PATCH 3/3] Upgradle to 8.13 for Kotlin

---
 Kotlin/build.gradle.kts                       | 20 ++++++-------------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/Kotlin/build.gradle.kts b/Kotlin/build.gradle.kts
index 56ca4fc7..8cac6e52 100644
--- a/Kotlin/build.gradle.kts
+++ b/Kotlin/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
 	kotlin("jvm") version "2.1.20"
 	application
@@ -12,6 +10,12 @@ repositories {
 	mavenCentral()
 }
 
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(8)
+	}
+}
+
 dependencies {
 	implementation(kotlin("stdlib"))
 	testImplementation(kotlin("test"))
@@ -20,9 +24,6 @@ dependencies {
 
 tasks.test {
 	useJUnitPlatform()
-	testLogging {
-		events("passed", "skipped", "failed")
-	}
 }
 
 tasks.register<JavaExec>("texttest") {
@@ -33,15 +34,6 @@ tasks.register<JavaExec>("texttest") {
 	args("30")
 }
 
-// config JVM target to 1.8 for kotlin compilation tasks
-tasks.withType<KotlinCompile>().configureEach {
-	kotlinOptions.jvmTarget = "1.8"
-}
-
-// config java extension to same target version, to avoid build failure on Gradle 8.x
-java {
-	targetCompatibility = JavaVersion.VERSION_1_8
-}
 
 application {
 	mainClass.set("com.gildedrose.TexttestFixtureKt")
diff --git a/Kotlin/gradle/wrapper/gradle-wrapper.properties b/Kotlin/gradle/wrapper/gradle-wrapper.properties
index 3fa8f862..37f853b1 100644
--- a/Kotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/Kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME