diff --git a/gradle.properties b/gradle.properties index 85b7e3bd..fcc9851d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ version=0.17.14 # Dependencies -coroutine_version=1.5.0 +coroutine_version=1.6.1 jackson_version=2.12.3 caffeine_version=3.0.2 -serialization_version=1.2.1 +serialization_version=1.3.1 kDataLoader_version=0.4.0 deferredJsonBuilder_version=1.0.0 -ktor_version=1.6.0 +ktor_version=2.0.0 # Test-Dependencies kotlin_html_version=0.6.12 diff --git a/kgraphql-example/build.gradle.kts b/kgraphql-example/build.gradle.kts index 441cfeee..8e3fba3d 100644 --- a/kgraphql-example/build.gradle.kts +++ b/kgraphql-example/build.gradle.kts @@ -1,7 +1,7 @@ plugins { base application - kotlin("jvm") version "1.5.10" + kotlin("jvm") version "1.6.20" id("org.jetbrains.dokka") version "1.4.32" signing } @@ -23,7 +23,7 @@ application { dependencies { implementation(project(":kgraphql-ktor")) implementation("io.ktor:ktor-server-netty:$ktor_version") - implementation("io.ktor:ktor-auth:$ktor_version") + implementation("io.ktor:ktor-server-auth:$ktor_version") implementation("ch.qos.logback:logback-classic:$logback_version") implementation("org.jetbrains.exposed:exposed-core:$exposed_version") implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version") diff --git a/kgraphql-example/src/main/kotlin/com/apurebase/kgraphql/Application.kt b/kgraphql-example/src/main/kotlin/com/apurebase/kgraphql/Application.kt index 46df522f..dd3387b2 100644 --- a/kgraphql-example/src/main/kotlin/com/apurebase/kgraphql/Application.kt +++ b/kgraphql-example/src/main/kotlin/com/apurebase/kgraphql/Application.kt @@ -1,12 +1,12 @@ package com.apurebase.kgraphql import com.apurebase.kgraphql.model.User -import io.ktor.application.Application -import io.ktor.application.install -import io.ktor.auth.Authentication -import io.ktor.auth.authenticate -import io.ktor.auth.authentication -import io.ktor.auth.basic +import io.ktor.server.application.Application +import io.ktor.server.application.install +import io.ktor.server.auth.Authentication +import io.ktor.server.auth.authenticate +import io.ktor.server.auth.authentication +import io.ktor.server.auth.basic fun main(args: Array): Unit = io.ktor.server.netty.EngineMain.main(args) diff --git a/kgraphql-example/src/main/kotlin/com/apurebase/kgraphql/model/User.kt b/kgraphql-example/src/main/kotlin/com/apurebase/kgraphql/model/User.kt index 7054784d..2a2921e8 100755 --- a/kgraphql-example/src/main/kotlin/com/apurebase/kgraphql/model/User.kt +++ b/kgraphql-example/src/main/kotlin/com/apurebase/kgraphql/model/User.kt @@ -1,6 +1,6 @@ package com.apurebase.kgraphql.model -import io.ktor.auth.Principal +import io.ktor.server.auth.Principal val users = listOf( User(id = 1, name = "Amber"), diff --git a/kgraphql-ktor/build.gradle.kts b/kgraphql-ktor/build.gradle.kts index 5b15a615..f10c3044 100644 --- a/kgraphql-ktor/build.gradle.kts +++ b/kgraphql-ktor/build.gradle.kts @@ -1,7 +1,7 @@ plugins { base - kotlin("jvm") version "1.5.10" - kotlin("plugin.serialization") version "1.5.0" + kotlin("jvm") version "1.6.20" + kotlin("plugin.serialization") version "1.6.20" id("org.jetbrains.dokka") version "1.4.32" signing } @@ -27,12 +27,13 @@ dependencies { api(project(":kgraphql")) implementation("io.ktor:ktor-server-core:$ktor_version") implementation("io.ktor:ktor-serialization:$ktor_version") + implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version") implementation("com.github.salomonbrys.kotson:kotson:2.5.0") testImplementation("org.junit.jupiter:junit-jupiter-api:$junit_version") testImplementation("org.amshove.kluent:kluent:$kluent_version") testImplementation("io.ktor:ktor-server-test-host:$ktor_version") - testImplementation("io.ktor:ktor-auth:$ktor_version") + testImplementation("io.ktor:ktor-server-auth:$ktor_version") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit_version") } diff --git a/kgraphql-ktor/src/main/kotlin/com/apurebase/kgraphql/KtorFeature.kt b/kgraphql-ktor/src/main/kotlin/com/apurebase/kgraphql/KtorFeature.kt index 23ac8325..b979d08a 100644 --- a/kgraphql-ktor/src/main/kotlin/com/apurebase/kgraphql/KtorFeature.kt +++ b/kgraphql-ktor/src/main/kotlin/com/apurebase/kgraphql/KtorFeature.kt @@ -3,11 +3,15 @@ package com.apurebase.kgraphql import com.apurebase.kgraphql.schema.Schema import com.apurebase.kgraphql.schema.dsl.SchemaBuilder import com.apurebase.kgraphql.schema.dsl.SchemaConfigurationDSL -import io.ktor.application.* +import io.ktor.server.application.* import io.ktor.http.* -import io.ktor.request.* -import io.ktor.response.* -import io.ktor.routing.* +import io.ktor.server.request.* +import io.ktor.server.response.* +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.routing.* import io.ktor.util.* import kotlinx.coroutines.coroutineScope import kotlinx.serialization.json.* @@ -42,7 +46,7 @@ class GraphQL(val schema: Schema) { } - companion object Feature: ApplicationFeature { + companion object Feature: Plugin { override val key = AttributeKey("KGraphQL") override fun install(pipeline: Application, configure: Configuration.() -> Unit): GraphQL { @@ -74,7 +78,7 @@ class GraphQL(val schema: Schema) { config.wrapWith?.invoke(this, routing) ?: routing(this) } - pipeline.featureOrNull(Routing)?.apply(routing) ?: pipeline.install(Routing, routing) + pipeline.pluginOrNull(Routing)?.apply(routing) ?: pipeline.install(Routing, routing) pipeline.intercept(ApplicationCallPipeline.Monitoring) { try { diff --git a/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorConfigurationTest.kt b/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorConfigurationTest.kt index e345e031..10428f1a 100644 --- a/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorConfigurationTest.kt +++ b/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorConfigurationTest.kt @@ -1,7 +1,7 @@ package com.apurebase.kgraphql import com.apurebase.kgraphql.schema.execution.Executor -import io.ktor.application.install +import io.ktor.server.application.install import io.ktor.server.testing.withTestApplication import org.amshove.kluent.shouldBeEqualTo import org.junit.jupiter.api.Test diff --git a/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorFeatureTest.kt b/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorFeatureTest.kt index 6f4ac8d4..135bb4ad 100644 --- a/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorFeatureTest.kt +++ b/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorFeatureTest.kt @@ -1,7 +1,7 @@ package com.apurebase.kgraphql -import io.ktor.application.* -import io.ktor.auth.* +import io.ktor.server.application.* +import io.ktor.server.auth.Principal import kotlinx.serialization.json.* import org.amshove.kluent.shouldBeEqualTo import org.junit.jupiter.api.Test diff --git a/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorTest.kt b/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorTest.kt index 0992de78..599999cf 100644 --- a/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorTest.kt +++ b/kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorTest.kt @@ -1,8 +1,8 @@ package com.apurebase.kgraphql import com.apurebase.kgraphql.schema.dsl.SchemaBuilder -import io.ktor.application.* -import io.ktor.auth.* +import io.ktor.server.application.* +import io.ktor.server.auth.* import io.ktor.http.* import io.ktor.server.testing.* diff --git a/kgraphql/build.gradle.kts b/kgraphql/build.gradle.kts index e420407d..408acd64 100644 --- a/kgraphql/build.gradle.kts +++ b/kgraphql/build.gradle.kts @@ -1,7 +1,7 @@ plugins { base - kotlin("jvm") version "1.5.10" + kotlin("jvm") version "1.6.20" id("org.jetbrains.dokka") version "1.4.32" signing }