From fb2672afb2d8236d5291cd028196c99d8e4d47f1 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Wed, 9 Nov 2022 21:59:07 +0000 Subject: refactor: Replace use of CoroutineContext by Dispatcher This change replaces the use of `CoroutineContext` for passing the `SimulationDispatcher` across the different modules of OpenDC by the lightweight `Dispatcher` interface of the OpenDC common module. --- gradle/libs.versions.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 033e8cfb..68f3119f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,6 +36,7 @@ kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", # Logging kotlin-logging = { module = "io.github.microutils:kotlin-logging", version.ref = "kotlin-logging" } +slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" } log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" } log4j-slf4j = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version.ref = "log4j" } -- cgit v1.2.3 From 83ad9c927952474f1adeb03bd67331288ed6d6d9 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sun, 13 Nov 2022 12:28:04 +0000 Subject: build: Make use of Gradle's Java Toolchains feature This change updates the build configuration for Gradle to make use of its Java Toolchains feature which enables running/testing multiple Java versions at the same time. This feature can also provision a Java installation if it is not available on the user's system. --- gradle/libs.versions.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 68f3119f..cdc7b835 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,6 +7,7 @@ gradle-node = "3.4.0" hadoop = "3.3.4" jackson = "2.13.4" jandex-gradle = "0.13.2" +java = "17" jline = "3.21.0" jmh-gradle = "0.6.8" jakarta-validation = "2.0.2" -- cgit v1.2.3 From e4da9ade0081d7011f3426762c943f508ecaff33 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sun, 13 Nov 2022 14:01:23 +0000 Subject: build: Update to Gradle 7.6-rc3 This change updates the Gradle wrapper version to 7.6-rc3 in order to support building the project with Java 19. --- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a..249e5832 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c684..8fab764a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- cgit v1.2.3 From 043a9a5fef06389a8b44257d4fcc29ee5f44157a Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sun, 13 Nov 2022 12:44:04 +0000 Subject: build: Update simulator dependencies This change updates the simulator dependencies to the latest available version where possible. --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cdc7b835..89de95b6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,9 +3,9 @@ calcite = "1.32.0" clikt = "3.5.0" commons-math3 = "3.6.1" dokka = "1.7.10" -gradle-node = "3.4.0" +gradle-node = "3.5.0" hadoop = "3.3.4" -jackson = "2.13.4" +jackson = "2.14.0" jandex-gradle = "0.13.2" java = "17" jline = "3.21.0" @@ -13,7 +13,7 @@ jmh-gradle = "0.6.8" jakarta-validation = "2.0.2" junit-jupiter = "5.9.1" kotlin = "1.7.20" -kotlin-logging = "3.0.0" +kotlin-logging = "3.0.4" kotlinx-coroutines = "1.6.4" log4j = "2.19.0" microprofile-openapi = "3.0" @@ -22,7 +22,7 @@ mockk = "1.13.2" node = "18.12.0" parquet = "1.12.3" progressbar = "0.9.3" -quarkus = "2.13.1.Final" +quarkus = "2.14.0.Final" quarkus-junit5-mockk = "1.1.1" sentry = "6.4.3" slf4j = "2.0.3" -- cgit v1.2.3