Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Update ktor to 3.0.0. #549

Merged
merged 1 commit into from
Oct 22, 2024
Merged

chore: Update ktor to 3.0.0. #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<junit.version>5.10.0</junit.version>
<kotest.version>5.7.2</kotest.version>
<mockk.version>1.13.8</mockk.version>
<ktor.version>2.3.4</ktor.version>
<ktor.version>3.0.0</ktor.version>
<jwt.version>0.11.5</jwt.version>
<jicoco.version>1.1-143-g175c44b</jicoco.version>
<jitsi.utils.version>1.0-127-g6c65524</jitsi.utils.version>
Expand Down
6 changes: 2 additions & 4 deletions src/main/kotlin/org/jitsi/jibri/api/http/internal/InternalHttpApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@ package org.jitsi.jibri.api.http.internal
import io.ktor.http.HttpStatusCode
import io.ktor.serialization.jackson.jackson
import io.ktor.server.application.Application
import io.ktor.server.application.ApplicationCall
import io.ktor.server.application.call
import io.ktor.server.application.install
import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
import io.ktor.server.response.respond
import io.ktor.server.routing.RoutingContext
import io.ktor.server.routing.post
import io.ktor.server.routing.route
import io.ktor.server.routing.routing
import io.ktor.util.pipeline.PipelineContext
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -89,7 +87,7 @@ class InternalHttpApi(
/**
* Responds with [HttpStatusCode.OK] and then runs the given block
*/
private suspend fun PipelineContext<*, ApplicationCall>.respondOkAndRun(block: () -> Unit) {
private suspend fun RoutingContext.respondOkAndRun(block: () -> Unit) {
val latch = CompletableDeferred<Nothing>()
coroutineScope {
launch {
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/org/jitsi/jibri/api/http/HttpApiTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,6 @@ class HttpApiTest : ShouldSpec() {
private suspend fun testApplication(block: suspend ApplicationTestBuilder.() -> Unit) {
val builder = ApplicationTestBuilder().apply { block() }
val testApplication = TestApplication(builder)
testApplication.engine.start()
testApplication.start()
testApplication.stop()
}
1 change: 1 addition & 0 deletions src/test/kotlin/org/jitsi/jibri/webhooks/v1/WebhookClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import io.ktor.client.request.HttpRequestData
import io.ktor.http.ContentType
import io.ktor.http.HttpMethod
import io.ktor.http.HttpStatusCode
import io.ktor.utils.io.readText
import kotlinx.coroutines.delay
import org.jitsi.jibri.helpers.inPlaceExecutor
import org.jitsi.jibri.helpers.resetIoPool
Expand Down
Loading