diff options
26 files changed, 92 insertions, 94 deletions
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index 5337ee96..c9f9ab38 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -1,6 +1,4 @@ /* - * MIT License - * * Copyright (c) 2019 AtLarge Research * * Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/opendc-compute/opendc-compute-api/build.gradle.kts b/opendc-compute/opendc-compute-api/build.gradle.kts index 835dbbb8..880ee03d 100644 --- a/opendc-compute/opendc-compute-api/build.gradle.kts +++ b/opendc-compute/opendc-compute-api/build.gradle.kts @@ -28,5 +28,5 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) + api(platform(projects.opendcPlatform)) } diff --git a/opendc-compute/opendc-compute-service/build.gradle.kts b/opendc-compute/opendc-compute-service/build.gradle.kts index 909e2dcd..4e1be97a 100644 --- a/opendc-compute/opendc-compute-service/build.gradle.kts +++ b/opendc-compute/opendc-compute-service/build.gradle.kts @@ -30,12 +30,12 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-compute:opendc-compute-api")) - api(project(":opendc-telemetry:opendc-telemetry-api")) - implementation(project(":opendc-utils")) + api(platform(projects.opendcPlatform)) + api(projects.opendcCompute.opendcComputeApi) + api(projects.opendcTelemetry.opendcTelemetryApi) + implementation(projects.opendcUtils) implementation("io.github.microutils:kotlin-logging") - testImplementation(project(":opendc-simulator:opendc-simulator-core")) + testImplementation(projects.opendcSimulator.opendcSimulatorCore) testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl") } diff --git a/opendc-compute/opendc-compute-simulator/build.gradle.kts b/opendc-compute/opendc-compute-simulator/build.gradle.kts index 3bf8a114..0d0a57ad 100644 --- a/opendc-compute/opendc-compute-simulator/build.gradle.kts +++ b/opendc-compute/opendc-compute-simulator/build.gradle.kts @@ -30,14 +30,14 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-compute:opendc-compute-service")) - api(project(":opendc-simulator:opendc-simulator-compute")) - api(project(":opendc-simulator:opendc-simulator-failures")) - implementation(project(":opendc-utils")) + api(platform(projects.opendcPlatform)) + api(projects.opendcCompute.opendcComputeService) + api(projects.opendcSimulator.opendcSimulatorCompute) + api(projects.opendcSimulator.opendcSimulatorFailures) + implementation(projects.opendcUtils) implementation("io.github.microutils:kotlin-logging") - testImplementation(project(":opendc-simulator:opendc-simulator-core")) - testImplementation(project(":opendc-telemetry:opendc-telemetry-sdk")) + testImplementation(projects.opendcSimulator.opendcSimulatorCore) + testImplementation(projects.opendcTelemetry.opendcTelemetrySdk) testRuntimeOnly("org.slf4j:slf4j-simple:${versions.slf4j}") } diff --git a/opendc-experiments/opendc-experiments-capelin/build.gradle.kts b/opendc-experiments/opendc-experiments-capelin/build.gradle.kts index 06a35c4b..7f5f5a74 100644 --- a/opendc-experiments/opendc-experiments-capelin/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-capelin/build.gradle.kts @@ -30,13 +30,13 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-harness:opendc-harness-engine")) - implementation(project(":opendc-format")) - implementation(project(":opendc-simulator:opendc-simulator-core")) - implementation(project(":opendc-simulator:opendc-simulator-compute")) - implementation(project(":opendc-simulator:opendc-simulator-failures")) - implementation(project(":opendc-compute:opendc-compute-simulator")) + api(platform(projects.opendcPlatform)) + api(projects.opendcHarness.opendcHarnessApi) + implementation(projects.opendcFormat) + implementation(projects.opendcSimulator.opendcSimulatorCore) + implementation(projects.opendcSimulator.opendcSimulatorCompute) + implementation(projects.opendcSimulator.opendcSimulatorFailures) + implementation(projects.opendcCompute.opendcComputeSimulator) implementation("io.github.microutils:kotlin-logging") implementation("com.typesafe:config") @@ -49,5 +49,5 @@ dependencies { exclude(group = "log4j") } - implementation(project(":opendc-telemetry:opendc-telemetry-sdk")) + 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 fc37fc1c..1bebcea2 100644 --- a/opendc-experiments/opendc-experiments-energy21/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-energy21/build.gradle.kts @@ -30,14 +30,15 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-harness:opendc-harness-engine")) - implementation(project(":opendc-format")) - implementation(project(":opendc-simulator:opendc-simulator-core")) - implementation(project(":opendc-simulator:opendc-simulator-compute")) - implementation(project(":opendc-compute:opendc-compute-simulator")) - implementation(project(":opendc-experiments:opendc-experiments-capelin")) - implementation(project(":opendc-telemetry:opendc-telemetry-sdk")) + api(platform(projects.opendcPlatform)) + api(projects.opendcHarness.opendcHarnessApi) + implementation(projects.opendcFormat) + implementation(projects.opendcSimulator.opendcSimulatorCore) + implementation(projects.opendcSimulator.opendcSimulatorCompute) + implementation(projects.opendcSimulator.opendcSimulatorFailures) + implementation(projects.opendcCompute.opendcComputeSimulator) + implementation(projects.opendcExperiments.opendcExperimentsCapelin) + implementation(projects.opendcTelemetry.opendcTelemetrySdk) implementation("io.github.microutils:kotlin-logging") implementation("com.typesafe:config") diff --git a/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts b/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts index f19d6067..f58c0add 100644 --- a/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts @@ -30,12 +30,12 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-harness:opendc-harness-engine")) - implementation(project(":opendc-serverless:opendc-serverless-service")) - implementation(project(":opendc-serverless:opendc-serverless-simulator")) - implementation(project(":opendc-telemetry:opendc-telemetry-sdk")) - implementation(project(":opendc-harness:opendc-harness-cli")) + api(platform(projects.opendcPlatform)) + api(projects.opendcHarness.opendcHarnessApi) + implementation(projects.opendcSimulator.opendcSimulatorCore) + implementation(projects.opendcServerless.opendcServerlessService) + implementation(projects.opendcServerless.opendcServerlessSimulator) + implementation(projects.opendcTelemetry.opendcTelemetrySdk) implementation("io.github.microutils:kotlin-logging") implementation("com.typesafe:config") diff --git a/opendc-format/build.gradle.kts b/opendc-format/build.gradle.kts index ea43275a..cfe849e2 100644 --- a/opendc-format/build.gradle.kts +++ b/opendc-format/build.gradle.kts @@ -30,11 +30,11 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-compute:opendc-compute-api")) - api(project(":opendc-workflow:opendc-workflow-api")) - implementation(project(":opendc-simulator:opendc-simulator-compute")) - implementation(project(":opendc-compute:opendc-compute-simulator")) + api(platform(projects.opendcPlatform)) + api(projects.opendcCompute.opendcComputeApi) + api(projects.opendcWorkflow.opendcWorkflowApi) + implementation(projects.opendcSimulator.opendcSimulatorCompute) + implementation(projects.opendcCompute.opendcComputeSimulator) api("com.fasterxml.jackson.module:jackson-module-kotlin:${versions["jackson-module-kotlin"]}") implementation("org.apache.parquet:parquet-avro:${versions["parquet-avro"]}") diff --git a/opendc-harness/opendc-harness-api/build.gradle.kts b/opendc-harness/opendc-harness-api/build.gradle.kts index 67b1ce11..02adae9a 100644 --- a/opendc-harness/opendc-harness-api/build.gradle.kts +++ b/opendc-harness/opendc-harness-api/build.gradle.kts @@ -28,7 +28,7 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) + api(platform(projects.opendcPlatform)) api("org.junit.platform:junit-platform-commons:${versions.junitPlatform}") implementation("io.github.microutils:kotlin-logging") diff --git a/opendc-harness/opendc-harness-cli/build.gradle.kts b/opendc-harness/opendc-harness-cli/build.gradle.kts index 3e169e2a..699cc367 100644 --- a/opendc-harness/opendc-harness-cli/build.gradle.kts +++ b/opendc-harness/opendc-harness-cli/build.gradle.kts @@ -34,8 +34,8 @@ application { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-harness:opendc-harness-engine")) + api(platform(projects.opendcPlatform)) + api(projects.opendcHarness.opendcHarnessEngine) implementation("io.github.microutils:kotlin-logging") implementation("com.github.ajalt.clikt:clikt:${versions["clikt"]}") diff --git a/opendc-harness/opendc-harness-engine/build.gradle.kts b/opendc-harness/opendc-harness-engine/build.gradle.kts index bffafdac..6b59cbed 100644 --- a/opendc-harness/opendc-harness-engine/build.gradle.kts +++ b/opendc-harness/opendc-harness-engine/build.gradle.kts @@ -30,8 +30,8 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-harness:opendc-harness-api")) + api(platform(projects.opendcPlatform)) + api(projects.opendcHarness.opendcHarnessApi) api("org.jetbrains.kotlinx:kotlinx-coroutines-core") implementation("io.github.classgraph:classgraph:${versions["classgraph"]}") diff --git a/opendc-harness/opendc-harness-junit5/build.gradle.kts b/opendc-harness/opendc-harness-junit5/build.gradle.kts index aa0b78d5..ba0f323f 100644 --- a/opendc-harness/opendc-harness-junit5/build.gradle.kts +++ b/opendc-harness/opendc-harness-junit5/build.gradle.kts @@ -28,8 +28,8 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-harness:opendc-harness-engine")) + api(platform(projects.opendcPlatform)) + api(projects.opendcHarness.opendcHarnessEngine) implementation("io.github.microutils:kotlin-logging") implementation("org.junit.platform:junit-platform-engine:${versions.junitPlatform}") diff --git a/opendc-serverless/opendc-serverless-api/build.gradle.kts b/opendc-serverless/opendc-serverless-api/build.gradle.kts index ec33ccce..0d9a8036 100644 --- a/opendc-serverless/opendc-serverless-api/build.gradle.kts +++ b/opendc-serverless/opendc-serverless-api/build.gradle.kts @@ -28,5 +28,5 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) + api(platform(projects.opendcPlatform)) } diff --git a/opendc-serverless/opendc-serverless-service/build.gradle.kts b/opendc-serverless/opendc-serverless-service/build.gradle.kts index f7e43aba..9aae05fc 100644 --- a/opendc-serverless/opendc-serverless-service/build.gradle.kts +++ b/opendc-serverless/opendc-serverless-service/build.gradle.kts @@ -30,12 +30,12 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-serverless:opendc-serverless-api")) - api(project(":opendc-telemetry:opendc-telemetry-api")) - implementation(project(":opendc-utils")) + api(platform(projects.opendcPlatform)) + api(projects.opendcServerless.opendcServerlessApi) + api(projects.opendcTelemetry.opendcTelemetryApi) + implementation(projects.opendcUtils) implementation("io.github.microutils:kotlin-logging") - testImplementation(project(":opendc-simulator:opendc-simulator-core")) + testImplementation(projects.opendcSimulator.opendcSimulatorCore) testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl") } diff --git a/opendc-serverless/opendc-serverless-simulator/build.gradle.kts b/opendc-serverless/opendc-serverless-simulator/build.gradle.kts index fe3dca41..08014fce 100644 --- a/opendc-serverless/opendc-serverless-simulator/build.gradle.kts +++ b/opendc-serverless/opendc-serverless-simulator/build.gradle.kts @@ -30,10 +30,10 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-serverless:opendc-serverless-service")) - api(project(":opendc-simulator:opendc-simulator-compute")) + api(platform(projects.opendcPlatform)) + api(projects.opendcServerless.opendcServerlessService) + api(projects.opendcSimulator.opendcSimulatorCompute) - testImplementation(project(":opendc-simulator:opendc-simulator-core")) + testImplementation(projects.opendcSimulator.opendcSimulatorCore) testRuntimeOnly("org.slf4j:slf4j-simple:${versions.slf4j}") } diff --git a/opendc-simulator/opendc-simulator-compute/build.gradle.kts b/opendc-simulator/opendc-simulator-compute/build.gradle.kts index 4b0069e3..a7d396c7 100644 --- a/opendc-simulator/opendc-simulator-compute/build.gradle.kts +++ b/opendc-simulator/opendc-simulator-compute/build.gradle.kts @@ -30,9 +30,9 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-simulator:opendc-simulator-core")) - api(project(":opendc-simulator:opendc-simulator-resources")) - implementation(project(":opendc-utils")) + api(platform(projects.opendcPlatform)) + api(projects.opendcSimulator.opendcSimulatorResources) + implementation(projects.opendcSimulator.opendcSimulatorCore) + implementation(projects.opendcUtils) implementation("org.yaml:snakeyaml:1.28") } diff --git a/opendc-simulator/opendc-simulator-core/build.gradle.kts b/opendc-simulator/opendc-simulator-core/build.gradle.kts index 3ba0d8c3..485bf5a6 100644 --- a/opendc-simulator/opendc-simulator-core/build.gradle.kts +++ b/opendc-simulator/opendc-simulator-core/build.gradle.kts @@ -28,6 +28,6 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) + api(platform(projects.opendcPlatform)) api("org.jetbrains.kotlinx:kotlinx-coroutines-core") } diff --git a/opendc-simulator/opendc-simulator-failures/build.gradle.kts b/opendc-simulator/opendc-simulator-failures/build.gradle.kts index 0f6b2de2..6c266d23 100644 --- a/opendc-simulator/opendc-simulator-failures/build.gradle.kts +++ b/opendc-simulator/opendc-simulator-failures/build.gradle.kts @@ -27,6 +27,6 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) + api(platform(projects.opendcPlatform)) api("org.jetbrains.kotlinx:kotlinx-coroutines-core") } diff --git a/opendc-simulator/opendc-simulator-resources/build.gradle.kts b/opendc-simulator/opendc-simulator-resources/build.gradle.kts index 3b0a197c..08e0bc78 100644 --- a/opendc-simulator/opendc-simulator-resources/build.gradle.kts +++ b/opendc-simulator/opendc-simulator-resources/build.gradle.kts @@ -30,10 +30,10 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) + api(platform(projects.opendcPlatform)) api("org.jetbrains.kotlinx:kotlinx-coroutines-core") - implementation(project(":opendc-utils")) + implementation(projects.opendcUtils) - jmhImplementation(project(":opendc-simulator:opendc-simulator-core")) - testImplementation(project(":opendc-simulator:opendc-simulator-core")) + jmhImplementation(projects.opendcSimulator.opendcSimulatorCore) + testImplementation(projects.opendcSimulator.opendcSimulatorCore) } diff --git a/opendc-telemetry/opendc-telemetry-api/build.gradle.kts b/opendc-telemetry/opendc-telemetry-api/build.gradle.kts index d9a4b4dd..927e9bc5 100644 --- a/opendc-telemetry/opendc-telemetry-api/build.gradle.kts +++ b/opendc-telemetry/opendc-telemetry-api/build.gradle.kts @@ -28,7 +28,7 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) + api(platform(projects.opendcPlatform)) api("io.opentelemetry:opentelemetry-api:${versions.otelApi}") api("io.opentelemetry:opentelemetry-api-metrics:${versions.otelApiMetrics}") } diff --git a/opendc-telemetry/opendc-telemetry-sdk/build.gradle.kts b/opendc-telemetry/opendc-telemetry-sdk/build.gradle.kts index 350a0f74..b845c1c9 100644 --- a/opendc-telemetry/opendc-telemetry-sdk/build.gradle.kts +++ b/opendc-telemetry/opendc-telemetry-sdk/build.gradle.kts @@ -28,8 +28,8 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-telemetry:opendc-telemetry-api")) + api(platform(projects.opendcPlatform)) + api(projects.opendcTelemetry.opendcTelemetryApi) api("org.jetbrains.kotlinx:kotlinx-coroutines-core") api("io.opentelemetry:opentelemetry-sdk:${versions.otelSdk}") api("io.opentelemetry:opentelemetry-sdk-metrics:${versions.otelSdkMetrics}") diff --git a/opendc-utils/build.gradle.kts b/opendc-utils/build.gradle.kts index 48214665..9f712b89 100644 --- a/opendc-utils/build.gradle.kts +++ b/opendc-utils/build.gradle.kts @@ -29,8 +29,8 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) + api(platform(projects.opendcPlatform)) api("org.jetbrains.kotlinx:kotlinx-coroutines-core") - testImplementation(project(":opendc-simulator:opendc-simulator-core")) + testImplementation(projects.opendcSimulator.opendcSimulatorCore) } diff --git a/opendc-web/opendc-web-runner/build.gradle.kts b/opendc-web/opendc-web-runner/build.gradle.kts index fcc78a83..2981ddc7 100644 --- a/opendc-web/opendc-web-runner/build.gradle.kts +++ b/opendc-web/opendc-web-runner/build.gradle.kts @@ -33,12 +33,12 @@ application { } dependencies { - api(platform(project(":opendc-platform"))) - implementation(project(":opendc-compute:opendc-compute-simulator")) - implementation(project(":opendc-format")) - implementation(project(":opendc-experiments:opendc-experiments-capelin")) - implementation(project(":opendc-simulator:opendc-simulator-core")) - implementation(project(":opendc-simulator:opendc-simulator-compute")) + api(platform(projects.opendcPlatform)) + implementation(projects.opendcCompute.opendcComputeSimulator) + implementation(projects.opendcFormat) + implementation(projects.opendcExperiments.opendcExperimentsCapelin) + implementation(projects.opendcSimulator.opendcSimulatorCore) + implementation(projects.opendcTelemetry.opendcTelemetrySdk) implementation("io.github.microutils:kotlin-logging") implementation("com.github.ajalt.clikt:clikt:${versions["clikt"]}") @@ -48,6 +48,4 @@ dependencies { runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}") runtimeOnly("org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}") - - implementation(project(":opendc-telemetry:opendc-telemetry-sdk")) } diff --git a/opendc-workflow/opendc-workflow-api/build.gradle.kts b/opendc-workflow/opendc-workflow-api/build.gradle.kts index d3e67bee..45657d27 100644 --- a/opendc-workflow/opendc-workflow-api/build.gradle.kts +++ b/opendc-workflow/opendc-workflow-api/build.gradle.kts @@ -28,8 +28,7 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-compute:opendc-compute-api")) - implementation(project(":opendc-utils")) + api(platform(projects.opendcPlatform)) + api(projects.opendcCompute.opendcComputeApi) implementation("io.github.microutils:kotlin-logging") } diff --git a/opendc-workflow/opendc-workflow-service/build.gradle.kts b/opendc-workflow/opendc-workflow-service/build.gradle.kts index 040a9ff6..8cc66e4c 100644 --- a/opendc-workflow/opendc-workflow-service/build.gradle.kts +++ b/opendc-workflow/opendc-workflow-service/build.gradle.kts @@ -30,17 +30,17 @@ plugins { } dependencies { - api(platform(project(":opendc-platform"))) - api(project(":opendc-workflow:opendc-workflow-api")) - api(project(":opendc-compute:opendc-compute-api")) - api(project(":opendc-telemetry:opendc-telemetry-api")) - implementation(project(":opendc-utils")) + api(platform(projects.opendcPlatform)) + api(projects.opendcWorkflow.opendcWorkflowApi) + api(projects.opendcCompute.opendcComputeApi) + api(projects.opendcTelemetry.opendcTelemetryApi) + implementation(projects.opendcUtils) implementation("io.github.microutils:kotlin-logging") - testImplementation(project(":opendc-simulator:opendc-simulator-core")) - testImplementation(project(":opendc-compute:opendc-compute-simulator")) - testImplementation(project(":opendc-format")) - testImplementation(project(":opendc-telemetry:opendc-telemetry-sdk")) + testImplementation(projects.opendcSimulator.opendcSimulatorCore) + testImplementation(projects.opendcCompute.opendcComputeSimulator) + testImplementation(projects.opendcFormat) + testImplementation(projects.opendcTelemetry.opendcTelemetrySdk) testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:${versions["jackson-module-kotlin"]}") testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl") } diff --git a/settings.gradle.kts b/settings.gradle.kts index 1372f0dc..844c98e7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -48,3 +48,5 @@ include(":opendc-harness:opendc-harness-engine") include(":opendc-harness:opendc-harness-cli") include(":opendc-harness:opendc-harness-junit5") include(":opendc-utils") + +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") |