diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 949ac37..31f9c9c 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@ee446707ff3bdadb3c039ff1af4286a09acb79c6 + uses: dorny/test-reporter@v2 if: success() || failure() with: name: jUnit Tests @@ -45,7 +45,7 @@ jobs: shell: bash - name: "Coverage Report" - uses: mi-kas/kover-report@624c610e0c054a270ce07a40972c643261c513bb + uses: mi-kas/kover-report@v1 if: ${{ github.event_name == 'pull_request' }} with: path: | diff --git a/build.gradle.kts b/build.gradle.kts index 75125c2..8ce624c 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,12 @@ tasks.wrapper { - gradleVersion = "9.2.1" + gradleVersion = "9.3.1" } allprojects { group = "com.ucasoft.ktor" - version = "0.57.7" + version = "0.59.4" repositories { mavenCentral() diff --git a/buildSrc/src/main/kotlin/Dependensies.kt b/buildSrc/src/main/kotlin/Dependensies.kt index edb9315..eeb9886 100755 --- 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.3.3" -const val kotestVersion = "6.0.7" +const val ktorVersion = "3.4.0" +const val kotestVersion = "6.1.4" fun Project.ktor(module: String) = "io.ktor:ktor-$module:$ktorVersion" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55..61285a6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23449a2..37f78a6 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-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a9..adff685 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/ktor-simple-cache/README.md b/ktor-simple-cache/README.md index 7e450fb..8751c9f 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.57.7?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-cache/0.57.7/jar) +[![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) ## Setup ### Gradle ```kotlin @@ -9,7 +9,7 @@ repositories { mavenCentral() } -implementation("com.ucasoft.ktor:ktor-simple-cache:0.57.7") +implementation("com.ucasoft.ktor:ktor-simple-cache:0.59.4") ``` ## Usage ```kotlin diff --git a/ktor-simple-cache/build.gradle.kts b/ktor-simple-cache/build.gradle.kts index 2c23c42..0bd7899 100755 --- 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.1.0") + implementation("org.mockito.kotlin:mockito-kotlin:6.2.3") } kotlin.srcDir("src/test/kotlin") } diff --git a/ktor-simple-memory-cache/README.md b/ktor-simple-memory-cache/README.md index 8b422b9..d58b2b5 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.57.7?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-memory-cache/0.57.7/jar) +[![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) ## Setup ### Gradle ```kotlin @@ -9,7 +9,7 @@ repositories { mavenCentral() } -implementation("com.ucasoft.ktor:ktor-simple-memory-cache:0.57.7") +implementation("com.ucasoft.ktor:ktor-simple-memory-cache:0.59.4") ``` ## Usage ```kotlin diff --git a/ktor-simple-redis-cache/README.md b/ktor-simple-redis-cache/README.md index f062e9d..5130fbb 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.57.7?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-redis-cache/0.57.7/jar) +[![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) ## Setup ### Gradle ```kotlin @@ -9,7 +9,7 @@ repositories { mavenCentral() } -implementation("com.ucasoft.ktor:ktor-simple-redis-cache:0.57.7") +implementation("com.ucasoft.ktor:ktor-simple-redis-cache:0.59.4") ``` ## Usage ```kotlin diff --git a/ktor-simple-redis-cache/build.gradle.kts b/ktor-simple-redis-cache/build.gradle.kts index b900744..bbcc31d 100755 --- a/ktor-simple-redis-cache/build.gradle.kts +++ b/ktor-simple-redis-cache/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { val jvmMain by getting { dependencies { implementation(project(":ktor-simple-cache")) - implementation("redis.clients:jedis:7.2.0") + implementation("redis.clients:jedis:7.3.0") implementation("com.google.code.gson:gson:2.13.2") } kotlin.srcDir("src/main/kotlin") diff --git a/settings.gradle.kts b/settings.gradle.kts index a6d226f..24db6b3 100755 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,11 +1,11 @@ pluginManagement { resolutionStrategy { plugins { - val kotlinVersion = "2.3.0" + val kotlinVersion = "2.3.10" kotlin("multiplatform") version kotlinVersion apply false kotlin("plugin.serialization") version kotlinVersion apply false - id("org.jetbrains.kotlinx.kover") version "0.9.4" apply false - id("com.vanniktech.maven.publish") version "0.35.0" apply false + id("org.jetbrains.kotlinx.kover") version "0.9.7" apply false + id("com.vanniktech.maven.publish") version "0.36.0" apply false } } }