From 98108f2ea71735f18d6c2328d993fb3ecba5f74c Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 13 Jun 2025 15:56:48 +0200 Subject: [PATCH 1/8] Update Gradle --- build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b70b152..8c6ac47 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ tasks.wrapper { - gradleVersion = "8.12.1" + gradleVersion = "8.14.2" } allprojects { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc25..ff23a68 100644 --- 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-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..f3b75f3 100644 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum From b24cc764cc5dfe8d4acc26287a66472e1533ad7d Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 13 Jun 2025 15:57:11 +0200 Subject: [PATCH 2/8] Update Kotlin --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 5c73f53..85983eb 100755 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,7 @@ pluginManagement { resolutionStrategy { plugins { - val kotlinVersion = "2.1.10" + val kotlinVersion = "2.1.21" kotlin("multiplatform") version kotlinVersion apply false kotlin("plugin.serialization") version kotlinVersion apply false id("org.jetbrains.kotlinx.kover") version "0.9.1" apply false From f849dba8c50539a2811e5e698ea846bb542ad96e Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 13 Jun 2025 15:58:34 +0200 Subject: [PATCH 3/8] Update plugin --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 85983eb..12ffefa 100755 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,7 +10,7 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } rootProject.name = "simple-cache" From e7b755587581cb9f2406e09b1a970f237d19beaa Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 14 Jun 2025 10:19:50 +0200 Subject: [PATCH 4/8] Update Ktor --- buildSrc/src/main/kotlin/Dependensies.kt | 2 +- .../com/ucasoft/ktor/simpleCache/SimpleCacheTests.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/Dependensies.kt b/buildSrc/src/main/kotlin/Dependensies.kt index 4c3232b..4227b7e 100755 --- a/buildSrc/src/main/kotlin/Dependensies.kt +++ b/buildSrc/src/main/kotlin/Dependensies.kt @@ -1,6 +1,6 @@ import org.gradle.api.Project -const val ktorVersion = "3.1.0" +const val ktorVersion = "3.2.0" const val kotestVersion = "5.9.1" fun Project.ktor(module: String) = "io.ktor:ktor-$module:$ktorVersion" diff --git a/ktor-simple-cache/src/test/kotlin/com/ucasoft/ktor/simpleCache/SimpleCacheTests.kt b/ktor-simple-cache/src/test/kotlin/com/ucasoft/ktor/simpleCache/SimpleCacheTests.kt index 44516fa..25e2bde 100755 --- a/ktor-simple-cache/src/test/kotlin/com/ucasoft/ktor/simpleCache/SimpleCacheTests.kt +++ b/ktor-simple-cache/src/test/kotlin/com/ucasoft/ktor/simpleCache/SimpleCacheTests.kt @@ -186,13 +186,13 @@ internal class SimpleCacheTests { val totalThreads = 100 val deferred = (1..totalThreads).map { async { - shouldThrow { - client.get("/exception") - } + val response = client.get("/exception") + response.shouldHaveStatus(HttpStatusCode.InternalServerError) + return@async response } } - val result = deferred.awaitAll().map { it.message }.groupBy { it } + val result = deferred.awaitAll().map { it.status }.groupBy { it } .map { it.key to it.value.size } result.shouldBeSingleton { it.second.shouldBe(totalThreads) From 2c1e09ea7e3763897705627a01e622f47445f5c5 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 14 Jun 2025 10:27:16 +0200 Subject: [PATCH 5/8] Update libraries --- ktor-simple-redis-cache/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ktor-simple-redis-cache/build.gradle.kts b/ktor-simple-redis-cache/build.gradle.kts index 0a8284b..f490c06 100755 --- a/ktor-simple-redis-cache/build.gradle.kts +++ b/ktor-simple-redis-cache/build.gradle.kts @@ -16,8 +16,8 @@ kotlin { val jvmMain by getting { dependencies { implementation(project(":ktor-simple-cache")) - implementation("redis.clients:jedis:5.1.5") - implementation("com.google.code.gson:gson:2.12.1") + implementation("redis.clients:jedis:6.0.0") + implementation("com.google.code.gson:gson:2.13.1") } kotlin.srcDir("src/main/kotlin") } From e72656e03eb41b7cd9cb42b1d56fdb4672e8010d Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 14 Jun 2025 10:33:00 +0200 Subject: [PATCH 6/8] Update action --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ee2fa6c..101e389 100755 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,7 @@ jobs: shell: bash - name: "Tests Report" - uses: dorny/test-reporter@v1 + uses: dorny/test-reporter@v2 if: success() || failure() with: name: jUnit Tests From a05338c5933c65901c83892590ac20835adccbc9 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 14 Jun 2025 10:35:44 +0200 Subject: [PATCH 7/8] Update version --- build.gradle.kts | 2 +- ktor-simple-cache/README.md | 4 ++-- ktor-simple-memory-cache/README.md | 4 ++-- ktor-simple-redis-cache/README.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8c6ac47..ea42c12 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ allprojects { group = "com.ucasoft.ktor" - version = "0.53.4" + version = "0.55.3" repositories { mavenCentral() diff --git a/ktor-simple-cache/README.md b/ktor-simple-cache/README.md index 64b0539..59b731c 100755 --- a/ktor-simple-cache/README.md +++ b/ktor-simple-cache/README.md @@ -1,7 +1,7 @@ # 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.53.4?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-cache/0.53.4/jar) +[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-cache/0.55.3?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-cache/0.55.3/jar) ## Setup ### Gradle ```kotlin @@ -9,7 +9,7 @@ repositories { mavenCentral() } -implementation("com.ucasoft.ktor:ktor-simple-cache:0.53.4") +implementation("com.ucasoft.ktor:ktor-simple-cache:0.55.3") ``` ## Usage ```kotlin diff --git a/ktor-simple-memory-cache/README.md b/ktor-simple-memory-cache/README.md index e5f37aa..529022f 100755 --- a/ktor-simple-memory-cache/README.md +++ b/ktor-simple-memory-cache/README.md @@ -1,7 +1,7 @@ # 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.53.4?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-memory-cache/0.53.4/jar) +[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-memory-cache/0.55.3?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-memory-cache/0.55.3/jar) ## Setup ### Gradle ```kotlin @@ -9,7 +9,7 @@ repositories { mavenCentral() } -implementation("com.ucasoft.ktor:ktor-simple-memory-cache:0.53.4") +implementation("com.ucasoft.ktor:ktor-simple-memory-cache:0.55.3") ``` ## Usage ```kotlin diff --git a/ktor-simple-redis-cache/README.md b/ktor-simple-redis-cache/README.md index 00f6702..6709316 100755 --- a/ktor-simple-redis-cache/README.md +++ b/ktor-simple-redis-cache/README.md @@ -1,7 +1,7 @@ # 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.53.4?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-redis-cache/0.53.4/jar) +[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-redis-cache/0.55.3?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-redis-cache/0.55.3/jar) ## Setup ### Gradle ```kotlin @@ -9,7 +9,7 @@ repositories { mavenCentral() } -implementation("com.ucasoft.ktor:ktor-simple-redis-cache:0.53.4") +implementation("com.ucasoft.ktor:ktor-simple-redis-cache:0.55.3") ``` ## Usage ```kotlin From 03d8c8f9eee3aa170e418db904f9404021acdc06 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 14 Jun 2025 10:54:30 +0200 Subject: [PATCH 8/8] Update JDK in actions --- .github/workflows/publish.yml | 4 ++-- .github/workflows/tests.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index adfdf87..4bfb4f5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,8 +14,8 @@ jobs: - name: "Set Up JDK" uses: actions/setup-java@v4 with: - distribution: temurin - java-version: 11 + distribution: corretto + java-version: 17 cache: gradle - name: "Grant execute permission for gradlew" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 101e389..53a9213 100755 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,8 +16,8 @@ jobs: - name: "Set Up JDK" uses: actions/setup-java@v4 with: - distribution: temurin - java-version: 11 + distribution: corretto + java-version: 17 cache: gradle - name: "Grant execute permission for gradlew"