diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2021-05-07 16:26:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 16:26:10 +0200 |
| commit | 6779f62e6f54b783da348dc1aba248656f7956f7 (patch) | |
| tree | 068a38613d29bdbd4fe39aee90fde86343c656f3 /opendc-experiments | |
| parent | d60e230c29beeeaa825987d5abf43c1e6f450dad (diff) | |
| parent | efea162372be99beb4de90929629c7ebccdb8d84 (diff) | |
build: Use Gradle version catalog
This pull request updates the Gradle build configuration to use the new version
catalog functionality, which allows us to store our dependency versions in a
centralized file located at `gradle/libs.versions.toml`.
Our previous approach stored the versions in `gradle.properties`.
The benefit of this approach however is that (1) it will be supported by
Gradle and (2) it allows us to access dependencies safely.
Diffstat (limited to 'opendc-experiments')
3 files changed, 13 insertions, 16 deletions
diff --git a/opendc-experiments/opendc-experiments-capelin/build.gradle.kts b/opendc-experiments/opendc-experiments-capelin/build.gradle.kts index ca4aa35f..7c7f0dad 100644 --- a/opendc-experiments/opendc-experiments-capelin/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-capelin/build.gradle.kts @@ -36,17 +36,16 @@ dependencies { implementation(projects.opendcSimulator.opendcSimulatorCompute) implementation(projects.opendcSimulator.opendcSimulatorFailures) implementation(projects.opendcCompute.opendcComputeSimulator) + implementation(projects.opendcTelemetry.opendcTelemetrySdk) - implementation("io.github.microutils:kotlin-logging") - implementation("com.typesafe:config") - implementation("me.tongfei:progressbar:${versions["progressbar"]}") - implementation("com.github.ajalt.clikt:clikt:${versions["clikt"]}") + implementation(libs.kotlin.logging) + implementation(libs.config) + implementation(libs.progressbar) + implementation(libs.clikt) - implementation("org.apache.parquet:parquet-avro:${versions["parquet-avro"]}") - implementation("org.apache.hadoop:hadoop-client:${versions["hadoop-client"]}") { + implementation(libs.parquet) + implementation(libs.hadoop.client) { exclude(group = "org.slf4j", module = "slf4j-log4j12") exclude(group = "log4j") } - - implementation(projects.opendcTelemetry.opendcTelemetrySdk) } diff --git a/opendc-experiments/opendc-experiments-energy21/build.gradle.kts b/opendc-experiments/opendc-experiments-energy21/build.gradle.kts index 64e52f88..bc05f09b 100644 --- a/opendc-experiments/opendc-experiments-energy21/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-energy21/build.gradle.kts @@ -38,11 +38,10 @@ dependencies { implementation(projects.opendcCompute.opendcComputeSimulator) implementation(projects.opendcExperiments.opendcExperimentsCapelin) implementation(projects.opendcTelemetry.opendcTelemetrySdk) - implementation("io.github.microutils:kotlin-logging") - implementation("com.typesafe:config") + implementation(libs.kotlin.logging) + implementation(libs.config) - implementation("org.apache.parquet:parquet-avro:${versions["parquet-avro"]}") - implementation("org.apache.hadoop:hadoop-client:${versions["hadoop-client"]}") { + implementation(libs.parquet) { exclude(group = "org.slf4j", module = "slf4j-log4j12") exclude(group = "log4j") } diff --git a/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts b/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts index c35070fe..bdb0d098 100644 --- a/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts @@ -35,11 +35,10 @@ dependencies { implementation(projects.opendcServerless.opendcServerlessService) implementation(projects.opendcServerless.opendcServerlessSimulator) implementation(projects.opendcTelemetry.opendcTelemetrySdk) - implementation("io.github.microutils:kotlin-logging") - implementation("com.typesafe:config") + implementation(libs.kotlin.logging) + implementation(libs.config) - implementation("org.apache.parquet:parquet-avro:${versions["parquet-avro"]}") - implementation("org.apache.hadoop:hadoop-client:${versions["hadoop-client"]}") { + implementation(libs.parquet) { exclude(group = "org.slf4j", module = "slf4j-log4j12") exclude(group = "log4j") } |