Feature/add nix targets (#12)

* Make real multiplatform * Change Code Coverage tool * Increase Version * Change publish agent OS * Fix publishing * Clear
Scogun · Feb 17, 2024 · 53afcd0 · 53afcd0
1 parent 567677f
commit 53afcd0
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 46 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-and-publish:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -40,13 +40,18 @@ jobs:
           reporter: java-junit
 
       - name: "Run Coverage"
-        run: ./gradlew codeCoverageReport
+        if: ${{ github.event_name == 'pull_request' }}
+        run: ./gradlew koverXmlReport
         shell: bash
 
       - name: "Coverage Report"
-        uses: madrapps/[email protected]
+        uses: mi-kas/kover-report@v1
+        if: ${{ github.event_name == 'pull_request' }}
         with:
-          paths: ./build/reports/jacoco/codeCoverageReport/codeCoverageReport.xml
+          path: | 
+            ./ktor-simple-cache/build/reports/kover/report.xml
+            ./ktor-simple-memory-cache/build/reports/kover/report.xml
+            ./ktor-simple-redis-cache/build/reports/kover/report.xml
           token: ${{ secrets.GITHUB_TOKEN }}
           title: "Coverage Report"
           update-comment: true
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,3 @@
-plugins {
-    id("jacoco-report-aggregation")
-}
-
 tasks.wrapper {
     gradleVersion = "8.6"
 }
@@ -10,38 +6,15 @@ allprojects {
 
     group = "com.ucasoft.ktor"
 
-    version = "0.2.0"
-
-    apply {
-        plugin("jacoco")
-    }
+    version = "0.2.3"
 
     repositories {
         mavenCentral()
     }
 
     tasks.withType<Test> {
-        useJUnitPlatform()
         reports {
             junitXml.required.set(true)
         }
     }
-
-    jacoco {
-        toolVersion = "0.8.11"
-    }
-}
-
-dependencies {
-    jacocoAggregation(project(":ktor-simple-cache"))
-    jacocoAggregation(project(":ktor-simple-memory-cache"))
-    jacocoAggregation(project(":ktor-simple-redis-cache"))
-}
-
-reporting {
-    reports {
-        val codeCoverageReport by creating(JacocoCoverageReport::class) {
-            testType.set(TestSuiteType.UNIT_TEST)
-        }
-    }
 }
diff --git a/buildSrc/src/main/kotlin/publish.gradle.kts b/buildSrc/src/main/kotlin/publish.gradle.kts
@@ -54,4 +54,9 @@ publishing {
 
 signing {
     sign(publishing.publications)
+}
+
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    val signingTasks = tasks.withType<Sign>()
+    mustRunAfter(signingTasks)
 }
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.2.0?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-cache/0.2.0/jar)
+[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-cache/0.2.3?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-cache/0.2.3/jar)
 ## Setup
 ### Gradle
 ```kotlin
 repositories {
     mavenCentral()
 }
 
-implementation("com.ucasoft.ktor:ktor-simple-cache:0.2.0")
+implementation("com.ucasoft.ktor:ktor-simple-cache:0.2.3")
 ```
 ## Usage
 ```kotlin

diff --git a/ktor-simple-cache/build.gradle.kts b/ktor-simple-cache/build.gradle.kts
@@ -1,15 +1,21 @@
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization") apply false
+    id("org.jetbrains.kotlinx.kover")
     id("publish")
 }
 
 kotlin {
     jvm {
         jvmToolchain(11)
+        tasks.withType<Test> {
+            useJUnitPlatform()
+        }
     }
+    linuxX64()
+    macosX64()
     sourceSets {
-        val jvmMain by getting {
+        val commonMain by getting {
             dependencies {
                 implementation(ktorServer("core"))
             }

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.2.0?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-memory-cache/0.2.0/jar)
+[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-memory-cache/0.2.3?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-memory-cache/0.2.3/jar)
 ## Setup
 ### Gradle
 ```kotlin
 repositories {
     mavenCentral()
 }
 
-implementation("com.ucasoft.ktor:ktor-simple-memory-cache:0.2.0")
+implementation("com.ucasoft.ktor:ktor-simple-memory-cache:0.2.3")
 ```
 ## Usage
 ```kotlin

diff --git a/ktor-simple-memory-cache/build.gradle.kts b/ktor-simple-memory-cache/build.gradle.kts
@@ -1,21 +1,25 @@
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
+    id("org.jetbrains.kotlinx.kover")
     id("publish")
 }
 
 kotlin {
     jvm {
         jvmToolchain(11)
     }
+    linuxX64()
+    macosX64()
     sourceSets {
-        val jvmMain by getting {
+        val commonMain by getting {
             dependencies {
                 implementation(project(":ktor-simple-cache"))
+                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
             }
             kotlin.srcDir("src/main/kotlin")
         }
-        val jvmTest by getting {
+        val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(ktorServer("test-host"))

diff --git a/...ory-cache/src/main/kotlin/com/ucasoft/ktor/simpleMemoryCache/SimpleMemoryCacheProvider.kt b/...ory-cache/src/main/kotlin/com/ucasoft/ktor/simpleMemoryCache/SimpleMemoryCacheProvider.kt
@@ -2,7 +2,8 @@ package com.ucasoft.ktor.simpleMemoryCache
 
 import com.ucasoft.ktor.simpleCache.SimpleCacheConfig
 import com.ucasoft.ktor.simpleCache.SimpleCacheProvider
-import java.time.LocalDateTime
+import kotlinx.datetime.Clock
+import kotlinx.datetime.Instant
 import kotlin.time.Duration
 
 class SimpleMemoryCacheProvider(config: Config) : SimpleCacheProvider(config) {
@@ -18,17 +19,18 @@ class SimpleMemoryCacheProvider(config: Config) : SimpleCacheProvider(config) {
         }
     }
 
+
     override suspend fun setCache(key: String, content: Any, invalidateAt: Duration?) {
         cache[key] = SimpleMemoryCacheObject(content, invalidateAt ?: this.invalidateAt)
     }
 
     class Config internal constructor() : SimpleCacheProvider.Config()
 }
 
-private data class SimpleMemoryCacheObject(val content: Any, val duration: Duration, val start: LocalDateTime = LocalDateTime.now()) {
+private data class SimpleMemoryCacheObject(val content: Any, val duration: Duration, val start: Instant = Clock.System.now()) {
 
     val isExpired: Boolean
-        get() = LocalDateTime.now().isAfter(start.plusSeconds(duration.inWholeSeconds))
+        get() = Clock.System.now() - start > duration
 }
 
 fun SimpleCacheConfig.memoryCache(

diff --git a/...imple-memory-cache/src/test/kotlin/com/ucasoft/ktor/simpleMemoryCache/MemoryCacheTests.kt b/...imple-memory-cache/src/test/kotlin/com/ucasoft/ktor/simpleMemoryCache/MemoryCacheTests.kt
@@ -13,8 +13,9 @@ import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.server.testing.*
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
 
 internal class MemoryCacheTests {
 
@@ -67,7 +68,9 @@ internal class MemoryCacheTests {
 
             val secondResponse = jsonClient.get("short")
             secondResponse.body<TestResponse>().id.shouldBe(firstBody.id)
-            Thread.sleep(3000)
+            runBlocking {
+                delay(3000)
+            }
             val thirdResponse = jsonClient.get("short")
             thirdResponse.body<TestResponse>().id.shouldNotBe(firstBody.id)
 

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.2.0?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-redis-cache/0.2.0/jar)
+[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-redis-cache/0.2.3?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-redis-cache/0.2.3/jar)
 ## Setup
 ### Gradle
 ```kotlin
 repositories {
     mavenCentral()
 }
 
-implementation("com.ucasoft.ktor:ktor-simple-redis-cache:0.2.0")
+implementation("com.ucasoft.ktor:ktor-simple-redis-cache:0.2.3")
 ```
 ## Usage
 ```kotlin

diff --git a/ktor-simple-redis-cache/build.gradle.kts b/ktor-simple-redis-cache/build.gradle.kts
@@ -1,12 +1,16 @@
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
+    id("org.jetbrains.kotlinx.kover")
     id("publish")
 }
 
 kotlin {
     jvm {
         jvmToolchain(11)
+        tasks.withType<Test> {
+            useJUnitPlatform()
+        }
     }
     sourceSets {
         val jvmMain by getting {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,6 +4,7 @@ pluginManagement {
             val kotlinVersion = "1.9.22"
             kotlin("multiplatform") version kotlinVersion apply false
             kotlin("plugin.serialization") version kotlinVersion apply false
+            id("org.jetbrains.kotlinx.kover") version "0.7.5" apply false
         }
     }
 }