From 513b56c53ec4e709973bc74762a918080525aa22 Mon Sep 17 00:00:00 2001 From: jaguililla Date: Tue, 15 Aug 2023 10:41:46 +0200 Subject: [PATCH 1/5] Set next release version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4802aab282..45cb000fa4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.warning.mode=all org.gradle.console=plain # Gradle -version=3.0.0 +version=3.0.1 group=com.hexagonkt description=The atoms of your platform From 8a83e484a0bdce292c4ffecfd7faf08832eb2af6 Mon Sep 17 00:00:00 2001 From: jaguililla Date: Wed, 16 Aug 2023 17:34:59 +0200 Subject: [PATCH 2/5] Update documentation and native image metadata --- build.gradle.kts | 8 ++------ gradle.properties | 2 +- http/http_client/build.gradle.kts | 3 +++ http/http_client_jetty/build.gradle.kts | 2 ++ http/http_client_jetty_ws/build.gradle.kts | 2 ++ http/http_handlers/build.gradle.kts | 2 ++ http/http_server/build.gradle.kts | 3 +++ http/http_server_jetty/build.gradle.kts | 2 ++ .../http_server_jetty/native-image.properties | 4 +++- .../http_server_jetty/native-image.properties | 1 - http/http_server_netty/build.gradle.kts | 2 ++ http/http_server_netty_epoll/build.gradle.kts | 2 ++ http/http_server_nima/build.gradle.kts | 2 ++ http/http_server_servlet/build.gradle.kts | 2 ++ http/rest/build.gradle.kts | 2 ++ http/rest_tools/build.gradle.kts | 2 +- http/web/build.gradle.kts | 2 ++ templates/templates/build.gradle.kts | 4 ++++ templates/templates_freemarker/build.gradle.kts | 2 ++ templates/templates_pebble/build.gradle.kts | 2 ++ templates/templates_rocker/build.gradle.kts | 2 ++ templates/templates_test/build.gradle.kts | 2 ++ 22 files changed, 45 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 139e44cdb9..6a797c06a8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -92,12 +92,8 @@ task("nativeTestModules") { { "minimum_version": "${sp.version}", "test_level": "fully-tested" - "metadata_locations": [ - "$spd" - ], - "tests_locations": [ - "$spd" - ], + "metadata_locations": [ "$spd" ], + "tests_locations": [ "$spd" ], } ] } diff --git a/gradle.properties b/gradle.properties index 45cb000fa4..a45fec6251 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,7 +33,7 @@ iconsDirectory=content # VERSIONS kotlinVersion=1.9.0 dokkaVersion=1.8.20 -mockkVersion=1.13.5 +mockkVersion=1.13.7 junitVersion=5.10.0 gatlingVersion=3.9.5 jmhVersion=1.37 diff --git a/http/http_client/build.gradle.kts b/http/http_client/build.gradle.kts index 0f640e42db..8bd6d6387b 100644 --- a/http/http_client/build.gradle.kts +++ b/http/http_client/build.gradle.kts @@ -9,6 +9,9 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = + "HTTP client supporting SSL, cookies, WebSockets, and HTTP/2. Requires an adapter to be used." + dependencies { "api"(project(":http:http_handlers")) } diff --git a/http/http_client_jetty/build.gradle.kts b/http/http_client_jetty/build.gradle.kts index 1bbb6c1153..5200fecad1 100644 --- a/http/http_client_jetty/build.gradle.kts +++ b/http/http_client_jetty/build.gradle.kts @@ -9,6 +9,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "HTTP client adapter for Jetty (without WebSockets support)." + dependencies { val jettyVersion = properties["jettyVersion"] diff --git a/http/http_client_jetty_ws/build.gradle.kts b/http/http_client_jetty_ws/build.gradle.kts index 52607a670a..9cd5f3916c 100644 --- a/http/http_client_jetty_ws/build.gradle.kts +++ b/http/http_client_jetty_ws/build.gradle.kts @@ -9,6 +9,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "HTTP client adapter for Jetty (with WebSockets support)." + dependencies { "api"(project(":http:http_client_jetty")) "api"("org.eclipse.jetty.websocket:jetty-websocket-jetty-client") diff --git a/http/http_handlers/build.gradle.kts b/http/http_handlers/build.gradle.kts index 4097f60f79..715270dfc4 100644 --- a/http/http_handlers/build.gradle.kts +++ b/http/http_handlers/build.gradle.kts @@ -9,6 +9,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "HTTP handlers used to apply many callbacks to HTTP calls." + dependencies { "api"(project(":http:http")) "api"(project(":handlers")) diff --git a/http/http_server/build.gradle.kts b/http/http_server/build.gradle.kts index 0f640e42db..250de2dea2 100644 --- a/http/http_server/build.gradle.kts +++ b/http/http_server/build.gradle.kts @@ -9,6 +9,9 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = + "HTTP server supporting SSL, cookies, WebSockets, and HTTP/2. Requires an adapter to be used." + dependencies { "api"(project(":http:http_handlers")) } diff --git a/http/http_server_jetty/build.gradle.kts b/http/http_server_jetty/build.gradle.kts index 56090e3af1..9845773bcd 100644 --- a/http/http_server_jetty/build.gradle.kts +++ b/http/http_server_jetty/build.gradle.kts @@ -9,6 +9,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "HTTP server adapter for Jetty (using Servlets under the hood)." + dependencies { val jettyVersion = properties["jettyVersion"] diff --git a/http/http_server_jetty/src/main/resources/META-INF/native-image/com.hexagonkt/http_server_jetty/native-image.properties b/http/http_server_jetty/src/main/resources/META-INF/native-image/com.hexagonkt/http_server_jetty/native-image.properties index ffaf60fa38..390b865288 100644 --- a/http/http_server_jetty/src/main/resources/META-INF/native-image/com.hexagonkt/http_server_jetty/native-image.properties +++ b/http/http_server_jetty/src/main/resources/META-INF/native-image/com.hexagonkt/http_server_jetty/native-image.properties @@ -1 +1,3 @@ -Args=--enable-preview +Args= \ + --enable-preview \ + -H:IncludeResources=.*\\.css diff --git a/http/http_server_jetty/src/test/resources/META-INF/native-image/com.hexagonkt/http_server_jetty/native-image.properties b/http/http_server_jetty/src/test/resources/META-INF/native-image/com.hexagonkt/http_server_jetty/native-image.properties index e2228cfc31..7a9b5c163c 100644 --- a/http/http_server_jetty/src/test/resources/META-INF/native-image/com.hexagonkt/http_server_jetty/native-image.properties +++ b/http/http_server_jetty/src/test/resources/META-INF/native-image/com.hexagonkt/http_server_jetty/native-image.properties @@ -1,5 +1,4 @@ Args= \ - -H:IncludeResources=.* \ --initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig \ --initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter \ --initialize-at-build-time=org.junit.jupiter.api.condition.OS \ diff --git a/http/http_server_netty/build.gradle.kts b/http/http_server_netty/build.gradle.kts index 2f7653810d..531d32d17b 100644 --- a/http/http_server_netty/build.gradle.kts +++ b/http/http_server_netty/build.gradle.kts @@ -9,6 +9,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "HTTP server adapter for Netty." + dependencies { val nettyVersion = properties["nettyVersion"] val nettyTcNativeVersion = properties["nettyTcNativeVersion"] diff --git a/http/http_server_netty_epoll/build.gradle.kts b/http/http_server_netty_epoll/build.gradle.kts index b04bbd8b48..c8baed8097 100644 --- a/http/http_server_netty_epoll/build.gradle.kts +++ b/http/http_server_netty_epoll/build.gradle.kts @@ -9,6 +9,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "HTTP server adapter for Netty (using Linux Epoll)." + dependencies { "api"(project(":http:http_server_netty")) "api"("io.netty:netty-transport-native-epoll") diff --git a/http/http_server_nima/build.gradle.kts b/http/http_server_nima/build.gradle.kts index ad3073e529..230b1592dd 100644 --- a/http/http_server_nima/build.gradle.kts +++ b/http/http_server_nima/build.gradle.kts @@ -9,6 +9,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "HTTP server adapter for Helidon Nima (using Java Virtual Threads)." + dependencies { val nimaVersion = properties["nimaVersion"] diff --git a/http/http_server_servlet/build.gradle.kts b/http/http_server_servlet/build.gradle.kts index 8724ca1072..25a92658f1 100644 --- a/http/http_server_servlet/build.gradle.kts +++ b/http/http_server_servlet/build.gradle.kts @@ -8,6 +8,8 @@ apply(from = "$rootDir/gradle/publish.gradle") apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "HTTP server adapter to be used on JEE Web Applications (deployed inside a server)." + dependencies { val servletVersion = properties["servletVersion"] val jettyVersion = properties["jettyVersion"] diff --git a/http/rest/build.gradle.kts b/http/rest/build.gradle.kts index 72ae8f5ff6..ccd8079c24 100644 --- a/http/rest/build.gradle.kts +++ b/http/rest/build.gradle.kts @@ -9,6 +9,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "HTTP server extensions to ease the development of REST APIs." + dependencies { "api"(project(":http:http_handlers")) "api"(project(":serialization:serialization")) diff --git a/http/rest_tools/build.gradle.kts b/http/rest_tools/build.gradle.kts index 4f50866539..01b13858e8 100644 --- a/http/rest_tools/build.gradle.kts +++ b/http/rest_tools/build.gradle.kts @@ -9,7 +9,7 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") -description = "Test cases for HTTP client and server adapters." +description = "Tools to test and document REST services." dependencies { val swaggerParserVersion = properties["swaggerParserVersion"] diff --git a/http/web/build.gradle.kts b/http/web/build.gradle.kts index 612b87e31b..b4885bdb4d 100644 --- a/http/web/build.gradle.kts +++ b/http/web/build.gradle.kts @@ -9,6 +9,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "HTTP server extensions to ease the development of dynamic Web applications." + dependencies { "api"(project(":http:http_server")) "api"(project(":templates:templates")) diff --git a/templates/templates/build.gradle.kts b/templates/templates/build.gradle.kts index c7d09fb372..5508d34505 100644 --- a/templates/templates/build.gradle.kts +++ b/templates/templates/build.gradle.kts @@ -9,6 +9,10 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = + "Template processing port. Supports template loading and context passing. " + + "Allow multiple adapters at once." + dependencies { "api"(project(":core")) diff --git a/templates/templates_freemarker/build.gradle.kts b/templates/templates_freemarker/build.gradle.kts index 828a384128..8c057fd65b 100644 --- a/templates/templates_freemarker/build.gradle.kts +++ b/templates/templates_freemarker/build.gradle.kts @@ -9,6 +9,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "Template processor adapter for Freemarker." + dependencies { "api"(project(":templates:templates")) "api"("org.freemarker:freemarker:${properties["freemarkerVersion"]}") diff --git a/templates/templates_pebble/build.gradle.kts b/templates/templates_pebble/build.gradle.kts index c40f206e7d..33e1e6b023 100644 --- a/templates/templates_pebble/build.gradle.kts +++ b/templates/templates_pebble/build.gradle.kts @@ -9,6 +9,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "Template processor adapter for Pebble." + dependencies { "api"(project(":templates:templates")) "api"("io.pebbletemplates:pebble:${properties["pebbleVersion"]}") diff --git a/templates/templates_rocker/build.gradle.kts b/templates/templates_rocker/build.gradle.kts index 665871f3b3..0a44af3fba 100644 --- a/templates/templates_rocker/build.gradle.kts +++ b/templates/templates_rocker/build.gradle.kts @@ -10,6 +10,8 @@ apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/native.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "Template processor adapter for Rocker. Don't support dynamic template loading." + dependencies { val rockerVersion = properties["rockerVersion"] diff --git a/templates/templates_test/build.gradle.kts b/templates/templates_test/build.gradle.kts index 87f88d09da..47b682c86d 100644 --- a/templates/templates_test/build.gradle.kts +++ b/templates/templates_test/build.gradle.kts @@ -8,6 +8,8 @@ apply(from = "$rootDir/gradle/publish.gradle") apply(from = "$rootDir/gradle/dokka.gradle") apply(from = "$rootDir/gradle/detekt.gradle") +description = "Test suite to verify template processing adapters." + dependencies { val junitVersion = properties["junitVersion"] From 26327b6b027a1c601b464859df40b4a2662c40af Mon Sep 17 00:00:00 2001 From: jaguililla Date: Wed, 16 Aug 2023 17:38:21 +0200 Subject: [PATCH 3/5] Update documentation and native image metadata --- build.gradle.kts | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6a797c06a8..4794c643ab 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -83,7 +83,16 @@ task("nativeTestModules") { val entries = subprojects .filter { sp -> sp.tasks.any { t -> t.name == "nativeTest" } } .joinToString(",\n") { sp -> - val spd = gitHub + sp.projectDir.absolutePath.removePrefix(rootDir.absolutePath) + val n = sp.name + val g = sp.group + val d = gitHub + sp.projectDir.absolutePath.removePrefix(rootDir.absolutePath) + val r = sp.projectDir.resolve("src/main/resources/META-INF/native-image/$g/$n") + val t = "$d/src/test" + val m = + if (r.exists()) + " \"$gitHub${r.absolutePath.removePrefix(rootDir.absolutePath)}\" " + else + "" """ { "artifact": "${sp.group}:${sp.name}", @@ -91,15 +100,18 @@ task("nativeTestModules") { "details": [ { "minimum_version": "${sp.version}", - "test_level": "fully-tested" - "metadata_locations": [ "$spd" ], - "tests_locations": [ "$spd" ], + "test_level": "fully-tested", + "metadata_locations": [$m], + "tests_locations": [ + "$t", + "https://github.com/hexagonkt/hexagon/actions/workflows/nightly.yml" + ] } ] } """.trimIndent() } - println(entries) + println("[\n$entries\n]") } } From 274cb52718075f68afab4130f4ceb7ab2a0f15b9 Mon Sep 17 00:00:00 2001 From: jaguililla Date: Wed, 16 Aug 2023 18:56:48 +0200 Subject: [PATCH 4/5] Update documentation and native image metadata --- build.gradle.kts | 53 +++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4794c643ab..380c82bba5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -88,28 +88,43 @@ task("nativeTestModules") { val d = gitHub + sp.projectDir.absolutePath.removePrefix(rootDir.absolutePath) val r = sp.projectDir.resolve("src/main/resources/META-INF/native-image/$g/$n") val t = "$d/src/test" - val m = - if (r.exists()) - " \"$gitHub${r.absolutePath.removePrefix(rootDir.absolutePath)}\" " - else - "" - """ - { - "artifact": "${sp.group}:${sp.name}", - "description": "${sp.description}", - "details": [ + if (r.exists()) + """ { - "minimum_version": "${sp.version}", - "test_level": "fully-tested", - "metadata_locations": [$m], - "tests_locations": [ - "$t", - "https://github.com/hexagonkt/hexagon/actions/workflows/nightly.yml" + "artifact": "${sp.group}:${sp.name}", + "description": "${sp.description}", + "details": [ + { + "minimum_version": "${sp.version}", + "test_level": "fully-tested", + "metadata_locations": [ + "$gitHub${r.absolutePath.removePrefix(rootDir.absolutePath)}" + ], + "tests_locations": [ + "$t", + "https://github.com/hexagonkt/hexagon/actions/workflows/nightly.yml" + ] + } ] } - ] - } - """.trimIndent() + """.trimIndent() + else + """ + { + "artifact": "${sp.group}:${sp.name}", + "description": "${sp.description}", + "details": [ + { + "minimum_version": "${sp.version}", + "test_level": "fully-tested", + "tests_locations": [ + "$t", + "https://github.com/hexagonkt/hexagon/actions/workflows/nightly.yml" + ] + } + ] + } + """.trimIndent() } println("[\n$entries\n]") } From a77d972b3afc4e4b05a49967515d6a3c617d00c1 Mon Sep 17 00:00:00 2001 From: jaguililla Date: Wed, 16 Aug 2023 19:07:58 +0200 Subject: [PATCH 5/5] Update documentation and native image metadata --- build.gradle.kts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 380c82bba5..dcf8131519 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -91,7 +91,7 @@ task("nativeTestModules") { if (r.exists()) """ { - "artifact": "${sp.group}:${sp.name}", + "artifact": "$g:$n", "description": "${sp.description}", "details": [ { @@ -111,7 +111,7 @@ task("nativeTestModules") { else """ { - "artifact": "${sp.group}:${sp.name}", + "artifact": "$g:$n", "description": "${sp.description}", "details": [ { @@ -126,6 +126,8 @@ task("nativeTestModules") { } """.trimIndent() } + .lines() + .joinToString("") { " $it\n" } println("[\n$entries\n]") } }