Feature/update 4 (#28)

Scogun · web-flow · commit 7874da8b2064 · 2026-03-30T20:37:36.000+02:00
* Update Gradle

* Update Kotlin

* Update Plugins

* Update libraries

* Update Redis

* Update version
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,12 +1,12 @@
 tasks.wrapper {
-    gradleVersion = "9.3.1"
+    gradleVersion = "9.4.1"
 }
 
 allprojects {
 
     group = "com.ucasoft.ktor"
 
-    version = "0.59.4"
+    version = "0.63.3"
 
     repositories {
         mavenCentral()
diff --git a/buildSrc/src/main/kotlin/Dependensies.kt b/buildSrc/src/main/kotlin/Dependensies.kt
@@ -1,7 +1,7 @@
 import org.gradle.api.Project
 
-const val ktorVersion = "3.4.0"
-const val kotestVersion = "6.1.4"
+const val ktorVersion = "3.4.2"
+const val kotestVersion = "6.1.10"
 
 fun Project.ktor(module: String) = "io.ktor:ktor-$module:$ktorVersion"
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/ktor-simple-cache/README.md b/ktor-simple-cache/README.md
@@ -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.59.4?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-cache/0.59.4/jar)
+[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-cache/0.63.3?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-cache/0.63.3/jar)
 ## Setup
 ### Gradle
 ```kotlin
 repositories {
     mavenCentral()
 }
 
-implementation("com.ucasoft.ktor:ktor-simple-cache:0.59.4")
+implementation("com.ucasoft.ktor:ktor-simple-cache:0.63.3")
 ```
 ## Usage
 ```kotlin
diff --git a/ktor-simple-cache/build.gradle.kts b/ktor-simple-cache/build.gradle.kts
@@ -27,7 +27,7 @@ kotlin {
                 implementation(ktorServer("test-host"))
                 implementation(kotest("assertions-core"))
                 implementation(kotest("assertions-ktor"))
-                implementation("org.mockito.kotlin:mockito-kotlin:6.2.3")
+                implementation("org.mockito.kotlin:mockito-kotlin:6.3.0")
             }
             kotlin.srcDir("src/test/kotlin")
         }
diff --git a/ktor-simple-memory-cache/README.md b/ktor-simple-memory-cache/README.md
@@ -1,15 +1,15 @@
 # Ktor Simple Memory Cache
 Memory cache provider for Ktor Simple Cache plugin
 
-[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-memory-cache/0.59.4?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-memory-cache/0.59.4/jar)
+[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-memory-cache/0.63.3?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-memory-cache/0.63.3/jar)
 ## Setup
 ### Gradle
 ```kotlin
 repositories {
     mavenCentral()
 }
 
-implementation("com.ucasoft.ktor:ktor-simple-memory-cache:0.59.4")
+implementation("com.ucasoft.ktor:ktor-simple-memory-cache:0.63.3")
 ```
 ## Usage
 ```kotlin
diff --git a/ktor-simple-redis-cache/README.md b/ktor-simple-redis-cache/README.md
@@ -1,15 +1,15 @@
 # Ktor Simple Redis Cache
 Redis cache provider for Ktor Simple Cache plugin
 
-[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-redis-cache/0.59.4?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-redis-cache/0.59.4/jar)
+[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-redis-cache/0.63.3?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-redis-cache/0.63.3/jar)
 ## Setup
 ### Gradle
 ```kotlin
 repositories {
     mavenCentral()
 }
 
-implementation("com.ucasoft.ktor:ktor-simple-redis-cache:0.59.4")
+implementation("com.ucasoft.ktor:ktor-simple-redis-cache:0.63.3")
 ```
 ## Usage
 ```kotlin
diff --git a/ktor-simple-redis-cache/build.gradle.kts b/ktor-simple-redis-cache/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
     jvm {
         tasks.withType<Test> {
             useJUnitPlatform()
@@ -16,14 +16,14 @@ kotlin {
         val jvmMain by getting {
             dependencies {
                 implementation(project(":ktor-simple-cache"))
-                implementation("redis.clients:jedis:7.3.0")
+                implementation("redis.clients:jedis:7.4.0")
                 implementation("com.google.code.gson:gson:2.13.2")
             }
             kotlin.srcDir("src/main/kotlin")
         }
         val jvmTest by getting {
             dependencies {
-                implementation("com.redis:testcontainers-redis:1.7.0")
+                implementation("com.redis:testcontainers-redis:2.2.4")
                 implementation("org.testcontainers:junit-jupiter:1.21.4")
                 implementation(kotlin("test"))
                 implementation(ktorServer("test-host"))
diff --git a/ktor-simple-redis-cache/src/main/kotlin/com/ucasoft/ktor/simpleRedisCache/SimpleRedisCacheProvider.kt b/ktor-simple-redis-cache/src/main/kotlin/com/ucasoft/ktor/simpleRedisCache/SimpleRedisCacheProvider.kt
@@ -3,21 +3,25 @@ package com.ucasoft.ktor.simpleRedisCache
 import com.google.gson.Gson
 import com.ucasoft.ktor.simpleCache.SimpleCacheConfig
 import com.ucasoft.ktor.simpleCache.SimpleCacheProvider
-import redis.clients.jedis.JedisPooled
+import redis.clients.jedis.DefaultJedisClientConfig
+import redis.clients.jedis.RedisClient
 import kotlin.time.Duration
 
 class SimpleRedisCacheProvider(config: Config) : SimpleCacheProvider(config) {
 
-    private val jedis: JedisPooled = JedisPooled(config.host, config.port, config.ssl)
+    private val jedis = RedisClient.builder().hostAndPort(config.host, config.port).clientConfig(
+        DefaultJedisClientConfig.builder().ssl(config.ssl).build()
+    ).build()
 
-    override suspend fun getCache(key: String): Any? = if (jedis.exists(key)) SimpleRedisCacheObject.fromCache(jedis[key]) else null
+    override suspend fun getCache(key: String): Any? =
+        if (jedis.exists(key)) SimpleRedisCacheObject.fromCache(jedis[key]) else null
 
     override suspend fun setCache(key: String, content: Any, invalidateAt: Duration?) {
         val expired = (invalidateAt ?: this.invalidateAt).inWholeMilliseconds
         jedis.psetex(key, expired, SimpleRedisCacheObject.fromObject(content).toString())
     }
 
-    class Config internal constructor(): SimpleCacheProvider.Config() {
+    class Config internal constructor() : SimpleCacheProvider.Config() {
 
         var host = "localhost"
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,10 +1,10 @@
 pluginManagement {
     resolutionStrategy {
         plugins {
-            val kotlinVersion = "2.3.10"
+            val kotlinVersion = "2.3.20"
             kotlin("multiplatform") version kotlinVersion apply false
             kotlin("plugin.serialization") version kotlinVersion apply false
-            id("org.jetbrains.kotlinx.kover") version "0.9.7" apply false
+            id("org.jetbrains.kotlinx.kover") version "0.9.8" apply false
             id("com.vanniktech.maven.publish") version "0.36.0" apply false
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ kotlin {`
`27`	`27`	`implementation(ktorServer("test-host"))`
`28`	`28`	`implementation(kotest("assertions-core"))`
`29`	`29`	`implementation(kotest("assertions-ktor"))`
`30`		`- implementation("org.mockito.kotlin:mockito-kotlin:6.2.3")`
	`30`	`+ implementation("org.mockito.kotlin:mockito-kotlin:6.3.0")`
`31`	`31`	`}`
`32`	`32`	`kotlin.srcDir("src/test/kotlin")`
`33`	`33`	`}`