From f074d02a5caf412fc3edab2dce280c17a24180ad Mon Sep 17 00:00:00 2001 From: David Denton Date: Sun, 7 Apr 2024 17:02:57 +0100 Subject: [PATCH 01/10] Update versions of gradle, http4k etc --- frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts index e7926f6dc50..a1bffdcd7b1 100644 --- a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts +++ b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":core")) - api("io.vertx:vertx-pg-client:4.4.4") + api("io.vertx:vertx-pg-client:4.5.7") } From 0a9b81c4b4678c07c6fd2f7468af54b98ca81f76 Mon Sep 17 00:00:00 2001 From: David Denton Date: Sun, 7 Apr 2024 17:11:34 +0100 Subject: [PATCH 02/10] Downgrade pgclient --- frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts index a1bffdcd7b1..f7c14c6807f 100644 --- a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts +++ b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":core")) - api("io.vertx:vertx-pg-client:4.5.7") + api("io.vertx:vertx-pg-client:4.2.3") } From 9449367f875d23f122566ddebc4b6273e4b4d797 Mon Sep 17 00:00:00 2001 From: David Denton Date: Wed, 12 Mar 2025 22:41:19 +0000 Subject: [PATCH 03/10] Upgrade all images and versions. --- frameworks/Kotlin/http4k/build.gradle.kts | 16 ++++++++-------- frameworks/Kotlin/http4k/core/build.gradle.kts | 5 ++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../http4k/http4k-apache-graalvm.dockerfile | 2 +- .../Kotlin/http4k/http4k-apache.dockerfile | 2 +- .../Kotlin/http4k/http4k-apache4.dockerfile | 2 +- .../Kotlin/http4k/http4k-graalvm.dockerfile | 2 +- .../http4k/http4k-helidon-graalvm.dockerfile | 2 +- .../Kotlin/http4k/http4k-helidon-jdbc.dockerfile | 2 +- .../http4k/http4k-helidon-pgclient.dockerfile | 2 +- frameworks/Kotlin/http4k/http4k-jetty.dockerfile | 2 +- .../Kotlin/http4k/http4k-jetty11.dockerfile | 2 +- .../http4k/http4k-jetty11loom-jdbc.dockerfile | 2 +- .../http4k-jetty11loom-pgclient.dockerfile | 2 +- .../http4k/http4k-jettyloom-jdbc.dockerfile | 2 +- .../http4k/http4k-jettyloom-pgclient.dockerfile | 2 +- .../Kotlin/http4k/http4k-ktorcio.dockerfile | 2 +- .../Kotlin/http4k/http4k-ktornetty.dockerfile | 2 +- frameworks/Kotlin/http4k/http4k-netty.dockerfile | 2 +- .../Kotlin/http4k/http4k-ratpack.dockerfile | 2 +- .../Kotlin/http4k/http4k-sunhttploom.dockerfile | 2 +- .../Kotlin/http4k/http4k-undertow.dockerfile | 2 +- frameworks/Kotlin/http4k/http4k.dockerfile | 2 +- 23 files changed, 31 insertions(+), 32 deletions(-) diff --git a/frameworks/Kotlin/http4k/build.gradle.kts b/frameworks/Kotlin/http4k/build.gradle.kts index 37e2ce6aca6..b30048cb28c 100644 --- a/frameworks/Kotlin/http4k/build.gradle.kts +++ b/frameworks/Kotlin/http4k/build.gradle.kts @@ -1,10 +1,11 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import org.gradle.api.JavaVersion.* -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import org.jetbrains.kotlin.js.translate.context.Namer.kotlin +import org.gradle.api.JavaVersion.VERSION_21 +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21 +import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile plugins { - kotlin("jvm") version "1.9.23" + kotlin("jvm") version "2.1.10" application } @@ -40,10 +41,9 @@ allprojects { } tasks { - withType { - kotlinOptions { - jvmTarget = "21" - allWarningsAsErrors = true + withType().configureEach { + compilerOptions { + jvmTarget.set(JVM_21) } } diff --git a/frameworks/Kotlin/http4k/core/build.gradle.kts b/frameworks/Kotlin/http4k/core/build.gradle.kts index 9cd7e8f5269..baee2c95166 100644 --- a/frameworks/Kotlin/http4k/core/build.gradle.kts +++ b/frameworks/Kotlin/http4k/core/build.gradle.kts @@ -4,9 +4,8 @@ plugins { } dependencies { - api(platform("org.http4k:http4k-bom:5.14.4.0")) - api("org.jetbrains.kotlin:kotlin-stdlib:1.9.23") - api("org.jetbrains.kotlin:kotlin-reflect:1.9.23") + api(platform("org.http4k:http4k-bom:6.1.0.1")) + api("org.jetbrains.kotlin:kotlin-reflect:2.1.10") api("org.http4k:http4k-core") api("org.http4k:http4k-format-argo") api("org.http4k:http4k-template-rocker") diff --git a/frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties b/frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties index b82aa23a4f0..37f853b1c84 100644 --- a/frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties +++ b/frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/frameworks/Kotlin/http4k/http4k-apache-graalvm.dockerfile b/frameworks/Kotlin/http4k/http4k-apache-graalvm.dockerfile index 51132613c98..d1f1ecfe540 100644 --- a/frameworks/Kotlin/http4k/http4k-apache-graalvm.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-apache-graalvm.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 as gradle +FROM gradle:8.13.0-jdk21 as gradle USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-apache.dockerfile b/frameworks/Kotlin/http4k/http4k-apache.dockerfile index de62168324d..6db064aa004 100644 --- a/frameworks/Kotlin/http4k/http4k-apache.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-apache.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-apache4.dockerfile b/frameworks/Kotlin/http4k/http4k-apache4.dockerfile index 840bc34ca4a..8d72e06a922 100644 --- a/frameworks/Kotlin/http4k/http4k-apache4.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-apache4.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-graalvm.dockerfile b/frameworks/Kotlin/http4k/http4k-graalvm.dockerfile index e2688ac80a4..96c358e3f4e 100644 --- a/frameworks/Kotlin/http4k/http4k-graalvm.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-graalvm.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 as gradle +FROM gradle:8.13.0-jdk21 as gradle USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-helidon-graalvm.dockerfile b/frameworks/Kotlin/http4k/http4k-helidon-graalvm.dockerfile index 650f8dfc528..89cd5cbf5e7 100644 --- a/frameworks/Kotlin/http4k/http4k-helidon-graalvm.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-helidon-graalvm.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 as gradle +FROM gradle:8.13.0-jdk21 as gradle USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-helidon-jdbc.dockerfile b/frameworks/Kotlin/http4k/http4k-helidon-jdbc.dockerfile index f8a49b8b7dd..a5097ffcb50 100644 --- a/frameworks/Kotlin/http4k/http4k-helidon-jdbc.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-helidon-jdbc.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-helidon-pgclient.dockerfile b/frameworks/Kotlin/http4k/http4k-helidon-pgclient.dockerfile index 7e36fa04a8b..44baf3d123d 100644 --- a/frameworks/Kotlin/http4k/http4k-helidon-pgclient.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-helidon-pgclient.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jetty.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty.dockerfile index 674a7f34bba..03b4d90a470 100644 --- a/frameworks/Kotlin/http4k/http4k-jetty.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jetty.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jetty11.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty11.dockerfile index d9c785409f0..d3a82a61108 100644 --- a/frameworks/Kotlin/http4k/http4k-jetty11.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jetty11.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jetty11loom-jdbc.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty11loom-jdbc.dockerfile index d085a9b1913..f1a05191210 100644 --- a/frameworks/Kotlin/http4k/http4k-jetty11loom-jdbc.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jetty11loom-jdbc.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jetty11loom-pgclient.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty11loom-pgclient.dockerfile index d2cd8bc3c65..471cba3f62b 100644 --- a/frameworks/Kotlin/http4k/http4k-jetty11loom-pgclient.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jetty11loom-pgclient.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jettyloom-jdbc.dockerfile b/frameworks/Kotlin/http4k/http4k-jettyloom-jdbc.dockerfile index a3837e51fa6..baed4395a7d 100644 --- a/frameworks/Kotlin/http4k/http4k-jettyloom-jdbc.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jettyloom-jdbc.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jettyloom-pgclient.dockerfile b/frameworks/Kotlin/http4k/http4k-jettyloom-pgclient.dockerfile index 7259d27378a..f84e65c1c87 100644 --- a/frameworks/Kotlin/http4k/http4k-jettyloom-pgclient.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jettyloom-pgclient.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile b/frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile index ff2a0ed08b5..db7a10c4de9 100644 --- a/frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile b/frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile index ed9db5cdae8..4032da5a693 100644 --- a/frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-netty.dockerfile b/frameworks/Kotlin/http4k/http4k-netty.dockerfile index 37dea590804..76dd76e073e 100644 --- a/frameworks/Kotlin/http4k/http4k-netty.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-netty.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-ratpack.dockerfile b/frameworks/Kotlin/http4k/http4k-ratpack.dockerfile index 6e496eb8501..c271b258af8 100644 --- a/frameworks/Kotlin/http4k/http4k-ratpack.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-ratpack.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-sunhttploom.dockerfile b/frameworks/Kotlin/http4k/http4k-sunhttploom.dockerfile index 3fa136cb9fc..92dd9b39b3d 100644 --- a/frameworks/Kotlin/http4k/http4k-sunhttploom.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-sunhttploom.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-undertow.dockerfile b/frameworks/Kotlin/http4k/http4k-undertow.dockerfile index 3f0ab95fc50..10b7c29710c 100644 --- a/frameworks/Kotlin/http4k/http4k-undertow.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-undertow.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k.dockerfile b/frameworks/Kotlin/http4k/http4k.dockerfile index ec643dda001..19f3f4eccf2 100644 --- a/frameworks/Kotlin/http4k/http4k.dockerfile +++ b/frameworks/Kotlin/http4k/http4k.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts From 4ddd476ce67dac1ba87b9ab96a4affcf585b5554 Mon Sep 17 00:00:00 2001 From: David Denton Date: Wed, 12 Mar 2025 22:41:55 +0000 Subject: [PATCH 04/10] Revert "Downgrade pgclient" This reverts commit 0a9b81c4b4678c07c6fd2f7468af54b98ca81f76. --- frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts index f7c14c6807f..a1bffdcd7b1 100644 --- a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts +++ b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":core")) - api("io.vertx:vertx-pg-client:4.2.3") + api("io.vertx:vertx-pg-client:4.5.7") } From 4277a23d860062039ebc8024a9aff0ea4b179b6a Mon Sep 17 00:00:00 2001 From: David Denton Date: Wed, 12 Mar 2025 22:41:55 +0000 Subject: [PATCH 05/10] Revert "Update versions of gradle, http4k etc" This reverts commit f074d02a5caf412fc3edab2dce280c17a24180ad. --- frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts index a1bffdcd7b1..e7926f6dc50 100644 --- a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts +++ b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":core")) - api("io.vertx:vertx-pg-client:4.5.7") + api("io.vertx:vertx-pg-client:4.4.4") } From 3fb221c8202e4794d3ea135be5dad55633ef2a17 Mon Sep 17 00:00:00 2001 From: David Denton Date: Sun, 7 Apr 2024 17:02:57 +0100 Subject: [PATCH 06/10] Update versions of gradle, http4k etc --- frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts index e7926f6dc50..a1bffdcd7b1 100644 --- a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts +++ b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":core")) - api("io.vertx:vertx-pg-client:4.4.4") + api("io.vertx:vertx-pg-client:4.5.7") } From 13c57ba54c08df0b0f833d8ae1a8a34d85c17c5f Mon Sep 17 00:00:00 2001 From: David Denton Date: Sun, 7 Apr 2024 17:11:34 +0100 Subject: [PATCH 07/10] Downgrade pgclient --- frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts index a1bffdcd7b1..f7c14c6807f 100644 --- a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts +++ b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":core")) - api("io.vertx:vertx-pg-client:4.5.7") + api("io.vertx:vertx-pg-client:4.2.3") } From c19720f6609ba9a448c8a12fe9e14bcfe5cb527a Mon Sep 17 00:00:00 2001 From: David Denton Date: Wed, 12 Mar 2025 22:41:19 +0000 Subject: [PATCH 08/10] Upgrade all images and versions. --- frameworks/Kotlin/http4k/build.gradle.kts | 16 ++++++++-------- frameworks/Kotlin/http4k/core/build.gradle.kts | 5 ++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../http4k/http4k-apache-graalvm.dockerfile | 2 +- .../Kotlin/http4k/http4k-apache.dockerfile | 2 +- .../Kotlin/http4k/http4k-apache4.dockerfile | 2 +- .../Kotlin/http4k/http4k-graalvm.dockerfile | 2 +- .../http4k/http4k-helidon-graalvm.dockerfile | 2 +- .../Kotlin/http4k/http4k-helidon-jdbc.dockerfile | 2 +- .../http4k/http4k-helidon-pgclient.dockerfile | 2 +- frameworks/Kotlin/http4k/http4k-jetty.dockerfile | 2 +- .../Kotlin/http4k/http4k-jetty11.dockerfile | 2 +- .../http4k/http4k-jetty11loom-jdbc.dockerfile | 2 +- .../http4k-jetty11loom-pgclient.dockerfile | 2 +- .../http4k/http4k-jettyloom-jdbc.dockerfile | 2 +- .../http4k/http4k-jettyloom-pgclient.dockerfile | 2 +- .../Kotlin/http4k/http4k-ktorcio.dockerfile | 2 +- .../Kotlin/http4k/http4k-ktornetty.dockerfile | 2 +- frameworks/Kotlin/http4k/http4k-netty.dockerfile | 2 +- .../Kotlin/http4k/http4k-ratpack.dockerfile | 2 +- .../Kotlin/http4k/http4k-sunhttploom.dockerfile | 2 +- .../Kotlin/http4k/http4k-undertow.dockerfile | 2 +- frameworks/Kotlin/http4k/http4k.dockerfile | 2 +- 23 files changed, 31 insertions(+), 32 deletions(-) diff --git a/frameworks/Kotlin/http4k/build.gradle.kts b/frameworks/Kotlin/http4k/build.gradle.kts index 37e2ce6aca6..b30048cb28c 100644 --- a/frameworks/Kotlin/http4k/build.gradle.kts +++ b/frameworks/Kotlin/http4k/build.gradle.kts @@ -1,10 +1,11 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import org.gradle.api.JavaVersion.* -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import org.jetbrains.kotlin.js.translate.context.Namer.kotlin +import org.gradle.api.JavaVersion.VERSION_21 +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21 +import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile plugins { - kotlin("jvm") version "1.9.23" + kotlin("jvm") version "2.1.10" application } @@ -40,10 +41,9 @@ allprojects { } tasks { - withType { - kotlinOptions { - jvmTarget = "21" - allWarningsAsErrors = true + withType().configureEach { + compilerOptions { + jvmTarget.set(JVM_21) } } diff --git a/frameworks/Kotlin/http4k/core/build.gradle.kts b/frameworks/Kotlin/http4k/core/build.gradle.kts index 9cd7e8f5269..baee2c95166 100644 --- a/frameworks/Kotlin/http4k/core/build.gradle.kts +++ b/frameworks/Kotlin/http4k/core/build.gradle.kts @@ -4,9 +4,8 @@ plugins { } dependencies { - api(platform("org.http4k:http4k-bom:5.14.4.0")) - api("org.jetbrains.kotlin:kotlin-stdlib:1.9.23") - api("org.jetbrains.kotlin:kotlin-reflect:1.9.23") + api(platform("org.http4k:http4k-bom:6.1.0.1")) + api("org.jetbrains.kotlin:kotlin-reflect:2.1.10") api("org.http4k:http4k-core") api("org.http4k:http4k-format-argo") api("org.http4k:http4k-template-rocker") diff --git a/frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties b/frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties index b82aa23a4f0..37f853b1c84 100644 --- a/frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties +++ b/frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/frameworks/Kotlin/http4k/http4k-apache-graalvm.dockerfile b/frameworks/Kotlin/http4k/http4k-apache-graalvm.dockerfile index 51132613c98..d1f1ecfe540 100644 --- a/frameworks/Kotlin/http4k/http4k-apache-graalvm.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-apache-graalvm.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 as gradle +FROM gradle:8.13.0-jdk21 as gradle USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-apache.dockerfile b/frameworks/Kotlin/http4k/http4k-apache.dockerfile index de62168324d..6db064aa004 100644 --- a/frameworks/Kotlin/http4k/http4k-apache.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-apache.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-apache4.dockerfile b/frameworks/Kotlin/http4k/http4k-apache4.dockerfile index 840bc34ca4a..8d72e06a922 100644 --- a/frameworks/Kotlin/http4k/http4k-apache4.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-apache4.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-graalvm.dockerfile b/frameworks/Kotlin/http4k/http4k-graalvm.dockerfile index e2688ac80a4..96c358e3f4e 100644 --- a/frameworks/Kotlin/http4k/http4k-graalvm.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-graalvm.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 as gradle +FROM gradle:8.13.0-jdk21 as gradle USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-helidon-graalvm.dockerfile b/frameworks/Kotlin/http4k/http4k-helidon-graalvm.dockerfile index 650f8dfc528..89cd5cbf5e7 100644 --- a/frameworks/Kotlin/http4k/http4k-helidon-graalvm.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-helidon-graalvm.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 as gradle +FROM gradle:8.13.0-jdk21 as gradle USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-helidon-jdbc.dockerfile b/frameworks/Kotlin/http4k/http4k-helidon-jdbc.dockerfile index f8a49b8b7dd..a5097ffcb50 100644 --- a/frameworks/Kotlin/http4k/http4k-helidon-jdbc.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-helidon-jdbc.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-helidon-pgclient.dockerfile b/frameworks/Kotlin/http4k/http4k-helidon-pgclient.dockerfile index 7e36fa04a8b..44baf3d123d 100644 --- a/frameworks/Kotlin/http4k/http4k-helidon-pgclient.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-helidon-pgclient.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jetty.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty.dockerfile index 674a7f34bba..03b4d90a470 100644 --- a/frameworks/Kotlin/http4k/http4k-jetty.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jetty.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jetty11.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty11.dockerfile index d9c785409f0..d3a82a61108 100644 --- a/frameworks/Kotlin/http4k/http4k-jetty11.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jetty11.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jetty11loom-jdbc.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty11loom-jdbc.dockerfile index d085a9b1913..f1a05191210 100644 --- a/frameworks/Kotlin/http4k/http4k-jetty11loom-jdbc.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jetty11loom-jdbc.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jetty11loom-pgclient.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty11loom-pgclient.dockerfile index d2cd8bc3c65..471cba3f62b 100644 --- a/frameworks/Kotlin/http4k/http4k-jetty11loom-pgclient.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jetty11loom-pgclient.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jettyloom-jdbc.dockerfile b/frameworks/Kotlin/http4k/http4k-jettyloom-jdbc.dockerfile index a3837e51fa6..baed4395a7d 100644 --- a/frameworks/Kotlin/http4k/http4k-jettyloom-jdbc.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jettyloom-jdbc.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-jettyloom-pgclient.dockerfile b/frameworks/Kotlin/http4k/http4k-jettyloom-pgclient.dockerfile index 7259d27378a..f84e65c1c87 100644 --- a/frameworks/Kotlin/http4k/http4k-jettyloom-pgclient.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-jettyloom-pgclient.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile b/frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile index ff2a0ed08b5..db7a10c4de9 100644 --- a/frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile b/frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile index ed9db5cdae8..4032da5a693 100644 --- a/frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-netty.dockerfile b/frameworks/Kotlin/http4k/http4k-netty.dockerfile index 37dea590804..76dd76e073e 100644 --- a/frameworks/Kotlin/http4k/http4k-netty.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-netty.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-ratpack.dockerfile b/frameworks/Kotlin/http4k/http4k-ratpack.dockerfile index 6e496eb8501..c271b258af8 100644 --- a/frameworks/Kotlin/http4k/http4k-ratpack.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-ratpack.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-sunhttploom.dockerfile b/frameworks/Kotlin/http4k/http4k-sunhttploom.dockerfile index 3fa136cb9fc..92dd9b39b3d 100644 --- a/frameworks/Kotlin/http4k/http4k-sunhttploom.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-sunhttploom.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k-undertow.dockerfile b/frameworks/Kotlin/http4k/http4k-undertow.dockerfile index 3f0ab95fc50..10b7c29710c 100644 --- a/frameworks/Kotlin/http4k/http4k-undertow.dockerfile +++ b/frameworks/Kotlin/http4k/http4k-undertow.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts diff --git a/frameworks/Kotlin/http4k/http4k.dockerfile b/frameworks/Kotlin/http4k/http4k.dockerfile index ec643dda001..19f3f4eccf2 100644 --- a/frameworks/Kotlin/http4k/http4k.dockerfile +++ b/frameworks/Kotlin/http4k/http4k.dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.7.0-jdk21 +FROM gradle:8.13.0-jdk21 USER root WORKDIR /http4k COPY build.gradle.kts build.gradle.kts From 6cdc37d35511f098217f63a6715af5933085dd8b Mon Sep 17 00:00:00 2001 From: David Denton Date: Wed, 12 Mar 2025 22:41:55 +0000 Subject: [PATCH 09/10] Revert "Downgrade pgclient" This reverts commit 0a9b81c4b4678c07c6fd2f7468af54b98ca81f76. --- frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts index f7c14c6807f..a1bffdcd7b1 100644 --- a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts +++ b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":core")) - api("io.vertx:vertx-pg-client:4.2.3") + api("io.vertx:vertx-pg-client:4.5.7") } From 1354eacee1b20f4afb7b15ee638c2747a03e6aa4 Mon Sep 17 00:00:00 2001 From: David Denton Date: Wed, 12 Mar 2025 22:41:55 +0000 Subject: [PATCH 10/10] Revert "Update versions of gradle, http4k etc" This reverts commit f074d02a5caf412fc3edab2dce280c17a24180ad. --- frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts index a1bffdcd7b1..e7926f6dc50 100644 --- a/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts +++ b/frameworks/Kotlin/http4k/core-pgclient/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":core")) - api("io.vertx:vertx-pg-client:4.5.7") + api("io.vertx:vertx-pg-client:4.4.4") }