From 909ff2a371b5a0a43ccbf8b62d188987dc7ffbd7 Mon Sep 17 00:00:00 2001
From: XiYang6666 <1782356858@qq.com>
Date: Sat, 21 Dec 2024 17:53:16 +0800
Subject: [PATCH] chore: update dependents

---
 build.gradle.kts                           | 50 ++++++++++++----------
 gradle.properties                          | 12 +++---
 gradle/wrapper/gradle-wrapper.properties   |  2 +-
 src/main/kotlin/littlechasiu/ctm/Server.kt |  2 +-
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8f67426..9b4fd46 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,11 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-  kotlin("jvm") version "1.8.10"
-  kotlin("plugin.serialization") version "1.8.10"
+  kotlin("jvm") version "2.1.0"
+  kotlin("plugin.serialization") version "2.1.0"
   java
-  id("fabric-loom") version "1.1-SNAPSHOT"
-  id("com.github.johnrengelman.shadow") version "7.1.2"
+  id("fabric-loom") version "1.9.2"
+  id("com.github.johnrengelman.shadow") version "8.1.1"
   id("com.modrinth.minotaur") version "2.+"
 }
 
@@ -113,31 +113,35 @@ tasks {
 }
 
 java {
-  val javaVersion = JavaVersion.toVersion(targetJavaVersion)
-  if (JavaVersion.current() < javaVersion) {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(targetJavaVersion))
-  }
+    val javaVersion = JavaVersion.toVersion(targetJavaVersion)
+    if (JavaVersion.current() < javaVersion) {
+        toolchain.languageVersion.set(JavaLanguageVersion.of(targetJavaVersion))
+    }
+}
+
+kotlin {
+
 }
 
 val modrinth_id: String by project
 
 modrinth {
-  token.set(System.getenv("MODRINTH_TOKEN"))
-  projectId.set(modrinth_id)
-  versionNumber.set("$mod_version")
-  versionName.set("CTM Fabric $mod_version")
-  gameVersions.add(minecraft_version)
-  loaders.add("fabric")
-  loaders.add("quilt")
-  dependencies {
-    required.project("create-fabric")
-    required.project("fabric-api")
-    required.project("fabric-language-kotlin")
-  }
+    token.set(System.getenv("MODRINTH_TOKEN"))
+    projectId.set(modrinth_id)
+    versionNumber.set("$mod_version")
+    versionName.set("CTM Fabric $mod_version")
+    gameVersions.add(minecraft_version)
+    loaders.add("fabric")
+    loaders.add("quilt")
+    dependencies {
+        required.project("create-fabric")
+        required.project("fabric-api")
+        required.project("fabric-language-kotlin")
+    }
 
-  uploadFile.set { tasks.remapJar.get().archiveFile }
-  changelog.set(project.file("CHANGELOG.md").readText())
-  syncBodyFrom.set(project.file("README.md").readText())
+    uploadFile.set { tasks.remapJar.get().archiveFile }
+    changelog.set(project.file("CHANGELOG.md").readText())
+    syncBodyFrom.set(project.file("README.md").readText())
 }
 
 tasks.modrinth.get().dependsOn(tasks.modrinthSyncBody)
diff --git a/gradle.properties b/gradle.properties
index dbf1892..1546846 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,13 +7,13 @@ mod_version = 1.4
 modrinth_id = gxoNIjg6
 
 minecraft_version = 1.20.1
-fabric_loader_version = 0.14.21
-fabric_api_version = 0.90.0+1.20.1
-fabric_kotlin_version = 1.10.10+kotlin.1.9.10
+fabric_loader_version = 0.16.9
+fabric_api_version = 0.92.2+1.20.1
+fabric_kotlin_version = 1.13.0+kotlin.2.1.0
 
 create_version = 0.5.1-d-build.1161
 create_version_short = 0.5.1
 porting_lib_version = 2.1.1127+1.20
-ktor_version = 2.3.0
-kotlin_json_version = 1.4.1
-kotlin_css_version = 1.0.0-pre.511
+ktor_version = 3.0.1
+kotlin_json_version = 1.7.3
+kotlin_css_version = 1.0.0-pre.840
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d..4eaec46 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/littlechasiu/ctm/Server.kt b/src/main/kotlin/littlechasiu/ctm/Server.kt
index 2f9f42d..90f8885 100644
--- a/src/main/kotlin/littlechasiu/ctm/Server.kt
+++ b/src/main/kotlin/littlechasiu/ctm/Server.kt
@@ -42,7 +42,7 @@ class Server {
     "trains" to LayerConfig(label = "Trains"),
   )
 
-  private var server: CIOApplicationEngine? = null
+  private var server: EmbeddedServer<CIOApplicationEngine, CIOApplicationEngine.Configuration>? = null
 
   fun start() {
     if (!enable) {