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.

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

Bump ktor from 2.3.12 to 3.0.0 #1040

Merged
merged 3 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 6 additions & 8 deletions backend/src/main/kotlin/app/softwork/composetodo/TypedAPI.kt
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
package app.softwork.composetodo

import io.ktor.http.*
import io.ktor.server.application.*
import io.ktor.server.auth.*
import io.ktor.server.request.*
import io.ktor.server.resources.*
import io.ktor.server.response.*
import io.ktor.server.routing.*
import io.ktor.util.pipeline.*
import kotlinx.serialization.*

@DslMarker
annotation class TypedAPI

@TypedAPI
inline fun <reified T : Any, reified Body : Any, reified Return : Any> Route.post(
crossinline action: suspend PipelineContext<Unit, ApplicationCall>.(T, Body) -> Return
crossinline action: suspend RoutingContext.(T, Body) -> Return
): Route = resource<T> {
method(HttpMethod.Post) {
val serializer = serializer<T>()
Expand All @@ -28,7 +26,7 @@ inline fun <reified T : Any, reified Body : Any, reified Return : Any> Route.pos

@TypedAPI
inline fun <reified T : Any, reified Return : Any> Route.post(
crossinline action: suspend PipelineContext<Unit, ApplicationCall>.(T) -> Return
crossinline action: suspend RoutingContext.(T) -> Return
): Route = resource<T> {
method(HttpMethod.Post) {
val serializer = serializer<T>()
Expand All @@ -40,7 +38,7 @@ inline fun <reified T : Any, reified Return : Any> Route.post(

@TypedAPI
inline fun <reified T : Any, reified Body : Any, reified Return : Any> Route.put(
crossinline action: suspend PipelineContext<Unit, ApplicationCall>.(T, Body) -> Return
crossinline action: suspend RoutingContext.(T, Body) -> Return
): Route = resource<T> {
method(HttpMethod.Put) {
val serializer = serializer<T>()
Expand All @@ -53,7 +51,7 @@ inline fun <reified T : Any, reified Body : Any, reified Return : Any> Route.put

@TypedAPI
inline fun <reified T : Any, reified Return : Any> Route.get(
crossinline action: suspend PipelineContext<Unit, ApplicationCall>.(T) -> Return
crossinline action: suspend RoutingContext.(T) -> Return
): Route = resource<T> {
method(HttpMethod.Get) {
val serializer = serializer<T>()
Expand All @@ -65,7 +63,7 @@ inline fun <reified T : Any, reified Return : Any> Route.get(

@TypedAPI
inline fun <reified T : Any, reified Return : Any> Route.delete(
crossinline action: suspend PipelineContext<Unit, ApplicationCall>.(T) -> Return
crossinline action: suspend RoutingContext.(T) -> Return
): Route = resource<T> {
method(HttpMethod.Delete) {
val serializer = serializer<T>()
Expand All @@ -75,4 +73,4 @@ inline fun <reified T : Any, reified Return : Any> Route.delete(
}
}

val PipelineContext<Unit, ApplicationCall>.user get() = call.principal<app.softwork.composetodo.dao.User>()!!
val RoutingContext.user get() = call.principal<app.softwork.composetodo.dao.User>()!!
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ data class User(
override val pluginFields: PluginFields = PluginFields(),
override var recordChangeTag: String? = null,
override val zoneID: ZoneID = ZoneID.default
) : Record<User.Fields>, Principal {
) : Record<User.Fields> {

override val recordType: String = Companion.recordType

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package app.softwork.composetodo

import app.softwork.composetodo.viewmodels.*
import io.ktor.client.*
import io.ktor.utils.io.errors.*
import kotlinx.coroutines.flow.*
import kotlinx.io.IOException

interface AppContainer {
fun todoViewModel(api: API.LoggedIn): TodoViewModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import app.softwork.composetodo.dto.*
import io.ktor.utils.io.errors.*
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.*
import kotlinx.io.IOException

class RegisterViewModel(
val api: API.LoggedOut,
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ detekt = "1.23.7"
coroutines = "1.9.0"
datetime = "0.6.1"
serialization = "1.7.3"
ktor = "2.3.12"
ktor = "3.0.0"
sqldelight = "2.0.2"
cloudkit = "0.2.0"
compose = "1.6.11"
Expand Down
125 changes: 63 additions & 62 deletions kotlin-js-store/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading