Feature/update (#14)

* update libs version

Author: abaddon

.github/workflows/detekt.yml

@@ -1,114 +1,18 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# This workflow performs a static analysis of your Kotlin source code using
-# Detekt.
-#
-# Scans are triggered:
-# 1. On every push to default and protected branches
-# 2. On every Pull Request targeting the default branch
-# 3. On a weekly schedule
-# 4. Manually, on demand, via the "workflow_dispatch" event
-#
-# The workflow should work with no modifications, but you might like to use a
-# later version of the Detekt CLI by modifing the $DETEKT_RELEASE_TAG
-# environment variable.
-name: Scan with Detekt
+name: Detekt
 
 on:
-  # Triggers the workflow on push or pull request events but only for default and protected branches
   push:
+    branches: [ main ]
+  pull_request:
     branches: [ 'feature/**' ]
-    tags:
-      - v[0-9]+.[0-9]+.[0-9]+
-
 
-env:
-  # Release tag associated with version of Detekt to be installed
-  # SARIF support (required for this workflow) was introduced in Detekt v1.15.0
-  DETEKT_RELEASE_TAG: v1.15.0
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "scan"
-  scan:
-    name: Scan
-    # The type of runner that the job will run on
+  detekt:
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v3
-
-    # Gets the download URL associated with the $DETEKT_RELEASE_TAG
-    - name: Get Detekt download URL
-      id: detekt_info
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        gh api graphql --field tagName=$DETEKT_RELEASE_TAG --raw-field query='
-          query getReleaseAssetDownloadUrl($tagName: String!) {
-            repository(name: "detekt", owner: "detekt") {
-              release(tagName: $tagName) {
-                releaseAssets(name: "detekt", first: 1) {
-                  nodes {
-                    downloadUrl
-                  }
-                }
-                tagCommit {
-                  oid
-                }
-              }
-            }
-          }
-        ' 1> gh_response.json
-        
-        DETEKT_RELEASE_SHA=$(jq --raw-output '.data.repository.release.releaseAssets.tagCommit.oid' gh_response.json)
-        if [ $DETEKT_RELEASE_SHA != "37f0a1d006977512f1f216506cd695039607c3e5" ]; then
-          echo "Release tag doesn't match expected commit SHA"
-          exit 1
-        fi
-        
-        DETEKT_DOWNLOAD_URL=$(jq --raw-output '.data.repository.release.releaseAssets.nodes[0].downloadUrl' gh_response.json)
-        echo "::set-output name=download_url::$DETEKT_DOWNLOAD_URL"
-
-    # Sets up the detekt cli
-    - name: Setup Detekt
-      run: |
-        dest=$( mktemp -d )
-        curl --request GET \
-          --url ${{ steps.detekt_info.outputs.download_url }} \
-          --silent \
-          --location \
-          --output $dest/detekt
-        chmod a+x $dest/detekt
-        echo $dest >> $GITHUB_PATH
-
-    # Performs static analysis using Detekt
-    - name: Run Detekt
-      continue-on-error: true
-      run: |
-        detekt --input ${{ github.workspace }} --report sarif:${{ github.workspace }}/detekt.sarif.json
-
-    # Modifies the SARIF output produced by Detekt so that absolute URIs are relative
-    # This is so we can easily map results onto their source files
-    # This can be removed once relative URI support lands in Detekt: https://git.io/JLBbA
-    - name: Make artifact location URIs relative
-      continue-on-error: true
-      run: |
-        echo "$(
-          jq \
-            --arg github_workspace ${{ github.workspace }} \
-            '. | ( .runs[].results[].locations[].physicalLocation.artifactLocation.uri |= if test($github_workspace) then .[($github_workspace | length | . + 1):] else . end )' \
-            ${{ github.workspace }}/detekt.sarif.json
-        )" > ${{ github.workspace }}/detekt.sarif.json
+      - name: "checkout"
+        uses: actions/checkout@v4
 
-    # Uploads results to GitHub repository using the upload-sarif action
-    - uses: github/codeql-action/upload-sarif@v2
-      with:
-        # Path to SARIF file relative to the root of the repository
-        sarif_file: ${{ github.workspace }}/detekt.sarif.json
-        checkout_path: ${{ github.workspace }}
+      - name: "detekt"
+        uses: natiginfo/action-detekt-all@1.23.5

.github/workflows/gradle.yml

@@ -15,25 +15,22 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: '11'
-        distribution: 'adopt'
+        java-version: '21'
+        distribution: 'temurin'
         cache: gradle
     - name: Validate Gradle wrapper
-      uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
+      uses: gradle/wrapper-validation-action@v2
     - name: Build with Gradle
       run: ./gradlew build jacocoTestReport
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
         directory: ./build/reports/jacoco
-#          files: ./coverage1.xml,./coverage2.xml # optional
         flags: unittests
-#          name: codecov-umbrella # optional
-#          fail_ci_if_error: true # optional (default = false)
         verbose: true
 

.github/workflows/maven_release.yml

@@ -16,19 +16,19 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '21'
+          distribution: 'temurin'
           cache: gradle
 
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Print Version
         run: ./gradlew printVersion
@@ -37,14 +37,11 @@ jobs:
         run: ./gradlew build jacocoTestReport
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
           directory: ./build/reports/jacoco
-          #          files: ./coverage1.xml,./coverage2.xml # optional
           flags: unittests
-          #          name: codecov-umbrella # optional
-          #          fail_ci_if_error: true # optional (default = false)
           verbose: true
 
       - name: Publish to Maven Central
@@ -54,3 +51,5 @@ jobs:
           GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }}
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_TOKEN: ${{ secrets.SONATYPE_TOKEN }}

build.gradle.kts

@@ -1,36 +1,38 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 group = "io.github.abaddon.kcqrs"
 
 object Meta {
     const val desc = "KCQRS EventStoreDB repository library"
     const val license = "Apache-2.0"
     const val githubRepo = "abaddon/kcqrs-EventStoreDB"
-    const val release = "https://s01.oss.sonatype.org/service/local/"
-    const val snapshot = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
     const val developerName = "Stefano Longhi"
     const val developerOrganization = ""
     const val organizationUrl = "https://github.com/abaddon"
 }
 
 object Versions {
-    const val kcqrsCoreVersion = "0.0.7"
-    const val kcqrsTestVersion = "0.0.3"
-    const val eventStoreDBVersion = "3.0.1"
-    const val slf4jVersion = "1.7.25"
-    const val kotlinVersion = "1.6.0"
-    const val kotlinCoroutineVersion = "1.6.0"
-    const val jacksonModuleKotlinVersion = "2.13.3"
-    const val testContainerVersion = "1.16.3"
-    const val junitJupiterVersion = "5.7.0"
-    const val jacocoToolVersion = "0.8.7"
-    const val jvmTarget = "11"
-    const val hopliteVersion="1.4.16"
+    // Update these versions only if compatibility is confirmed with your library
+    const val kcqrsCoreVersion = "0.0.10"
+    const val kcqrsTestVersion = "0.0.11"
+    
+    // Updated dependencies
+    const val kurrentClientVersion = "1.0.1"
+    const val slf4jVersion = "2.0.12"
+    const val kotlinVersion = "2.1.21"
+    const val kotlinCoroutineVersion = "1.10.2"
+    const val jacksonModuleKotlinVersion = "2.16.1"
+    const val testContainerVersion = "1.21.0"
+    const val junitJupiterVersion = "5.10.2"
+    const val jacocoToolVersion = "0.8.11"
+    const val jvmTarget = "21"
+    const val hopliteVersion = "2.7.5"
 }
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
-    id("com.palantir.git-version") version "2.0.0"
+    kotlin("jvm") version "2.1.21" // Updated from 1.8.10
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0" // Updated from 1.1.0
+    id("com.palantir.git-version") version "3.0.0" // Updated from 2.0.0
     jacoco
     `maven-publish`
     signing
@@ -39,15 +41,14 @@ plugins {
 val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
 val details = versionDetails()
 
-val lastTag=details.lastTag.substring(1)
-val snapshotTag= {
-    val list=lastTag.split(".")
-    val third=(list.last().toInt() + 1).toString()
+val lastTag = details.lastTag.substring(1)
+val snapshotTag = {
+    val list = lastTag.split(".")
+    val third = (list.last().toInt() + 1).toString()
     "${list[0]}.${list[1]}.$third-SNAPSHOT"
 }
 version = if(details.isCleanTag) lastTag else snapshotTag()
 
-
 repositories {
     mavenCentral()
     mavenLocal()
@@ -57,7 +58,6 @@ repositories {
             snapshotsOnly()
         }
     }
-
 }
 
 dependencies {
@@ -76,7 +76,7 @@ dependencies {
     implementation("com.sksamuel.hoplite:hoplite-yaml:${Versions.hopliteVersion}")
 
     //EventStoreDB
-    implementation("com.eventstore:db-client-java:${Versions.eventStoreDBVersion}")
+    implementation("io.kurrent:kurrentdb-client:${Versions.kurrentClientVersion}")
 
     //Test
     testImplementation(kotlin("test"))
@@ -107,21 +107,22 @@ tasks.jacocoTestReport {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
-    kotlinOptions.jvmTarget = Versions.jvmTarget
+    compilerOptions.jvmTarget.set(JvmTarget.fromTarget(Versions.jvmTarget))
 }
 
 java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21)) // Added to explicitly set Java toolchain
+    }
     withSourcesJar()
     withJavadocJar()
 }
 
 signing {
     val signingKey = providers
         .environmentVariable("GPG_SIGNING_KEY")
-        .forUseAtConfigurationTime()
     val signingPassphrase = providers
         .environmentVariable("GPG_SIGNING_PASSPHRASE")
-        .forUseAtConfigurationTime()
     if (signingKey.isPresent && signingPassphrase.isPresent) {
         useInMemoryPgpKeys(signingKey.get(), signingPassphrase.get())
         val extension = extensions
@@ -148,9 +149,9 @@ publishing {
                 }
                 developers {
                     developer {
-                        name.set("${Meta.developerName}")
-                        organization.set("${Meta.developerOrganization}")
-                        organizationUrl.set("${Meta.organizationUrl}")
+                        name.set(Meta.developerName)
+                        organization.set(Meta.developerOrganization)
+                        organizationUrl.set(Meta.organizationUrl)
                     }
                 }
                 scm {
@@ -174,19 +175,12 @@ publishing {
 
 nexusPublishing {
     repositories {
+        // see https://central.sonatype.org/publish/publish-portal-ossrh-staging-api/#configuration
         sonatype {
-            nexusUrl.set(uri(Meta.release))
-            snapshotRepositoryUrl.set(uri(Meta.snapshot))
-            val ossrhUsername = providers
-                .environmentVariable("OSSRH_USERNAME")
-                .forUseAtConfigurationTime()
-            val ossrhPassword = providers
-                .environmentVariable("OSSRH_PASSWORD")
-                .forUseAtConfigurationTime()
-            if (ossrhUsername.isPresent && ossrhPassword.isPresent) {
-                username.set(ossrhUsername.get())
-                password.set(ossrhPassword.get())
-            }
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
+            username = providers.environmentVariable("SONATYPE_USERNAME")
+            password = providers.environmentVariable("SONATYPE_TOKEN")
         }
     }
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/io/github/abaddon/kcqrs/eventstoredb/config/EventStoreDBConfig.kt

@@ -1,14 +1,14 @@
 package io.github.abaddon.kcqrs.eventstoredb.config
 
-import com.eventstore.dbclient.EventStoreDBClientSettings
-import com.eventstore.dbclient.EventStoreDBConnectionString
+import io.kurrent.dbclient.KurrentDBClientSettings
+import io.kurrent.dbclient.KurrentDBConnectionString
 
 data class EventStoreDBConfig(
     private val connectionString: String
 ) {
 
-    fun eventStoreDBClientSettingsBuilder(): EventStoreDBClientSettings =
-        EventStoreDBConnectionString
+    fun kurrentDBClientSettingsBuilder(): KurrentDBClientSettings =
+        KurrentDBConnectionString
             .parseOrThrow(connectionString)
 
 }