diff --git a/build.gradle.kts b/build.gradle.kts index bc19853..16ad9f7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,6 +17,11 @@ tasks { group = "publishing" dependsOn(startShadowScripts) } + + shadowJar { + // Needed for Jetty to work. + mergeServiceFiles() + } } application { @@ -57,7 +62,7 @@ dependencies { implementation(libs.ktor.server.cors) implementation(libs.ktor.server.caching.headers) implementation(libs.ktor.server.host.common) - implementation(libs.ktor.server.netty) + implementation(libs.ktor.server.jetty) implementation(libs.ktor.server.conditional.headers) implementation(libs.ktor.serialization.kotlinx.json) implementation(libs.koin.ktor) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 66cbed3..d800cbf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,7 +28,7 @@ ktor-server-auth-jwt = { module = "io.ktor:ktor-server-auth-jwt" } ktor-server-cors = { module = "io.ktor:ktor-server-cors" } ktor-server-caching-headers = { module = "io.ktor:ktor-server-caching-headers" } ktor-server-host-common = { module = "io.ktor:ktor-server-host-common" } -ktor-server-netty = { module = "io.ktor:ktor-server-netty" } +ktor-server-jetty = { module = "io.ktor:ktor-server-jetty" } ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json" } koin-ktor = { module = "io.insert-koin:koin-ktor", version.ref = "koin" } h2 = { module = "com.h2database:h2", version.ref = "h2" } diff --git a/src/main/kotlin/app/revanced/api/command/StartAPICommand.kt b/src/main/kotlin/app/revanced/api/command/StartAPICommand.kt index 2e78e65..d94e8cf 100644 --- a/src/main/kotlin/app/revanced/api/command/StartAPICommand.kt +++ b/src/main/kotlin/app/revanced/api/command/StartAPICommand.kt @@ -6,7 +6,7 @@ import app.revanced.api.configuration.configureSecurity import app.revanced.api.configuration.configureSerialization import app.revanced.api.configuration.routing.configureRouting import io.ktor.server.engine.* -import io.ktor.server.netty.* +import io.ktor.server.jetty.* import picocli.CommandLine @CommandLine.Command( @@ -29,7 +29,7 @@ internal object StartAPICommand : Runnable { private var port: Int = 8080 override fun run() { - embeddedServer(Netty, port, host) { + embeddedServer(Jetty, port, host) { configureDependencies() configureHTTP(allowedHost = host) configureSerialization() diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 3e11d78..de52ac6 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -8,5 +8,4 @@ - - \ No newline at end of file +