Upgrade to Spring 6 and Tyrus 2

Resolves: #298
joffrey-bion · Aug 9, 2023 · 2fe107e · 2fe107e
1 parent a90935f
commit 2fe107e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/autobahn-tests/build.gradle.kts b/autobahn-tests/build.gradle.kts
@@ -23,6 +23,7 @@ kotlin {
         attributes.attribute(websocketEngineAttribute, "okhttp")
     }
     jvm("jvmSpring") {
+        jvmToolchain(17)
         attributes.attribute(websocketEngineAttribute, "spring")
     }
     jsWithBigTimeouts("jsBuiltin") {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -35,8 +35,8 @@ nexus-publish-plugin = "1.3.0"
 okhttp = "4.11.0"
 okio = "3.5.0"
 slf4j = "2.0.7"
-spring = "5.3.23"
-tyrus = "1.17"
+spring = "6.0.11"
+tyrus = "2.1.3"
 uuid = "0.8.0"
 vyarus-github-info-plugin = "1.5.0"
 

diff --git a/krossbow-websocket-spring/build.gradle.kts b/krossbow-websocket-spring/build.gradle.kts
@@ -5,6 +5,10 @@ plugins {
 
 description = "A Krossbow adapter for Spring's default WebSocket client and SockJS client"
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     api(projects.krossbowWebsocketCore)
 

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -93,7 +93,7 @@ extra:
     ktor: 2.3.1
     kotlinxSerialization: 1.5.1
     moshi: 1.15.0
-    tyrus: 1.17
+    tyrus: 2.1.3
     jetty: 9.4.51.v20230217
 
 copyright: Copyright &copy; 2019 - 2023 Joffrey Bion