Skip to content

Commit

Permalink
Dependency upgrades (#349)
Browse files Browse the repository at this point in the history
  • Loading branch information
dzarras authored Dec 2, 2024
1 parent 1a74eed commit ec8c0f0
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 9 deletions.
8 changes: 6 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
}
}

Expand Down
11 changes: 5 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down

0 comments on commit ec8c0f0

Please sign in to comment.