Skip to content

Commit 981a75b

Browse files
Ilya NemtsevIlya Nemtsev
authored andcommitted
fixed older variants
1 parent 724f7a4 commit 981a75b

File tree

7 files changed

+33
-34
lines changed

7 files changed

+33
-34
lines changed

frameworks/Kotlin/ktor/ktor-asyncdb/build.gradle.kts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
application
3-
kotlin("jvm") version "1.9.22"
3+
kotlin("jvm") version "2.0.21"
44
kotlin("plugin.serialization") version "2.0.0"
55
id("com.github.johnrengelman.shadow") version "8.1.0"
66
}
@@ -17,20 +17,25 @@ application {
1717
}
1818

1919
val ktor_version = "2.3.12"
20-
val kotlinx_serialization_version = "1.6.3"
21-
val vertx_pg_client = "4.5.8"
20+
val kotlinx_serialization_version = "1.7.3"
2221

2322
dependencies {
2423
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_version")
2524
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
2625
implementation("io.ktor:ktor-server-netty:$ktor_version")
2726
implementation("io.ktor:ktor-server-default-headers:$ktor_version")
2827
implementation("io.ktor:ktor-server-html-builder:$ktor_version")
29-
implementation("com.github.jasync-sql:jasync-postgresql:2.2.0")
28+
implementation("com.github.jasync-sql:jasync-postgresql:2.2.4")
29+
}
30+
31+
java {
32+
toolchain {
33+
languageVersion = JavaLanguageVersion.of(21)
34+
}
3035
}
3136

3237
tasks.shadowJar {
33-
archiveBaseName.set("bench")
38+
archiveBaseName.set("ktor-asyncdb")
3439
archiveClassifier.set("")
3540
archiveVersion.set("")
3641
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlin.code.style=official
22

3-
kotlin_version=1.9.22
3+
kotlin_version=2.0.21
44
ktor_version=2.3.12

frameworks/Kotlin/ktor/ktor-asyncdb/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#Fri Dec 07 21:01:17 MST 2018
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME

frameworks/Kotlin/ktor/ktor-asyncdb/settings.gradle

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rootProject.name = "tech-empower-framework-benchmark"
Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
FROM gradle:jdk21
1+
FROM gradle:jdk21 as build
2+
WORKDIR /app
3+
COPY ktor-asyncdb/gradle gradle
4+
COPY ktor-asyncdb/build.gradle.kts build.gradle.kts
5+
COPY ktor-asyncdb/gradlew gradlew
6+
COPY ktor-asyncdb/src src
7+
RUN /app/gradlew --no-daemon shadowJar
28

3-
WORKDIR /ktor-asyncdb
4-
COPY ktor-asyncdb/settings.gradle settings.gradle
5-
COPY ktor-asyncdb/app app
6-
RUN gradle --no-daemon shadowJar
9+
FROM amazoncorretto:21-al2023-headless
10+
WORKDIR /app
11+
COPY --from=build /app/build/libs/ktor-asyncdb.jar ktor-asyncdb.jar
712

813
EXPOSE 9090
914

10-
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AlwaysPreTouch", "/app/build/libs/bench.jar", "jasync-sql"]
15+
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AlwaysPreTouch", "-jar", "ktor-asyncdb.jar", "jasync-sql"]

frameworks/Kotlin/ktor/ktor-pgclient/build.gradle.kts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
application
3-
kotlin("jvm") version "1.9.22"
3+
kotlin("jvm") version "2.0.21"
44
kotlin("plugin.serialization") version "2.0.0"
55
id("com.github.johnrengelman.shadow") version "8.1.0"
66
}
@@ -17,19 +17,22 @@ application {
1717
}
1818

1919
val ktor_version = "2.3.12"
20+
val vertx_version = "4.5.11"
2021

2122
dependencies {
22-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
23+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
2324
implementation("io.ktor:ktor-server-netty:$ktor_version")
2425
implementation("io.ktor:ktor-server-html-builder-jvm:$ktor_version")
2526
implementation("io.ktor:ktor-server-default-headers-jvm:$ktor_version")
26-
implementation("io.vertx:vertx-pg-client:4.5.8")
27-
implementation("io.vertx:vertx-lang-kotlin:4.5.8")
28-
implementation("io.vertx:vertx-lang-kotlin-coroutines:4.5.8")
27+
implementation("io.vertx:vertx-pg-client:$vertx_version")
28+
implementation("io.vertx:vertx-lang-kotlin:$vertx_version")
29+
implementation("io.vertx:vertx-lang-kotlin-coroutines:$vertx_version")
2930
}
3031

31-
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
32-
kotlinOptions.jvmTarget = "21"
32+
java {
33+
toolchain {
34+
languageVersion = JavaLanguageVersion.of(21)
35+
}
3336
}
3437

3538
tasks.shadowJar {

0 commit comments

Comments
 (0)