github/SlimeVR-Server
1
1
Fork 0
mirror of https://github.com/SlimeVR/SlimeVR-Server.git synced 2026-04-06 02:01:58 +02:00
Code Issues 161 Packages Projects Releases Wiki Activity

Revert Ktor version update

Browse Source
This commit is contained in:
Butterscotch!
2025-12-08 21:47:00 -05:00
parent 3a6c60d912
commit b67162eb43
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/android/build.gradle.kts
View File

@@ -78,9 +78,9 @@ dependencies {
androidTestImplementation("androidx.test.ext:junit:1.3.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
// For hosting web GUI
implementation("io.ktor:ktor-server-core:3.3.3")
implementation("io.ktor:ktor-server-netty:3.3.3")
implementation("io.ktor:ktor-server-caching-headers:3.3.3")
implementation("io.ktor:ktor-server-core:2.3.12")
implementation("io.ktor:ktor-server-netty:2.3.10")
implementation("io.ktor:ktor-server-caching-headers:2.3.12")
// Serial
implementation("com.github.mik3y:usb-serial-for-android:3.7.0")

6
server/android/src/main/java/dev/slimevr/android/Main.kt
View File

@@ -14,7 +14,7 @@ import dev.slimevr.tracking.trackers.Tracker
import io.eiren.util.logging.LogManager
import io.ktor.http.CacheControl
import io.ktor.http.CacheControl.Visibility
import io.ktor.server.engine.EmbeddedServer
import io.ktor.server.application.install
import io.ktor.server.engine.embeddedServer
import io.ktor.server.http.content.CachingOptions
import io.ktor.server.http.content.staticResources
@@ -28,7 +28,7 @@ import java.time.ZonedDateTime
import kotlin.concurrent.thread
import kotlin.system.exitProcess
lateinit var webServer: EmbeddedServer<NettyApplicationEngine, NettyApplicationEngine.Configuration>
lateinit var webServer: NettyApplicationEngine
private set
val webServerInitialized: Boolean
@@ -53,7 +53,7 @@ fun startWebServer() {
staticResources("/", "web-gui", "index.html")
}
}.start(wait = false)
webServerPort = runBlocking { webServer.engine.resolvedConnectors().first().port }
webServerPort = runBlocking { webServer.resolvedConnectors().first().port }
}
fun startVRServer(activity: AppCompatActivity) {