From 402fb5e9b4092482b40bc2927853c97e0dfb3118 Mon Sep 17 00:00:00 2001 From: jaguililla Date: Tue, 2 Apr 2024 19:44:46 +0200 Subject: [PATCH] Update Hexagon version --- .github/workflows/push.yml | 2 +- .sdkmanrc | 2 +- build.gradle.kts | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/kotlin/Application.kt | 2 -- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index cd86022..eb50674 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check Out - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Java uses: graalvm/setup-graalvm@v1 with: diff --git a/.sdkmanrc b/.sdkmanrc index f8dec8e..2d805df 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,3 +1,3 @@ # Enable auto-env through the sdkman_auto_env config # Add key=value pairs of SDKs to use below -java=21.0.1-graal +java=21.0.2-graal diff --git a/build.gradle.kts b/build.gradle.kts index d8a94bf..ea53a06 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,12 +3,12 @@ import java.lang.System.getProperty import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL plugins { - kotlin("jvm") version("1.9.22") - id("org.graalvm.buildtools.native") version("0.9.28") + kotlin("jvm") version("1.9.23") + id("org.graalvm.buildtools.native") version("0.10.1") } -val hexagonVersion = "3.4.6" -val gradleScripts = "https://raw.githubusercontent.com/hexagonkt/hexagon/$hexagonVersion/gradle" +val hexagonVersion = "3.5.3" +val gradleScripts = "https://raw.githubusercontent.com/hexagontk/hexagon/$hexagonVersion/gradle" ext.set("options", "-Xmx48m") ext.set("applicationClass", "org.example.ApplicationKt") @@ -31,7 +31,7 @@ dependencies { } tasks.wrapper { - gradleVersion = "8.5" + gradleVersion = "8.7" distributionType = ALL } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6aba25..e7646de 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/kotlin/Application.kt b/src/main/kotlin/Application.kt index cedee8e..22ddfdb 100644 --- a/src/main/kotlin/Application.kt +++ b/src/main/kotlin/Application.kt @@ -3,7 +3,6 @@ package org.example import com.hexagonkt.core.ALL_INTERFACES import com.hexagonkt.http.server.* import com.hexagonkt.http.server.netty.NettyServerAdapter -import com.hexagonkt.core.logging.LoggingManager import com.hexagonkt.core.media.TEXT_PLAIN import com.hexagonkt.http.model.ContentType import com.hexagonkt.http.model.Header @@ -14,7 +13,6 @@ internal val serverAdapter = NettyServerAdapter(executorThreads = 4) internal lateinit var server: HttpServer internal fun main() { - LoggingManager.defaultLoggerName = "org.example" server = serve(serverAdapter, settings) { before("*") { send(headers = response.headers + Header("server", "Hexagon/2.6"))