Merge branch '6.1.x'

Shinjinsik123 · Jul 9, 2024 · ea2895f · ea2895f
2 parents 0f66192 + f8b448e
commit ea2895f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle
@@ -19,7 +19,7 @@ dependencies {
 	api(platform("org.eclipse.jetty:jetty-bom:12.0.11"))
 	api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.11"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
-	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0"))
+	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3"))
 	api(platform("org.junit:junit-bom:5.10.3"))
 	api(platform("org.mockito:mockito-bom:5.12.0"))
 

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.caching=true
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.parallel=true
 
-kotlinVersion=1.9.22
+kotlinVersion=1.9.24
 
 kotlin.jvm.target.validation.mode=ignore
 kotlin.stdlib.default.dependency=false