From ec8c0f0447be266ab7b03b5c5a1cfbb46db16f82 Mon Sep 17 00:00:00 2001
From: Dimitris Zarras <138439389+dzarras@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:52:23 +0200
Subject: [PATCH] Dependency upgrades (#349)

---
 build.gradle.kts                                      |  8 ++++++--
 gradle/libs.versions.toml                             | 11 +++++------
 .../DefaultAuthorizationServerMetadataResolver.kt     | 11 ++++++++++-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7ab907c2..5a0c46f5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.jetbrains.dokka.DokkaConfiguration
 import org.jetbrains.dokka.gradle.DokkaTask
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension
 import java.net.URL
 
@@ -53,8 +54,11 @@ java {
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get()))
-        vendor.set(JvmVendorSpec.ADOPTIUM)
+        languageVersion = JavaLanguageVersion.of(libs.versions.java.get())
+        vendor = JvmVendorSpec.ADOPTIUM
+    }
+    compilerOptions {
+        apiVersion = KotlinVersion.KOTLIN_2_0
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ab7afb11..74d1321f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
-coroutines = "1.7.3"
+coroutines = "1.9.0"
 dependency-check = "11.1.0"
 sonarqube = "5.1.0.4882"
-kotlin = "1.9.21"
+kotlin = "2.0.21"
 spotless = "6.25.0"
-nimbus-sdk = "11.6"
-ktor = "2.3.6"
-jsoup = "1.18.1"
+nimbus-sdk = "11.20.1"
+ktor = "3.0.1"
+jsoup = "1.18.2"
 cbor = "0.9"
 java = "17"
 ktlint = "0.50.0"
@@ -21,7 +21,6 @@ ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negoti
 ktor-client-serialization = { module = "io.ktor:ktor-client-serialization", version.ref = "ktor" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
-ktor-serialization-kotlinx-cbor = { module = "io.ktor:ktor-serialization-kotlinx-cbor", version.ref = "ktor" }
 ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 ktor-server-test-host = { module = "io.ktor:ktor-server-test-host", version.ref = "ktor" }
 ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" }
diff --git a/src/main/kotlin/eu/europa/ec/eudi/openid4vci/internal/DefaultAuthorizationServerMetadataResolver.kt b/src/main/kotlin/eu/europa/ec/eudi/openid4vci/internal/DefaultAuthorizationServerMetadataResolver.kt
index d9c3baed..df5a2d7e 100644
--- a/src/main/kotlin/eu/europa/ec/eudi/openid4vci/internal/DefaultAuthorizationServerMetadataResolver.kt
+++ b/src/main/kotlin/eu/europa/ec/eudi/openid4vci/internal/DefaultAuthorizationServerMetadataResolver.kt
@@ -111,7 +111,16 @@ private fun HttpsUrl.metadataUrl(metadata: String, lookup: Lookup): Url {
     return when (lookup) {
         Lookup.BySpecification ->
             URLBuilder(issuer).apply {
-                path("/${metadata.removePrefix("/").removeSuffix("/")}${issuer.pathSegments.joinToString("/")}")
+                val pathSegment =
+                    buildString {
+                        val joinedSegments = issuer.segments.joinToString(separator = "/")
+                        if (joinedSegments.isNotBlank()) {
+                            append("/")
+                        }
+                        append(joinedSegments)
+                    }
+
+                path("/${metadata.removePrefix("/").removeSuffix("/")}$pathSegment")
             }.build()
 
         Lookup.CommonDeviation ->