Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
waltkb committed Nov 22, 2023
1 parent ac6bf7a commit f5b295d
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 48 deletions.
14 changes: 7 additions & 7 deletions waltid-crypto/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ kotlin {
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")

// Ktor client
implementation("io.ktor:ktor-client-core:2.3.5")
implementation("io.ktor:ktor-client-serialization:2.3.5")
implementation("io.ktor:ktor-client-content-negotiation:2.3.5")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.5")
implementation("io.ktor:ktor-client-json:2.3.5")
implementation("io.ktor:ktor-client-logging:2.3.5")
implementation("io.ktor:ktor-client-core:2.3.6")
implementation("io.ktor:ktor-client-serialization:2.3.6")
implementation("io.ktor:ktor-client-content-negotiation:2.3.6")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6")
implementation("io.ktor:ktor-client-json:2.3.6")
implementation("io.ktor:ktor-client-logging:2.3.6")

// Coroutines
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
Expand All @@ -69,7 +69,7 @@ kotlin {
implementation("org.bouncycastle:bcpkix-jdk18on:1.76") // PEM import

// Ktor client
implementation("io.ktor:ktor-client-cio:2.3.5")
implementation("io.ktor:ktor-client-cio:2.3.6")

// Logging
implementation("org.slf4j:slf4j-simple:2.0.9")
Expand Down
20 changes: 10 additions & 10 deletions waltid-did/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ kotlin {
implementation("io.github.optimumcode:json-schema-validator:0.0.2")

// Ktor client
implementation("io.ktor:ktor-client-core:2.3.5")
implementation("io.ktor:ktor-client-serialization:2.3.5")
implementation("io.ktor:ktor-client-content-negotiation:2.3.5")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.5")
implementation("io.ktor:ktor-client-json:2.3.5")
implementation("io.ktor:ktor-client-logging:2.3.5")
implementation("io.ktor:ktor-client-core:2.3.6")
implementation("io.ktor:ktor-client-serialization:2.3.6")
implementation("io.ktor:ktor-client-content-negotiation:2.3.6")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6")
implementation("io.ktor:ktor-client-json:2.3.6")
implementation("io.ktor:ktor-client-logging:2.3.6")

// Coroutines
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
Expand All @@ -71,7 +71,7 @@ kotlin {
val jvmMain by getting {
dependencies {
// Ktor client
implementation("io.ktor:ktor-client-cio:2.3.5")
implementation("io.ktor:ktor-client-cio:2.3.6")

// Logging
implementation("org.slf4j:slf4j-simple:2.0.9")
Expand All @@ -85,9 +85,9 @@ kotlin {
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
implementation(kotlin("test"))
implementation("org.junit.jupiter:junit-jupiter-params:5.9.0")
implementation("io.ktor:ktor-server-test-host:2.3.5")
implementation("io.ktor:ktor-server-content-negotiation:2.3.5")
implementation("io.ktor:ktor-server-netty:2.3.5")
implementation("io.ktor:ktor-server-test-host:2.3.6")
implementation("io.ktor:ktor-server-content-negotiation:2.3.6")
implementation("io.ktor:ktor-server-netty:2.3.6")
}
}
publishing {
Expand Down
17 changes: 7 additions & 10 deletions waltid-issuer/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
/*import com.github.jk1.license.filter.DependencyFilter
import com.github.jk1.license.filter.LicenseBundleNormalizer
import com.github.jk1.license.render.InventoryHtmlReportRenderer
import com.github.jk1.license.render.ReportRenderer*/
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

object Versions {
const val KOTLIN_VERSION = "1.9.10" // also change 2 plugins
const val KOTLIN_VERSION = "1.9.20" // also change 2 plugins
const val KTOR_VERSION = "2.3.6" // also change 1 plugin
const val COROUTINES_VERSION = "1.7.3"
const val EXPOSED_VERSION = "0.43.0"
const val HOPLITE_VERSION = "2.8.0.RC2"
const val HOPLITE_VERSION = "2.8.0.RC3"
}

plugins {
kotlin("jvm") // Versions.KOTLIN_VERSION
id("org.jetbrains.kotlin.plugin.serialization") // Versions.KOTLIN_VERSION

id("io.ktor.plugin") version "2.3.5" // Versions.KTOR_VERSION
id("org.owasp.dependencycheck") version "8.4.2"
//id("io.ktor.plugin") version "2.3.6" // Versions.KTOR_VERSION
id("io.ktor.plugin") version "2.3.6" // Versions.KTOR_VERSION
id("org.owasp.dependencycheck") version "8.4.3"
id("com.github.jk1.dependency-license-report") version "2.5"
application
`maven-publish`
Expand Down Expand Up @@ -63,7 +60,7 @@ dependencies {
implementation("io.ktor:ktor-server-cio-jvm:${Versions.KTOR_VERSION}")

// Ktor server external libs
implementation("io.github.smiley4:ktor-swagger-ui:2.6.0")
implementation("io.github.smiley4:ktor-swagger-ui:2.7.1")

// Ktor client
implementation("io.ktor:ktor-client-core-jvm:${Versions.KTOR_VERSION}")
Expand Down Expand Up @@ -122,7 +119,7 @@ dependencies {
api(project(":waltid-sdjwt"))

// TODO: REMOVE:
implementation("com.nimbusds:nimbus-jose-jwt:9.37")
implementation("com.nimbusds:nimbus-jose-jwt:9.37.1")

//api(project(":waltid-mdocs"))
//implementation("id.walt:waltid-ssikit2:1.0.8a-SNAPSHOT")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ private fun statusCodeForException(cause: Throwable) = when (cause) {

fun Application.configureStatusPages() {
install(StatusPages) {
exception<NotFoundException> { call, ex ->
call.respond(HttpStatusCode.NotFound, ex.message ?: "Not found")
}
exception<UnauthorizedException> { call, cause ->
call.respond(HttpStatusCode.Unauthorized, cause.message ?: "")
}
Expand Down
2 changes: 1 addition & 1 deletion waltid-openid4vc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ kotlin {
// isMingwX64 -> mingwX64("native")
// else -> throw GradleException("Host OS is not supported in Kotlin/Native.")
// }
val ktor_version = "2.3.5"
val ktor_version = "2.3.6"


sourceSets {
Expand Down
14 changes: 7 additions & 7 deletions waltid-reporting/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ kotlin {
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")

// Ktor client
implementation("io.ktor:ktor-client-core:2.3.5")
implementation("io.ktor:ktor-client-serialization:2.3.5")
implementation("io.ktor:ktor-client-content-negotiation:2.3.5")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.5")
implementation("io.ktor:ktor-client-json:2.3.5")
implementation("io.ktor:ktor-client-logging:2.3.5")
implementation("io.ktor:ktor-client-core:2.3.6")
implementation("io.ktor:ktor-client-serialization:2.3.6")
implementation("io.ktor:ktor-client-content-negotiation:2.3.6")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6")
implementation("io.ktor:ktor-client-json:2.3.6")
implementation("io.ktor:ktor-client-logging:2.3.6")

// Scheduler
implementation("it.justwrote:kjob-core:0.2.0")
Expand All @@ -72,7 +72,7 @@ kotlin {
val jvmMain by getting {
dependencies {
// Ktor client
implementation("io.ktor:ktor-client-cio:2.3.5")
implementation("io.ktor:ktor-client-cio:2.3.6")

// Logging
implementation("org.slf4j:slf4j-simple:2.0.9")
Expand Down
4 changes: 2 additions & 2 deletions waltid-sdjwt/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repositories {
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
kotlin {
jvm {
jvmToolchain(18) // 16 possible?
jvmToolchain(17) // 16 possible?
withJava()
testRuns["test"].executionTask.configure {
useJUnitPlatform()
Expand Down Expand Up @@ -105,7 +105,7 @@ kotlin {
}
val jvmMain by getting {
dependencies {
implementation("com.nimbusds:nimbus-jose-jwt:9.37")
implementation("com.nimbusds:nimbus-jose-jwt:9.37.1")
}
}
val jvmTest by getting {
Expand Down
14 changes: 7 additions & 7 deletions waltid-verifiable-credentials/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ kotlin {
implementation("io.github.optimumcode:json-schema-validator:0.0.2")

// Ktor client
implementation("io.ktor:ktor-client-core:2.3.5")
implementation("io.ktor:ktor-client-serialization:2.3.5")
implementation("io.ktor:ktor-client-content-negotiation:2.3.5")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.5")
implementation("io.ktor:ktor-client-json:2.3.5")
implementation("io.ktor:ktor-client-logging:2.3.5")
implementation("io.ktor:ktor-client-core:2.3.6")
implementation("io.ktor:ktor-client-serialization:2.3.6")
implementation("io.ktor:ktor-client-content-negotiation:2.3.6")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6")
implementation("io.ktor:ktor-client-json:2.3.6")
implementation("io.ktor:ktor-client-logging:2.3.6")

// Coroutines
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
Expand All @@ -72,7 +72,7 @@ kotlin {
val jvmMain by getting {
dependencies {
// Ktor client
implementation("io.ktor:ktor-client-cio:2.3.5")
implementation("io.ktor:ktor-client-cio:2.3.6")

// Logging
implementation("org.slf4j:slf4j-simple:2.0.9")
Expand Down
8 changes: 4 additions & 4 deletions waltid-verifier/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.github.jk1.license.render.ReportRenderer*/
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

object Versions {
const val KOTLIN_VERSION = "1.9.10" // also change 2 plugins
const val KOTLIN_VERSION = "1.9.20" // also change 2 plugins
const val KTOR_VERSION = "2.3.6" // also change 1 plugin
const val COROUTINES_VERSION = "1.7.3"
const val EXPOSED_VERSION = "0.43.0"
Expand All @@ -16,8 +16,8 @@ plugins {
kotlin("jvm") // Versions.KOTLIN_VERSION
id("org.jetbrains.kotlin.plugin.serialization") // Versions.KOTLIN_VERSION

id("io.ktor.plugin") version "2.3.5" // Versions.KTOR_VERSION
id("org.owasp.dependencycheck") version "8.4.2"
id("io.ktor.plugin") version "2.3.6" // Versions.KTOR_VERSION
id("org.owasp.dependencycheck") version "8.4.3"
id("com.github.jk1.dependency-license-report") version "2.5"
application
`maven-publish`
Expand Down Expand Up @@ -63,7 +63,7 @@ dependencies {
implementation("io.ktor:ktor-server-cio-jvm:${Versions.KTOR_VERSION}")

// Ktor server external libs
implementation("io.github.smiley4:ktor-swagger-ui:2.6.0")
implementation("io.github.smiley4:ktor-swagger-ui:2.7.1")

// Ktor client
implementation("io.ktor:ktor-client-core-jvm:${Versions.KTOR_VERSION}")
Expand Down

0 comments on commit f5b295d

Please sign in to comment.