Skip to content

Upgrade http4k to v6, JDK and Gradle #9661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Upgrade http4k to v6, JDK and Gradle #9661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f074d02
Update versions of gradle, http4k etc
daviddenton Apr 7, 2024
0a9b81c
Downgrade pgclient
daviddenton Apr 7, 2024
9449367
Upgrade all images and versions.
daviddenton Mar 12, 2025
4ddd476
Revert "Downgrade pgclient"
daviddenton Mar 12, 2025
4277a23
Revert "Update versions of gradle, http4k etc"
daviddenton Mar 12, 2025
3fb221c
Update versions of gradle, http4k etc
daviddenton Apr 7, 2024
13c57ba
Downgrade pgclient
daviddenton Apr 7, 2024
c19720f
Upgrade all images and versions.
daviddenton Mar 12, 2025
6cdc37d
Revert "Downgrade pgclient"
daviddenton Mar 12, 2025
1354eac
Revert "Update versions of gradle, http4k etc"
daviddenton Mar 12, 2025
04a7749
Merge remote-tracking branch 'origin/master'
daviddenton Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions frameworks/Kotlin/http4k/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}

Expand Down Expand Up @@ -40,10 +41,9 @@ allprojects {
}

tasks {
withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "21"
allWarningsAsErrors = true
withType<KotlinJvmCompile>().configureEach {
compilerOptions {
jvmTarget.set(JVM_21)
}
}

Expand Down
5 changes: 2 additions & 3 deletions frameworks/Kotlin/http4k/core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-apache-graalvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-apache.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-apache4.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-graalvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-helidon-graalvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-helidon-jdbc.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-helidon-pgclient.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-jetty.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-jetty11.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-jetty11loom-jdbc.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-jetty11loom-pgclient.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-jettyloom-jdbc.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-jettyloom-pgclient.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-netty.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-ratpack.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-sunhttploom.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k-undertow.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/http4k/http4k.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading