commit f31bfba9f722ac1bf906dc126eae7120dc334531
parent 8f35abc23cd1cde7095bf8a55e77ee2bda7b4c79
Author: Antoine A <>
Date: Wed, 3 Sep 2025 14:06:56 +0200
common: update dependencies & clean ci
Diffstat:
10 files changed, 39 insertions(+), 53 deletions(-)
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
// This file is in the public domain.
plugins {
- id("org.jetbrains.kotlin.jvm") version "2.2.0"
+ id("org.jetbrains.kotlin.jvm") version "2.2.10"
id("org.jetbrains.dokka") version "2.0.0"
id("idea")
id("java-library")
@@ -18,7 +18,7 @@ if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)){
allprojects {
ext {
- set("kotlin_version", "2.2.0")
+ set("kotlin_version", "2.2.10")
set("ktor_version", "3.2.3")
set("clikt_version", "5.0.3")
set("coroutines_version", "1.10.2")
diff --git a/common/build.gradle b/common/build.gradle
@@ -47,11 +47,11 @@ compileKotlin {
dependencies {
implementation("org.slf4j:slf4j-api:2.0.17")
// Crypto
- implementation("org.bouncycastle:bcprov-jdk18on:1.80")
- implementation("org.bouncycastle:bcpkix-jdk18on:1.80")
+ implementation("org.bouncycastle:bcprov-jdk18on:1.81")
+ implementation("org.bouncycastle:bcpkix-jdk18on:1.81")
// Database helper
implementation("org.postgresql:postgresql:$postgres_version")
- implementation("com.zaxxer:HikariCP:6.3.0")
+ implementation("com.zaxxer:HikariCP:7.0.2")
implementation("io.ktor:ktor-server-core:$ktor_version")
implementation("io.ktor:ktor-server-call-logging:$ktor_version")
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile
@@ -1,15 +1,15 @@
FROM docker.io/library/debian:bookworm
-ENV DEBIAN_FRONTEND=noninteractive
-# Persistent gradle cache
-ENV GRADLE_USER_HOME=/workdir/.gradle
+ENV DEBIAN_FRONTEND=noninteractive \
+ # Persistent gradle cache
+ GRADLE_USER_HOME=/workdir/.gradle
RUN apt-get update -yqq && \
+ apt-get upgrade -yq && \
apt-get install -yqq \
unzip \
default-jdk-headless \
make \
- python3-distutils \
po-debconf \
build-essential \
debhelper-compat \
diff --git a/contrib/ci/jobs/1-build/build.sh b/contrib/ci/jobs/1-build/build.sh
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -exuo pipefail
-
-./bootstrap
-./configure --prefix=/usr
-make
diff --git a/contrib/ci/jobs/1-build/job.sh b/contrib/ci/jobs/1-build/job.sh
@@ -4,6 +4,6 @@ set -exuo pipefail
apt-get update -yq
apt-get upgrade -yq
-job_dir=$(dirname "${BASH_SOURCE[0]}")
-
-"${job_dir}"/build.sh
+./bootstrap
+./configure --prefix=/usr
+make
diff --git a/contrib/ci/jobs/2-test/job.sh b/contrib/ci/jobs/2-test/job.sh
@@ -1,6 +1,26 @@
#!/bin/bash
set -exuo pipefail
-job_dir=$(dirname "${BASH_SOURCE[0]}")
+# Update system
+apt-get update -yq
+apt-get upgrade -yq
-"${job_dir}"/test.sh
+# Build
+./bootstrap
+./configure --prefix /usr
+make build
+
+# Setup postgres cluster
+sudo -u postgres pg_ctlcluster 15 main start
+sudo -u postgres createuser root --superuser
+sudo -u postgres createdb -O root libeufincheck
+
+check_command()
+{
+ make check &> test-suite.log
+}
+
+if ! check_command ; then
+ cat test-suite.log
+ exit 1
+fi
+\ No newline at end of file
diff --git a/contrib/ci/jobs/2-test/test.sh b/contrib/ci/jobs/2-test/test.sh
@@ -1,23 +0,0 @@
-#!/bin/bash
-set -evu
-
-apt-get update
-apt-get upgrade -yqq
-
-./bootstrap
-./configure --prefix /usr
-make build
-
-sudo -u postgres pg_ctlcluster 15 main start
-sudo -u postgres createuser root --superuser
-sudo -u postgres createdb -O root libeufincheck
-
-check_command()
-{
- make check &> test-suite.log
-}
-
-if ! check_command ; then
- cat test-suite.log
- exit 1
-fi
diff --git a/contrib/ci/jobs/3-docs/docs.sh b/contrib/ci/jobs/3-docs/docs.sh
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -exuo pipefail
-
-./bootstrap
-./configure --prefix=/usr
-
-make doc
diff --git a/contrib/ci/jobs/3-docs/job.sh b/contrib/ci/jobs/3-docs/job.sh
@@ -1,6 +1,7 @@
#!/bin/bash
set -exuo pipefail
-job_dir=$(dirname "${BASH_SOURCE[0]}")
+./bootstrap
+./configure --prefix=/usr
-"${job_dir}"/docs.sh
+make doc
diff --git a/testbench/build.gradle b/testbench/build.gradle
@@ -24,7 +24,7 @@ dependencies {
implementation("com.github.ajalt.clikt:clikt:$clikt_version")
implementation("org.postgresql:postgresql:$postgres_version")
- implementation("org.jline:jline:3.30.4")
+ implementation("org.jline:jline:3.30.5")
implementation("io.ktor:ktor-server-test-host:$ktor_version")
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
implementation("org.jetbrains.kotlin:kotlin-test:$kotlin_version")
