From f1db35e82bf4e0a86c8c445ef4feb6dde199cd15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Vi=C3=B1as=20Alcon?= Date: Fri, 10 Nov 2023 12:58:04 +0100 Subject: [PATCH] Update ktor (#51) * Update ktor * Update java 21 --- .github/workflows/ktor.yml | 2 +- README.md | 4 ++-- ktor-app/build.gradle.kts | 6 +++--- ktor-app/gradle.properties | 7 +++---- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ktor.yml b/.github/workflows/ktor.yml index 14e25e4..bb82ab4 100644 --- a/.github/workflows/ktor.yml +++ b/.github/workflows/ktor.yml @@ -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 diff --git a/README.md b/README.md index 9d8ce50..7d0bdd4 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/ktor-app/build.gradle.kts b/ktor-app/build.gradle.kts index a773122..e1ec753 100644 --- a/ktor-app/build.gradle.kts +++ b/ktor-app/build.gradle.kts @@ -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" } @@ -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) } } @@ -55,7 +55,7 @@ dependencies { tasks.withType { kotlinOptions { freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "17" + jvmTarget = "21" } } diff --git a/ktor-app/gradle.properties b/ktor-app/gradle.properties index 861dcad..7b0e4f7 100644 --- a/ktor-app/gradle.properties +++ b/ktor-app/gradle.properties @@ -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