Upgraded to kotlin 2 & updated other deps (#193)

eu-digital-identity-wallet · Jul 1, 2024 · 00f1aba · 00f1aba
1 parent bff8f1d
commit 00f1aba
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension
 import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
 
@@ -84,7 +83,7 @@ dependencies {
     implementation(libs.waltid.mdoc.credentials) {
         because("To sign CBOR credentials")
     }
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0-RC.2") {
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0") {
         because("required by walt.id")
     }
     implementation("com.augustcellars.cose:cose-java:1.1.0") {
@@ -111,12 +110,9 @@ kotlin {
         val javaVersion = libs.versions.java.get()
         languageVersion.set(JavaLanguageVersion.of(javaVersion))
     }
-}
-
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        freeCompilerArgs += "-Xcontext-receivers"
-        freeCompilerArgs += "-Xjsr305=strict"
+    compilerOptions {
+        freeCompilerArgs.add("-Xcontext-receivers")
+        freeCompilerArgs.add("-Xjsr305=strict")
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-coroutines = "1.8.0"
-kotlin = "1.9.23"
+coroutines = "1.8.1"
+kotlin = "2.0.0"
 arrow = "1.2.4"
 foojay = "0.8.0"
-springboot = "3.2.5"
-springDependencyManagement = "1.1.4"
+springboot = "3.3.1"
+springDependencyManagement = "1.1.5"
 spotless = "6.25.0"
 java = "17"
-kotlinxSerialization = "1.6.3"
+kotlinxSerialization = "1.7.1"
 ktlint = "0.50.0"
-nimbusJoseJwt = "9.37.3"
-nimbusOAuth2 = "11.10.1"
-eudiSdJwt = "0.4.0"
+nimbusJoseJwt = "9.40"
+nimbusOAuth2 = "11.13"
+eudiSdJwt = "0.5.0"
 bouncyCastle = "1.78.1"
 dependencyCheck = "9.1.0"
 sonarqube = "5.0.0.4638"
@@ -21,7 +21,7 @@ jacoco = "0.8.11"
 didCommon = "1.13.0"
 multiformat = "1.1.0"
 resultMonad = "1.4.0"
-keycloak = "24.0.3"
+keycloak = "25.0.1"
 waltid = "0.3.1"
 uri-kmp = "0.0.18"
 authlete-cbor = "1.18"

diff --git a/src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/pid/EncodePidInSdJwtVc.kt b/src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/pid/EncodePidInSdJwtVc.kt
@@ -63,7 +63,7 @@ class EncodePidInSdJwtVc(
      */
     private val issuer: SdJwtIssuer<SignedJWT> by lazy {
         // SD-JWT VC requires no decoys
-        val sdJwtFactory = SdJwtFactory(hashAlgorithm = hashAlgorithm, numOfDecoysLimit = 0)
+        val sdJwtFactory = SdJwtFactory(hashAlgorithm = hashAlgorithm, fallbackMinimumDigests = null)
         val signer = ECDSASigner(issuerSigningKey.key)
         SdJwtIssuer.nimbus(sdJwtFactory, signer, issuerSigningKey.signingAlgorithm) {
             type(JOSEObjectType("vc+sd-jwt"))