Skip to content

Commit a4998d7

Browse files
committed
chore: kotlin 2.0.20 update
1 parent ea66ae2 commit a4998d7

File tree

6 files changed

+80
-39
lines changed

6 files changed

+80
-39
lines changed

backend/jvm/src/main/kotlin/dev/suresh/App.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import dev.suresh.config.SysConfig
55
import dev.suresh.plugins.configureHTTP
66
import dev.suresh.plugins.configureOTel
77
import dev.suresh.plugins.configureSecurity
8-
import dev.suresh.plugins.configureSerialization
98
import dev.suresh.plugins.custom.customPlugins
109
import dev.suresh.plugins.errorRoutes
1110
import dev.suresh.routes.*
@@ -26,7 +25,6 @@ fun main(args: Array<String>) =
2625

2726
fun Application.module() {
2827
configureHTTP()
29-
configureSerialization()
3028
configureSecurity()
3129
configureOTel()
3230
errorRoutes()

backend/jvm/src/main/kotlin/dev/suresh/plugins/Http.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,31 @@ package dev.suresh.plugins
22

33
import BuildConfig
44
import io.ktor.http.*
5+
import io.ktor.serialization.kotlinx.json.json
56
import io.ktor.server.application.*
67
import io.ktor.server.plugins.*
78
import io.ktor.server.plugins.autohead.*
89
import io.ktor.server.plugins.calllogging.*
910
import io.ktor.server.plugins.compression.*
11+
import io.ktor.server.plugins.contentnegotiation.*
1012
import io.ktor.server.plugins.cors.routing.*
1113
import io.ktor.server.plugins.defaultheaders.*
1214
import io.ktor.server.plugins.forwardedheaders.*
1315
import io.ktor.server.plugins.hsts.*
1416
import io.ktor.server.plugins.partialcontent.*
1517
import io.ktor.server.request.*
18+
import io.ktor.server.resources.Resources
1619
import io.ktor.server.routing.*
1720
import io.ktor.server.websocket.*
1821
import kotlin.time.Duration.Companion.seconds
1922
import kotlin.time.toJavaDuration
2023
import org.slf4j.event.Level
2124

2225
fun Application.configureHTTP() {
26+
install(Resources)
27+
28+
install(ContentNegotiation) { json(dev.suresh.http.json) }
29+
2330
install(IgnoreTrailingSlash)
2431

2532
install(PartialContent)

backend/jvm/src/main/kotlin/dev/suresh/plugins/Serialization.kt

Lines changed: 0 additions & 12 deletions
This file was deleted.

gradle/build-logic/src/main/kotlin/plugins/kotlin.docs.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ tasks {
128128
// externalDocumentationLink(url = "https://api.ktor.io/")
129129
}
130130

131+
// pluginsMapConfiguration = mapOf("org.jetbrains.dokka.base.DokkaBase" to """{ "templatesDir"
132+
// : "${projectDir.toString().replace('\\','/')}/../dokka-templates" }""")
133+
131134
pluginConfiguration<DokkaBase, DokkaBaseConfiguration> {
132135
footerMessage = "Copyright &copy; 2024 suresh.dev"
133136
homepageLink = githubRepo

gradle/kotlin-js-store/package-lock.json

Lines changed: 67 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
java = "24"
3-
kotlin = "2.0.20-RC2"
4-
kotlin-ksp = "2.0.20-RC2-1.0.24"
3+
kotlin = "2.0.20"
4+
kotlin-ksp = "2.0.20-1.0.24"
55
kotlin-jvmtarget = "22"
66
kotlin-dsl-jvmtarget = "21"
77
kotlin-api-version = "2.0"
@@ -112,7 +112,7 @@ java-keychain = "1.1.0"
112112
webjars-xterm = "5.1.0"
113113
arrow-suspendapp = "0.4.1-alpha.5"
114114
exposed = "0.53.0"
115-
postgresql = "42.7.3"
115+
postgresql = "42.7.4"
116116
hikariCP = "5.1.0"
117117
h2 = "2.3.232"
118118
micrometer = "1.13.2"

0 commit comments

Comments
 (0)