Skip to content

Commit 12c14fb

Browse files
committed
Merge branch 'upgrade-dependencies' into develop
2 parents 1e50040 + fa68d0c commit 12c14fb

2 files changed

Lines changed: 12 additions & 15 deletions

File tree

gradle/libs.versions.toml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,21 @@ mkdocs = "4.0.1"
1515

1616
# Libraries
1717
kotlinx-serialization = "1.10.0"
18-
ktor = "3.3.2"
19-
schema-kenerator = "2.6.0"
20-
swagger-parser = "2.1.24"
18+
ktor = "3.4.2"
19+
schema-kenerator = "2.7.2"
20+
swagger-parser = "2.1.39"
2121
kotlin-logging = "7.0.0"
2222
logback = "1.5.6"
23-
jackson = "2.18.1"
24-
kotest = "5.8.0"
25-
kotlin-test = "2.0.21"
23+
jackson = "3.1.1"
24+
kotest = "6.1.10"
2625
mockk = "1.13.12"
27-
webjars-redoc = "2.1.5"
28-
webjars-swaggerui = "5.17.14"
26+
webjars-redoc = "2.5.1"
27+
webjars-swaggerui = "5.32.4"
2928

3029
[libraries]
3130

3231
# Kotlin & Kotlinx
33-
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm", version.ref = "kotlinx-serialization" }
3432
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
35-
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
3633

3734
# Ktor
3835
ktor-server-core-jvm = { module = "io.ktor:ktor-server-netty-jvm", version.ref = "ktor" }
@@ -62,12 +59,12 @@ kotlin-logging = { module = "io.github.oshai:kotlin-logging-jvm", version.ref =
6259
logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
6360

6461
# Misc
65-
jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
62+
jackson-kotlin = { module = "tools.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
6663

6764
# Testing
6865
kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
6966
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
70-
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-test" }
67+
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
7168
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
7269

7370
[plugins]

ktor-openapi/src/main/kotlin/io/github/smiley4/ktoropenapi/config/ExampleEncoder.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.github.smiley4.ktoropenapi.config
22

3-
import com.fasterxml.jackson.core.type.TypeReference
4-
import com.fasterxml.jackson.databind.ObjectMapper
5-
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
63
import io.github.smiley4.ktoropenapi.config.descriptors.KTypeDescriptor
74
import io.github.smiley4.ktoropenapi.config.descriptors.TypeDescriptor
85
import kotlinx.serialization.json.Json
96
import kotlinx.serialization.serializer
7+
import tools.jackson.core.type.TypeReference
8+
import tools.jackson.databind.ObjectMapper
9+
import tools.jackson.module.kotlin.jacksonObjectMapper
1010

1111
/**
1212
* Encoder to produce the final example value.

0 commit comments

Comments
 (0)