Skip to content

Commit

Permalink
Update ktor (#51)
Browse files Browse the repository at this point in the history
* Update ktor

* Update java 21
  • Loading branch information
rogervinas authored Nov 10, 2023
1 parent fb5eb85 commit f1db35e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ktor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
- name: Build with Gradle
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
![Micronaut](https://img.shields.io/badge/Micronaut-3.8.1-blue?labelColor=black)

[![Ktor](https://github.com/rogervinas/top-5-server-side-kotlin-frameworks-2022/actions/workflows/ktor.yml/badge.svg)](https://github.com/rogervinas/top-5-server-side-kotlin-frameworks-2022/actions/workflows/ktor.yml)
![Java](https://img.shields.io/badge/Java-17-blue?labelColor=black)
![Java](https://img.shields.io/badge/Java-21-blue?labelColor=black)
![Kotlin](https://img.shields.io/badge/Kotlin-1.9.20-blue?labelColor=black)
![Ktor](https://img.shields.io/badge/Ktor-2.2.4-blue?labelColor=black)
![Ktor](https://img.shields.io/badge/Ktor-2.3.6-blue?labelColor=black)

[![Http4k](https://github.com/rogervinas/top-5-server-side-kotlin-frameworks-2022/actions/workflows/http4k.yml/badge.svg)](https://github.com/rogervinas/top-5-server-side-kotlin-frameworks-2022/actions/workflows/http4k.yml)
![Java](https://img.shields.io/badge/Java-11-blue?labelColor=black)
Expand Down
6 changes: 3 additions & 3 deletions ktor-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ val postgres_version: String by project

plugins {
kotlin("jvm") version "1.9.20"
id("io.ktor.plugin") version "2.2.4"
id("io.ktor.plugin") version "2.3.6"
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.20"
}

Expand All @@ -23,7 +23,7 @@ ktor {
docker {
localImageName.set("${project.name}")
imageTag.set("${project.version}")
jreVersion.set(io.ktor.plugin.features.JreVersion.JRE_17)
jreVersion.set(JavaVersion.VERSION_21)
}
}

Expand Down Expand Up @@ -55,7 +55,7 @@ dependencies {
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
freeCompilerArgs = listOf("-Xjsr305=strict")
jvmTarget = "17"
jvmTarget = "21"
}
}

Expand Down
7 changes: 3 additions & 4 deletions ktor-app/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
ktor_version=2.2.4
ktor_version=2.3.6
kotlin_version=1.9.20
logback_version=1.2.11
postgres_version=42.5.1

logback_version=1.4.11
kotlin.code.style=official
postgres_version=42.5.1

0 comments on commit f1db35e

Please sign in to comment.