Skip to content

Commit 41fbb85

Browse files
committed
Update
1 parent d1f341a commit 41fbb85

File tree

8 files changed

+31
-31
lines changed

8 files changed

+31
-31
lines changed

.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Enable auto-env through the sdkman_auto_env config
22
# Add key=value pairs of SDKs to use below
3-
java=21.0.4-graal
3+
java=21.0.2-graalce

build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import java.lang.System.getProperty
33
import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL
44

55
plugins {
6-
kotlin("jvm") version("2.0.20")
7-
id("org.graalvm.buildtools.native") version("0.10.2")
6+
kotlin("jvm") version("2.1.0")
7+
id("org.graalvm.buildtools.native") version("0.10.4")
88
}
99

10-
val hexagonVersion = "3.6.5"
11-
val gradleScripts = "https://raw.githubusercontent.com/hexagontk/hexagon/$hexagonVersion/gradle"
10+
val hexagonVersion = "4.0.0-A7"
11+
val gradleScripts = "../hexagon/gradle"
1212

1313
ext.set("modules", "java.logging,java.management")
1414
ext.set("options", "-Xmx48m")
@@ -25,14 +25,14 @@ group="org.example"
2525
description="Service's description"
2626

2727
dependencies {
28-
"implementation"("com.hexagonkt:http_server_helidon:$hexagonVersion")
28+
"implementation"("com.hexagontk:http_server_helidon:$hexagonVersion")
2929

30-
"testImplementation"("com.hexagonkt:http_client_jetty:$hexagonVersion")
30+
"testImplementation"("com.hexagontk:http_client_jetty:$hexagonVersion")
3131
"testImplementation"("org.slf4j:slf4j-nop:2.0.16")
3232
}
3333

3434
tasks.wrapper {
35-
gradleVersion = "8.10"
35+
gradleVersion = "8.12"
3636
distributionType = ALL
3737
}
3838

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum

src/main/kotlin/Application.kt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
package org.example
22

3-
import com.hexagonkt.core.ALL_INTERFACES
4-
import com.hexagonkt.http.server.*
5-
import com.hexagonkt.http.server.helidon.HelidonServerAdapter
6-
import com.hexagonkt.core.media.TEXT_PLAIN
7-
import com.hexagonkt.http.model.ContentType
8-
import com.hexagonkt.http.model.Header
3+
import com.hexagontk.core.*
4+
import com.hexagontk.http.server.*
5+
import com.hexagontk.http.server.helidon.HelidonHttpServer
6+
import com.hexagontk.core.media.TEXT_PLAIN
7+
import com.hexagontk.http.model.ContentType
8+
import com.hexagontk.http.model.Field
99

1010
internal val settings = HttpServerSettings(ALL_INTERFACES, 9090)
11-
internal val serverAdapter = HelidonServerAdapter()
11+
internal val serverAdapter = HelidonHttpServer()
1212

1313
internal lateinit var server: HttpServer
1414

1515
internal fun main() {
1616
server = serve(serverAdapter, settings) {
1717
before("*") {
18-
send(headers = response.headers + Header("server", "Hexagon/2.6"))
18+
send(headers = response.headers + Field("server", "Hexagon/4"))
1919
}
2020

2121
get("/text") {
2222
ok("Hello, World!", contentType = ContentType(TEXT_PLAIN))
2323
}
2424
}
25+
26+
System.setProperty(HEXAGONTK_LOGGING_COLOR, "true")
27+
val banner = server.createShortBanner(Platform.uptime)
28+
logger.info { banner }
2529
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Community
2-
#Args=-R:MaxHeapSize=16 -march=native
2+
Args=-R:MaxHeapSize=16 -march=native
33
# Oracle
4-
Args=-march=native --gc=G1 --enable-sbom
4+
#Args=-march=native --gc=G1 --enable-sbom

src/test/kotlin/ApplicationTest.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
package org.example
22

3-
import com.hexagonkt.core.media.TEXT_PLAIN
4-
import com.hexagonkt.core.urlOf
5-
import com.hexagonkt.http.client.HttpClient
6-
import com.hexagonkt.http.client.HttpClientSettings
7-
import com.hexagonkt.http.client.jetty.JettyClientAdapter
3+
import com.hexagontk.core.media.TEXT_PLAIN
4+
import com.hexagontk.http.client.HttpClient
5+
import com.hexagontk.http.client.HttpClientSettings
6+
import com.hexagontk.http.client.jetty.JettyHttpClient
87
import org.junit.jupiter.api.AfterAll
98
import org.junit.jupiter.api.BeforeAll
109
import org.junit.jupiter.api.Test
1110
import org.junit.jupiter.api.TestInstance
1211
import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
12+
import java.net.URI
1313
import kotlin.test.assertEquals
1414
import kotlin.test.assertNotNull
1515

1616
@TestInstance(PER_CLASS)
1717
internal class ApplicationTest {
1818

1919
private val client by lazy {
20-
val clientSettings = HttpClientSettings(urlOf("http://localhost:${server.runtimePort}"))
21-
HttpClient(JettyClientAdapter(), clientSettings)
20+
val clientSettings = HttpClientSettings(URI("http://localhost:${server.runtimePort}"))
21+
HttpClient(JettyHttpClient(), clientSettings)
2222
}
2323

2424
@BeforeAll fun beforeAll() {

src/test/resources/META-INF/native-image/org.example/gradle_starter/native-image.properties

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)