Browse Source

[ Kotlin / Hexagon ] Use the latest release (#10043)

* Update dependencies

* Update dependencies

* Update dependencies

* Update dependencies

* Update dependencies

* Fix native image settings

* Change implementations

* Update version

* Add tests for new adapter

* Update dependencies

* Update dependencies

* Update dependencies

* Update dependencies

* Update dependencies

* Update dependencies

* Disable native benchmarks

* Update configuration

* Update configuration

* Update dependencies

* Update dependencies
Juanjo Aguililla 1 month ago
parent
commit
b8d9647d0a

+ 1 - 1
frameworks/Java/helidon/nima/src/main/java/io/helidon/benchmark/nima/services/FortuneHandler.java

@@ -71,5 +71,5 @@ public class FortuneHandler implements Handler {
                 throw new RuntimeException(e);
             }
         }
-    };
+    }
 }

+ 9 - 10
frameworks/Kotlin/hexagon/build.gradle

@@ -1,7 +1,7 @@
 
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "2.1.20" apply false
-    id "org.graalvm.buildtools.native" version "0.10.6" apply false
+    id "org.jetbrains.kotlin.jvm" version "2.2.0" apply false
+    id "org.graalvm.buildtools.native" version "0.11.0" apply false
 }
 
 version = "1.0.0"
@@ -9,13 +9,13 @@ description = "TFB benchmark"
 group = "com.hexagontk"
 
 ext {
-    hexagonVersion = "4.1.1"
-    jettyVersion = "12.0.19"
-    nettyVersion = "4.2.0.Final"
+    hexagonVersion = "4.2.3"
+    jettyVersion = "12.0.23"
+    nettyVersion = "4.2.3.Final"
 
-    hikariVersion = "6.3.0"
-    postgresqlVersion = "42.7.5"
-    vertxVersion = "5.0.0.CR6"
+    hikariVersion = "7.0.1"
+    postgresqlVersion = "42.7.7"
+    vertxVersion = "5.0.2"
     cache2kVersion = "2.6.1.Final"
 
     applicationClass = "com.hexagontk.BenchmarkKt"
@@ -30,6 +30,5 @@ subprojects {
 }
 
 tasks.wrapper {
-//    gradleVersion = "8.14.0"
-    gradleVersion = "release-candidate"
+    gradleVersion = "8.14.3"
 }

+ 1 - 1
frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

+ 0 - 2
frameworks/Kotlin/hexagon/hexagon_jetty_pgclient/src/main/kotlin/Benchmark.kt

@@ -1,6 +1,5 @@
 package com.hexagontk
 
-import com.hexagontk.core.Platform.systemFlag
 import com.hexagontk.core.media.TEXT_HTML
 import com.hexagontk.core.urlOf
 import com.hexagontk.http.server.jetty.JettyServletHttpServer
@@ -16,7 +15,6 @@ fun main() {
         sendDateHeader = settings.sendDateHeader,
         sendServerVersion = settings.sendServerVersion,
         sendXPoweredBy = settings.sendXPoweredBy,
-        useVirtualThreads = systemFlag("virtualThreads"),
     )
 
     val benchmark = Benchmark(engine, store, templateEngine, templateUrl, settings)

+ 0 - 2
frameworks/Kotlin/hexagon/hexagon_jetty_postgresql/src/main/kotlin/Benchmark.kt

@@ -1,6 +1,5 @@
 package com.hexagontk
 
-import com.hexagontk.core.Platform.systemFlag
 import com.hexagontk.core.media.TEXT_HTML
 import com.hexagontk.core.urlOf
 import com.hexagontk.http.server.jetty.JettyServletHttpServer
@@ -16,7 +15,6 @@ fun main() {
         sendDateHeader = settings.sendDateHeader,
         sendServerVersion = settings.sendServerVersion,
         sendXPoweredBy = settings.sendXPoweredBy,
-        useVirtualThreads = systemFlag("virtualThreads"),
     )
 
     val benchmark = Benchmark(engine, store, templateEngine, templateUrl, settings)

+ 2 - 1
frameworks/Kotlin/hexagon/hexagon_nettyepoll_pgclient/build.gradle

@@ -3,6 +3,7 @@ apply(from: "$gradleScripts/application.gradle")
 
 dependencies {
     api(project(":store_pgclient"))
-    api("com.hexagontk.http:http_server_netty_epoll:$hexagonVersion")
+    api("com.hexagontk.http:http_server_netty:$hexagonVersion")
     api("io.netty:netty-transport-native-epoll:$nettyVersion:linux-x86_64")
+    api("io.netty:netty-transport-native-io_uring:$nettyVersion:linux-x86_64")
 }

+ 2 - 1
frameworks/Kotlin/hexagon/hexagon_nettyepoll_postgresql/build.gradle

@@ -3,6 +3,7 @@ apply(from: "$gradleScripts/application.gradle")
 
 dependencies {
     api(project(":store_sql"))
-    api("com.hexagontk.http:http_server_netty_epoll:$hexagonVersion")
+    api("com.hexagontk.http:http_server_netty:$hexagonVersion")
     api("io.netty:netty-transport-native-epoll:$nettyVersion:linux-x86_64")
+    api("io.netty:netty-transport-native-io_uring:$nettyVersion:linux-x86_64")
 }