Upgrade all images and versions.

daviddenton · daviddenton · commit 9449367f875d · 2025-03-12T22:41:19.000Z
diff --git 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<KotlinCompile> {
-            kotlinOptions {
-                jvmTarget = "21"
-                allWarningsAsErrors = true
+        withType<KotlinJvmCompile>().configureEach {
+            compilerOptions {
+                jvmTarget.set(JVM_21)
             }
         }
 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM gradle:8.7.0-jdk21 as gradle`
	`1`	`+FROM gradle:8.13.0-jdk21 as gradle`
`2`	`2`	`USER root`
`3`	`3`	`WORKDIR /http4k`
`4`	`4`	`COPY build.gradle.kts build.gradle.kts`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM gradle:8.7.0-jdk21`
	`1`	`+FROM gradle:8.13.0-jdk21`
`2`	`2`	`USER root`
`3`	`3`	`WORKDIR /http4k`
`4`	`4`	`COPY build.gradle.kts build.gradle.kts`