Ktor 3 + Kotlin 2 (#22)

* Update dependencies

* Fix tests

* Update Gradle

* Update libraries

* Update Ktor

* Update Plugins

* Update Kotlin

* Increase version

Author: Scogun

.gitignore

@@ -5,3 +5,5 @@
 
 # Ignore Gradle build output directory
 build
+
+.kotlin

build.gradle.kts

@@ -1,12 +1,12 @@
 tasks.wrapper {
-    gradleVersion = "8.8"
+    gradleVersion = "8.11.1"
 }
 
 allprojects {
 
     group = "com.ucasoft.ktor"
 
-    version = "0.4.4"
+    version = "0.50.7"
 
     repositories {
         mavenCentral()

buildSrc/src/main/kotlin/Dependensies.kt

@@ -1,6 +1,6 @@
 import org.gradle.api.Project
 
-const val ktorVersion = "2.3.12"
+const val ktorVersion = "3.0.1"
 const val kotestVersion = "5.9.1"
 
 fun Project.ktor(module: String) = "io.ktor:ktor-$module:$ktorVersion"

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew.bat

@@ -1,15 +1,15 @@
 # Ktor Simple Cache
 Base solution which provides the plugin implementation and abstract class for cache providers.
 
-[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-cache/0.4.4?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-cache/0.4.4/jar)
+[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-cache/0.50.7?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-cache/0.50.7/jar)
 ## Setup
 ### Gradle
 ```kotlin
 repositories {
     mavenCentral()
 }
 
-implementation("com.ucasoft.ktor:ktor-simple-cache:0.4.4")
+implementation("com.ucasoft.ktor:ktor-simple-cache:0.50.7")
 ```
 ## Usage
 ```kotlin

ktor-simple-cache/README.md

@@ -6,8 +6,8 @@ plugins {
 }
 
 kotlin {
+    jvmToolchain(11)
     jvm {
-        jvmToolchain(11)
         tasks.withType<Test> {
             useJUnitPlatform()
         }
@@ -27,7 +27,7 @@ kotlin {
                 implementation(ktorServer("test-host"))
                 implementation(kotest("assertions-core"))
                 implementation(kotestEx("assertions-ktor", "2.0.0"))
-                implementation("org.mockito.kotlin:mockito-kotlin:5.3.1")
+                implementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
             }
             kotlin.srcDir("src/test/kotlin")
         }

ktor-simple-cache/build.gradle.kts

@@ -1,12 +1,11 @@
 package com.ucasoft.ktor.simpleCache
 
-import io.ktor.server.application.*
 import io.ktor.server.routing.*
 import kotlin.time.Duration
 
 class CacheOutputSelector : RouteSelector() {
 
-    override fun evaluate(context: RoutingResolveContext, segmentIndex: Int) = RouteSelectorEvaluation.Transparent
+    override suspend fun evaluate(context: RoutingResolveContext, segmentIndex: Int) = RouteSelectorEvaluation.Transparent
 }
 
 fun Route.cacheOutput(invalidateAt: Duration? = null, queryKeys: List<String> = emptyList(), build: Route.() -> Unit) : Route {