From a859085518aad4f4198900db21f97c9bd9e5c3da Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sat, 25 Mar 2023 21:03:38 +0000 Subject: build: Upgrade to Gradle 8.0 This change updates the Gradle wrapper to version 8.0. See https://docs.gradle.org/8.0.2/release-notes.html. --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33c..42defcc9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- cgit v1.2.3 From 9dee97a3675d6787db934846cfe338c0c4f81056 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sat, 25 Mar 2023 21:04:23 +0000 Subject: build: Update simulator dependencies This change updates the simulator dependencies to the latest available version where possible. --- gradle/libs.versions.toml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2581f1ca..cff1c330 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,31 +1,31 @@ [versions] -calcite = "1.32.0" -clikt = "3.5.0" +calcite = "1.34.0" +clikt = "3.5.2" commons-math3 = "3.6.1" -dokka = "1.7.10" -gradle-node = "3.5.0" -hadoop = "3.3.4" -hypersistence-utils = "3.0.1" -jackson = "2.14.0" -jandex-gradle = "1.0.0" +dokka = "1.8.10" +gradle-node = "3.5.1" +hadoop = "3.3.5" +hypersistence-utils = "3.2.0" +jackson = "2.14.2" +jandex-gradle = "1.1.0" java = "17" -jline = "3.21.0" -jmh-gradle = "0.6.8" +jline = "3.23.0" +jmh-gradle = "0.7.0" jakarta-validation = "2.0.2" junit-jupiter = "5.9.1" -kotlin = "1.7.20" -kotlin-logging = "3.0.4" +kotlin = "1.8.10" +kotlin-logging = "3.0.5" kotlinx-coroutines = "1.6.4" -log4j = "2.19.0" +log4j = "2.20.0" microprofile-openapi = "3.0" microprofile-config = "3.0.1" -mockk = "1.13.2" -node = "18.12.0" +mockk = "1.13.4" +node = "18.15.0" parquet = "1.12.3" -progressbar = "0.9.3" -quarkus = "2.16.1.Final" -sentry = "6.8.0" -slf4j = "2.0.4" +progressbar = "0.9.5" +quarkus = "2.16.5.Final" +sentry = "6.16.0" +slf4j = "2.0.7" spotless = "6.12.0" [libraries] -- cgit v1.2.3 From a94610b3954cb2368fff789db668129d6ae6a339 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sat, 25 Mar 2023 21:06:13 +0000 Subject: ci: Test OpenDC on Java 20 This change updates the CI pipeline so that Java 20 is being tested with the latest Gradle RC, since Gradle 8.0 does not support it yet. --- .github/workflows/test-gradle-rc.yml | 2 +- .github/workflows/test-java-ea.yml | 2 +- opendc-web/opendc-web-runner/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-gradle-rc.yml b/.github/workflows/test-gradle-rc.yml index a3513bfa..c6aa6784 100644 --- a/.github/workflows/test-gradle-rc.yml +++ b/.github/workflows/test-gradle-rc.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 19 + java-version: 20 - uses: gradle/gradle-build-action@v2 with: cache-disabled: true diff --git a/.github/workflows/test-java-ea.yml b/.github/workflows/test-java-ea.yml index 40927ffc..7dc2671f 100644 --- a/.github/workflows/test-java-ea.yml +++ b/.github/workflows/test-java-ea.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 20-ea + java-version: 21-ea - uses: gradle/gradle-build-action@v2 with: cache-disabled: true diff --git a/opendc-web/opendc-web-runner/Dockerfile b/opendc-web/opendc-web-runner/Dockerfile index 5dcc3b9c..3f393055 100644 --- a/opendc-web/opendc-web-runner/Dockerfile +++ b/opendc-web/opendc-web-runner/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:18-slim +FROM openjdk:17-slim MAINTAINER OpenDC Maintainers # Obtain (cache) Gradle wrapper -- cgit v1.2.3