Skip to content

Commit

Permalink
Updated ktor and kotlin to latest versions (#9400)
Browse files Browse the repository at this point in the history
* updated ktor and kotlin

* upgraded to jvm21, since other java frameworks already use it
  • Loading branch information
inemtsev authored Nov 25, 2024
1 parent 8c007fa commit f8a7664
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion frameworks/Kotlin/ktor/ktor-exposed-dao.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:jdk17
FROM gradle:jdk21

WORKDIR /ktor-exposed
COPY ktor-exposed/settings.gradle.kts settings.gradle.kts
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:jdk17
FROM gradle:jdk21

WORKDIR /ktor-exposed
COPY ktor-exposed/settings.gradle.kts settings.gradle.kts
Expand Down
10 changes: 5 additions & 5 deletions frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
application
kotlin("jvm") version "1.9.22"
kotlin("jvm") version "2.0.21"
kotlin("plugin.serialization") version "2.0.0"
id("com.github.johnrengelman.shadow") version "8.1.0"
}
Expand All @@ -9,8 +9,8 @@ repositories {
mavenCentral()
}

val ktorVersion = "2.3.12"
val kotlinxSerializationVersion = "1.6.3"
val ktorVersion = "3.0.1"
val kotlinxSerializationVersion = "1.7.3"
val exposedVersion = "0.56.0"

dependencies {
Expand All @@ -25,8 +25,8 @@ dependencies {
implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion")
implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")

implementation("org.postgresql:postgresql:42.5.4")
implementation("com.zaxxer:HikariCP:5.0.1")
implementation("org.postgresql:postgresql:42.7.4")
implementation("com.zaxxer:HikariCP:5.1.0")
runtimeOnly("org.slf4j:slf4j-simple:1.7.36")
}

Expand Down
4 changes: 2 additions & 2 deletions frameworks/Kotlin/ktor/ktor.dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM maven:3.9.7-amazoncorretto-17-debian as maven
FROM maven:3.9.9-amazoncorretto-21-debian-bookworm as maven
WORKDIR /ktor
COPY ktor/pom.xml pom.xml
COPY ktor/src src
RUN mvn clean package -q

FROM amazoncorretto:17.0.11-al2023-headless
FROM amazoncorretto:21-al2023-headless
WORKDIR /ktor
COPY --from=maven /ktor/target/tech-empower-framework-benchmark-1.0-SNAPSHOT-netty-bundle.jar app.jar

Expand Down
12 changes: 6 additions & 6 deletions frameworks/Kotlin/ktor/ktor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<name>org.jetbrains.ktor tech-empower-framework-benchmark</name>

<properties>
<kotlin.version>1.9.22</kotlin.version>
<ktor.version>2.3.11</ktor.version>
<serialization.version>1.6.3</serialization.version>
<kotlin.version>2.0.21</kotlin.version>
<ktor.version>3.0.1</ktor.version>
<serialization.version>1.7.3</serialization.version>
<kotlinx.html.version>0.11.0</kotlinx.html.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hikaricp.version>5.0.0</hikaricp.version>
<hikaricp.version>5.1.0</hikaricp.version>
<logback.version>1.2.13</logback.version>
<mysql.version>8.0.28</mysql.version>
<postgresql.version>42.7.2</postgresql.version>
<mysql.version>8.0.33</mysql.version>
<postgresql.version>42.7.4</postgresql.version>
</properties>

<dependencies>
Expand Down

0 comments on commit f8a7664

Please sign in to comment.