summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2022-04-05 13:45:36 +0200
committerGitHub <noreply@github.com>2022-04-05 13:45:36 +0200
commitaf87540d49d58c465f0847c016814d58cfeb44fc (patch)
tree2868d86b54fa123117fb8dca902c41d452b32c41
parent38769373c7e89783d33849283586bfa0b62e8251 (diff)
parentfc64f8c4a88851938df7194df8b30af027d0cd31 (diff)
merge: Update build and runtime dependencies (#68)
This pull request updates the build and runtime dependencies used by OpenDC to their latest version compatible with the project. ## Implementation Notes :hammer_and_pick: * Update to Gradle 7.4.2 * Update to Kotlin 1.6.20 * Update runtime dependency versions ## External Dependencies :four_leaf_clover: * Kotlin * Gradle * OpenTelemetry * kotlin-coroutines
-rw-r--r--buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts2
-rw-r--r--gradle/libs.versions.toml26
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin59536 -> 59821 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
4 files changed, 15 insertions, 15 deletions
diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
index a69836f7..20c379a2 100644
--- a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
@@ -40,6 +40,6 @@ java {
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = Libs.jvmTarget.toString()
- kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+ kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
kotlinOptions.freeCompilerArgs += "-Xjvm-default=all"
}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fbed7e7b..24d96b5a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,33 +1,33 @@
[versions]
-classgraph = "4.8.138"
-clikt = "3.3.0"
-config = "1.4.1"
+classgraph = "4.8.143"
+clikt = "3.4.0"
+config = "1.4.2"
commons-math3 = "3.6.1"
dokka = "1.6.10"
hadoop = "3.3.1"
-jackson = "2.13.1"
+jackson = "2.13.2"
jandex-gradle = "0.11.0"
jmh-gradle = "0.6.6"
jakarta-validation = "2.0.2"
junit-jupiter = "5.8.2"
junit-platform = "1.8.2"
-kotlin = "1.6.10"
+kotlin = "1.6.20"
kotlin-logging = "2.1.21"
-kotlinx-coroutines = "1.6.0"
+kotlinx-coroutines = "1.6.1"
ktlint-gradle = "10.2.1"
-log4j = "2.17.1"
+log4j = "2.17.2"
microprofile-openapi = "3.0"
-mockk = "1.12.2"
-opentelemetry-main = "1.11.0"
-opentelemetry-metrics = "1.11.0-alpha"
-opentelemetry-semconv = "1.11.0-alpha"
+mockk = "1.12.3"
+opentelemetry-main = "1.12.0"
+opentelemetry-metrics = "1.12.0-alpha"
+opentelemetry-semconv = "1.12.0-alpha"
parquet = "1.12.2"
progressbar = "0.9.2"
quarkus = "2.7.5.Final"
quarkus-junit5-mockk = "0.3.0"
-sentry = "5.5.2"
+sentry = "5.7.1"
shadow = "7.1.2"
-slf4j = "1.7.32"
+slf4j = "1.7.36"
[libraries]
# Kotlin
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f..41d9927a 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41dfb879..aa991fce 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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists