From 2244f01d230e1a6ed3ba00fc8e5fbb3a48f9f4bd Mon Sep 17 00:00:00 2001
From: Tiago Santos <tvcsantos@gmail.com>
Date: Sat, 1 Apr 2023 17:55:26 +0100
Subject: [PATCH] feat: add support for spring boot 3

---
 build.gradle.kts                                 |  2 +-
 gradle.properties                                |  2 +-
 .../main/kotlin/strikt/spring/ServletResponse.kt |  2 +-
 .../strikt/spring/ServletResponseAssertions.kt   |  2 +-
 strikt-spring/strikt-spring.gradle.kts           | 16 +++++++++++++++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1836d012..87d734a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -48,7 +48,7 @@ subprojects {
 
   afterEvaluate {
     plugins.withId("kotlin") {
-      configure<JavaPluginConvention> {
+      configure<JavaPluginExtension> {
         sourceCompatibility = VERSION_1_8
       }
 
diff --git a/gradle.properties b/gradle.properties
index 84c502db..c62bd5b9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,4 +13,4 @@ versions.minutest=1.13.0
 versions.mockk=1.13.4
 versions.protobuf=3.22.0
 versions.opentest4j=1.2.0
-versions.spring-boot=2.7.6
+versions.spring-boot=3.0.5
diff --git a/strikt-spring/src/main/kotlin/strikt/spring/ServletResponse.kt b/strikt-spring/src/main/kotlin/strikt/spring/ServletResponse.kt
index bf5883b5..3288d451 100644
--- a/strikt-spring/src/main/kotlin/strikt/spring/ServletResponse.kt
+++ b/strikt-spring/src/main/kotlin/strikt/spring/ServletResponse.kt
@@ -2,7 +2,7 @@ package strikt.spring
 
 import org.springframework.http.MediaType
 import strikt.api.Assertion
-import javax.servlet.ServletResponse
+import jakarta.servlet.ServletResponse
 
 /**
  * Maps this assertion to an assertion on the content type of the servlet
diff --git a/strikt-spring/src/test/kotlin/strikt/spring/ServletResponseAssertions.kt b/strikt-spring/src/test/kotlin/strikt/spring/ServletResponseAssertions.kt
index 98077ab4..067439d5 100644
--- a/strikt-spring/src/test/kotlin/strikt/spring/ServletResponseAssertions.kt
+++ b/strikt-spring/src/test/kotlin/strikt/spring/ServletResponseAssertions.kt
@@ -23,7 +23,7 @@ import strikt.assertions.isA
 import strikt.assertions.isNotNull
 import strikt.spring.app.App
 import strikt.spring.app.Controller
-import javax.servlet.ServletResponse
+import jakarta.servlet.ServletResponse
 
 @ExtendWith(SpringExtension::class)
 @SpringBootTest(
diff --git a/strikt-spring/strikt-spring.gradle.kts b/strikt-spring/strikt-spring.gradle.kts
index d0917ae9..afb719f7 100644
--- a/strikt-spring/strikt-spring.gradle.kts
+++ b/strikt-spring/strikt-spring.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
   implementation(platform("org.springframework.boot:spring-boot-dependencies:${property("versions.spring-boot")}"))
   compileOnly("org.springframework:spring-test")
   compileOnly("org.springframework:spring-web")
-  compileOnly("javax.servlet:javax.servlet-api")
+  compileOnly("jakarta.servlet:jakarta.servlet-api")
 
   testImplementation("dev.minutest:minutest:${property("versions.minutest")}")
   testImplementation("org.springframework.boot:spring-boot-starter-test")
@@ -35,3 +35,17 @@ tasks.withType<DokkaTaskPartial>().configureEach {
     }
   }
 }
+
+afterEvaluate {
+  plugins.withId("kotlin") {
+    configure<JavaPluginExtension> {
+      sourceCompatibility = JavaVersion.VERSION_17
+    }
+
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+      kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+      }
+    }
+  }
+}