Skip to content

Commit b6deb5f

Browse files
jaguilillajaguililla
authored
[ Kotlin / Hexagon ] Update dependencies (#10141)
* 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 * Update dependencies * Update dependencies * Update dependencies
1 parent f89731b commit b6deb5f

16 files changed

+32
-36
lines changed

‎frameworks/Kotlin/hexagon/build.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11

22
plugins {
3-
id "org.jetbrains.kotlin.jvm" version "2.2.0" apply false
4-
id "org.graalvm.buildtools.native" version "0.11.0" apply false
3+
id "org.jetbrains.kotlin.jvm" version "2.2.20" apply false
4+
id "org.graalvm.buildtools.native" version "0.11.1" apply false
55
}
66

77
version = "1.0.0"
88
description = "TFB benchmark"
99
group = "com.hexagontk"
1010

1111
ext {
12-
hexagonVersion = "4.2.3"
13-
jettyVersion = "12.0.23"
14-
nettyVersion = "4.2.3.Final"
12+
hexagonVersion = "4.2.4"
13+
jettyVersion = "12.1.1"
14+
nettyVersion = "4.2.6.Final"
1515

16-
hikariVersion = "7.0.1"
17-
postgresqlVersion = "42.7.7"
18-
vertxVersion = "5.0.2"
16+
hikariVersion = "7.0.2"
17+
postgresqlVersion = "42.7.8"
18+
vertxVersion = "5.0.4"
1919
cache2kVersion = "2.6.1.Final"
2020

2121
applicationClass = "com.hexagontk.BenchmarkKt"
@@ -30,5 +30,5 @@ subprojects {
3030
}
3131

3232
tasks.wrapper {
33-
gradleVersion = "8.14.3"
33+
gradleVersion = "9.1.0"
3434
}

‎frameworks/Kotlin/hexagon/core/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
plugins {
3-
id("gg.jte.gradle") version("3.1.13")
3+
id("gg.jte.gradle") version("3.2.1")
44
}
55

66
dependencies {
@@ -10,7 +10,7 @@ dependencies {
1010
api("com.hexagontk.serialization:serialization_jackson_json:$hexagonVersion")
1111
api("org.cache2k:cache2k-core:$cache2kVersion")
1212

13-
jteGenerate("gg.jte:jte-native-resources:3.1.13")
13+
jteGenerate("gg.jte:jte-native-resources:3.2.1")
1414
}
1515

1616
tasks.register("minimizeTemplate") {

‎frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.jar‎

1.65 KB
Binary file not shown.

‎frameworks/Kotlin/hexagon/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.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎frameworks/Kotlin/hexagon/gradlew‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
118117

119118

120119
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
172171
# For Cygwin or MSYS, switch paths to Windows format before running java
173172
if "$cygwin" || "$msys" ; then
174173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176174

177175
JAVACMD=$( cygpath --unix "$JAVACMD" )
178176

@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
212210

213211
set -- \
214212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215-
-classpath "$CLASSPATH" \
216213
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217214
"$@"
218215

‎frameworks/Kotlin/hexagon/gradlew.bat‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=
7473

7574

7675
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7877

7978
:end
8079
@rem End local scope for the variables with windows NT shell

‎frameworks/Kotlin/hexagon/hexagon-helidon-native.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# BUILD
33
#
4-
FROM container-registry.oracle.com/graalvm/native-image:24-muslib-ol9 as build
4+
FROM container-registry.oracle.com/graalvm/native-image:25-muslib-ol10 as build
55
USER root
66
WORKDIR /hexagon
77

‎frameworks/Kotlin/hexagon/hexagon-helidon-pgclient.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# BUILD
33
#
4-
FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-24-cds-musl AS build
4+
FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-25-cds-musl AS build
55
USER root
66
WORKDIR /hexagon
77

@@ -12,7 +12,7 @@ RUN ./gradlew --quiet -x test installDist
1212
#
1313
# RUNTIME
1414
#
15-
FROM docker.io/bellsoft/liberica-runtime-container:jre-24-musl
15+
FROM docker.io/bellsoft/liberica-runtime-container:jre-25-cds-slim-musl
1616
ARG PROJECT=hexagon_helidon_pgclient
1717

1818
ENV POSTGRESQL_DB_HOST tfb-database

‎frameworks/Kotlin/hexagon/hexagon-helidon.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# BUILD
33
#
4-
FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-24-cds-musl AS build
4+
FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-25-cds-musl AS build
55
USER root
66
WORKDIR /hexagon
77

@@ -12,7 +12,7 @@ RUN ./gradlew --quiet -x test installDist
1212
#
1313
# RUNTIME
1414
#
15-
FROM docker.io/bellsoft/liberica-runtime-container:jre-24-musl
15+
FROM docker.io/bellsoft/liberica-runtime-container:jre-25-cds-slim-musl
1616
ARG PROJECT=hexagon_helidon_postgresql
1717

1818
ENV POSTGRESQL_DB_HOST tfb-database

‎frameworks/Kotlin/hexagon/hexagon-jdk-pgclient.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# BUILD
33
#
4-
FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-24-cds-musl AS build
4+
FROM docker.io/bellsoft/liberica-runtime-container:jdk-all-25-cds-musl AS build
55
USER root
66
WORKDIR /hexagon
77

@@ -12,7 +12,7 @@ RUN ./gradlew --quiet -x test installDist
1212
#
1313
# RUNTIME
1414
#
15-
FROM docker.io/bellsoft/liberica-runtime-container:jre-24-musl
15+
FROM docker.io/bellsoft/liberica-runtime-container:jre-25-cds-slim-musl
1616
ARG PROJECT=hexagon_jdk_pgclient
1717

1818
ENV POSTGRESQL_DB_HOST tfb-database

0 commit comments

Comments
 (0)