Upgrade to Kotlin 2.1.10.

.github/workflows/maven-publish.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Publish
         uses: eskatos/gradle-command-action@v1
         with:
-          gradle-version: 7.5.1
+          gradle-version: 7.6.3
           arguments: publish --stacktrace
         env:
           sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}

gradle.properties

@@ -1,5 +1,5 @@
 # KGraphQL version
-version=0.19.0
+version=0.20.0
 
 # Dependencies
 coroutine_version=1.6.4
@@ -8,7 +8,7 @@ caffeine_version=3.1.2
 serialization_version=1.4.1
 kDataLoader_version=0.5.1
 deferredJsonBuilder_version=1.0.0
-ktor_version=2.2.2
+ktor_version=3.0.3
 
 # Test-Dependencies
 kotlin_html_version=0.7.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kgraphql-example/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     base
     application
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "2.1.10"
     id("org.jetbrains.dokka") version "1.7.20"
     signing
 }

kgraphql-ktor/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     base
-    kotlin("jvm") version "1.8.0"
-    kotlin("plugin.serialization") version "1.8.0"
+    kotlin("jvm") version "2.1.10"
+    kotlin("plugin.serialization") version "2.1.10"
     id("org.jetbrains.dokka") version "1.7.20"
     signing
 }

kgraphql-ktor/src/main/kotlin/com/apurebase/kgraphql/KtorFeature.kt

@@ -94,7 +94,7 @@ class GraphQL(val schema: Schema) {
                 config.wrapWith?.invoke(this, routing) ?: routing(this)
             }
 
-            pipeline.pluginOrNull(Routing)?.apply(routing) ?: pipeline.install(Routing, routing)
+            pipeline.pluginOrNull(RoutingRoot)?.apply(routing) ?: pipeline.install(RoutingRoot, routing)
 
             pipeline.intercept(ApplicationCallPipeline.Monitoring) {
                 try {

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.server.application.install
+import io.ktor.server.application.plugin
 import io.ktor.server.testing.*
 import org.amshove.kluent.shouldBeEqualTo
 import org.junit.jupiter.api.Test
@@ -11,24 +11,30 @@ class KtorConfigurationTest: KtorTest() {
     @Test
     fun `default configuration should`() {
         var checked = false
-        withTestApplication({
-            val config = install(GraphQL) {}
+        testApplication {
+            install(GraphQL) {}
+            application {
+                val plugin = plugin(GraphQL)
+                plugin.schema.configuration.executor shouldBeEqualTo Executor.Parallel
+            }
             checked = true
-            config.schema.configuration.executor shouldBeEqualTo Executor.Parallel
-        }) {}
+        }
         checked shouldBeEqualTo true
     }
 
     @Test
     fun `update configuration`() {
         var checked = false
-        withTestApplication({
-            val config = install(GraphQL) {
+        testApplication {
+            install(GraphQL) {
                 executor = Executor.DataLoaderPrepared
             }
+            application {
+                val plugin = plugin(GraphQL)
+                plugin.schema.configuration.executor shouldBeEqualTo Executor.DataLoaderPrepared
+            }
             checked = true
-            config.schema.configuration.executor shouldBeEqualTo Executor.DataLoaderPrepared
-        }) {}
+        }
         checked shouldBeEqualTo true
     }
 

kgraphql/build.gradle.kts

@@ -1,7 +1,7 @@
 
 plugins {
     base
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "2.1.10"
     id("org.jetbrains.dokka") version "1.7.20"
     signing
 }

kgraphql/src/main/kotlin/com/apurebase/kgraphql/request/Lexer.kt

@@ -542,7 +542,7 @@ data class Lexer(
                         for (i in hex.length..3) {
                             append('0')
                         }
-                        append(hex.toUpperCase())
+                        append(hex.uppercase())
                     }
             }
             append("\"")

kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/directive/DirectiveLocation.kt

@@ -11,8 +11,8 @@ enum class DirectiveLocation {
     INLINE_FRAGMENT;
 
     companion object {
-        fun from(str: String) = str.toLowerCase().let { lowered ->
-            values().firstOrNull { it.name.toLowerCase() == lowered }
+        fun from(str: String) = str.lowercase().let { lowered ->
+            values().firstOrNull { it.name.lowercase() == lowered }
         }
     }
 }

kgraphql/src/test/kotlin/com/apurebase/kgraphql/integration/BaseSchemaTest.kt

@@ -240,7 +240,7 @@ abstract class BaseSchemaTest {
                 ignore = true
             }
             transformation(Scenario::content) { content : String, uppercase: Boolean? ->
-                if(uppercase == true) content.toUpperCase() else content
+                if(uppercase == true) content.uppercase() else content
             }
         }
         val favouriteID = unionType("Favourite") {

kgraphql/src/test/kotlin/com/apurebase/kgraphql/specification/introspection/DeprecationSpecificationTest.kt

@@ -75,7 +75,7 @@ class DeprecationSpecificationTest {
                 property<String>("add"){
                     description = expectedDescription
                     deprecate(expected)
-                    resolver{ (content) -> content.toUpperCase() }
+                    resolver{ (content) -> content.uppercase() }
                 }
             }
         }

kgraphql/src/test/kotlin/com/apurebase/kgraphql/specification/introspection/DocumentationSpecificationTest.kt

@@ -103,7 +103,7 @@ class DocumentationSpecificationTest {
             type<Sample>{
                 property<String>("add"){
                     description = expected
-                    resolver{ (content) -> content.toUpperCase() }
+                    resolver{ (content) -> content.uppercase() }
                 }
             }
         }