Use Java Platform for shared dependency constraints

This change uses the Java Platform functionality from Gradle to enable
shared dependency constraints across modules.

16 files changed, 26 insertions, 13 deletions

diff --git a/simulator/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/simulator/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
index e9fee735..8d6420be 100644
--- a/simulator/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
+++ b/simulator/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
@@ -28,7 +28,12 @@ plugins {
     `java-library`
     kotlin("jvm")
     id("org.jlleitschuh.gradle.ktlint")
-    id("dependency-conventions")
+}
+
+/* Project configuration */
+repositories {
+    mavenCentral()
+    jcenter()
 }
 
 java {
diff --git a/simulator/opendc-compute/opendc-compute-core/build.gradle.kts b/simulator/opendc-compute/opendc-compute-core/build.gradle.kts
index f3548b04..a1b6ec0f 100644
--- a/simulator/opendc-compute/opendc-compute-core/build.gradle.kts
+++ b/simulator/opendc-compute/opendc-compute-core/build.gradle.kts
@@ -28,6 +28,7 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api(project(":opendc-core"))
     api(project(":opendc-trace:opendc-trace-core"))
     implementation(project(":opendc-utils"))
diff --git a/simulator/opendc-compute/opendc-compute-simulator/build.gradle.kts b/simulator/opendc-compute/opendc-compute-simulator/build.gradle.kts
index 148578cb..f52d0f97 100644
--- a/simulator/opendc-compute/opendc-compute-simulator/build.gradle.kts
+++ b/simulator/opendc-compute/opendc-compute-simulator/build.gradle.kts
@@ -29,6 +29,7 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api(project(":opendc-compute:opendc-compute-core"))
     api(project(":opendc-simulator:opendc-simulator-compute"))
     api(project(":opendc-simulator:opendc-simulator-failures"))
diff --git a/simulator/opendc-core/build.gradle.kts b/simulator/opendc-core/build.gradle.kts
index e685eddc..7e1a4b97 100644
--- a/simulator/opendc-core/build.gradle.kts
+++ b/simulator/opendc-core/build.gradle.kts
@@ -28,5 +28,6 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 }
diff --git a/simulator/opendc-experiments/opendc-experiments-capelin/build.gradle.kts b/simulator/opendc-experiments/opendc-experiments-capelin/build.gradle.kts
index 041cf36a..636f291c 100644
--- a/simulator/opendc-experiments/opendc-experiments-capelin/build.gradle.kts
+++ b/simulator/opendc-experiments/opendc-experiments-capelin/build.gradle.kts
@@ -30,6 +30,7 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api(project(":opendc-core"))
     api(project(":opendc-harness"))
     implementation(project(":opendc-format"))
diff --git a/simulator/opendc-experiments/opendc-experiments-sc18/build.gradle.kts b/simulator/opendc-experiments/opendc-experiments-sc18/build.gradle.kts
index f4d947d8..00aa0395 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc18/build.gradle.kts
+++ b/simulator/opendc-experiments/opendc-experiments-sc18/build.gradle.kts
@@ -29,6 +29,7 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api(project(":opendc-core"))
     api(project(":opendc-harness"))
     implementation(project(":opendc-format"))
diff --git a/simulator/opendc-format/build.gradle.kts b/simulator/opendc-format/build.gradle.kts
index 1f6c28aa..cd26c077 100644
--- a/simulator/opendc-format/build.gradle.kts
+++ b/simulator/opendc-format/build.gradle.kts
@@ -29,6 +29,7 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api(project(":opendc-core"))
     api(project(":opendc-compute:opendc-compute-core"))
     api(project(":opendc-workflows"))
diff --git a/simulator/opendc-harness/build.gradle.kts b/simulator/opendc-harness/build.gradle.kts
index 132b9b3b..f980853c 100644
--- a/simulator/opendc-harness/build.gradle.kts
+++ b/simulator/opendc-harness/build.gradle.kts
@@ -29,6 +29,7 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
     api("org.junit.platform:junit-platform-commons:${versions.junitPlatform}")
 
diff --git a/simulator/buildSrc/src/main/kotlin/dependency-conventions.gradle.kts b/simulator/opendc-platform/build.gradle.kts
index ee9ea793..0ae1c72a 100644
--- a/simulator/buildSrc/src/main/kotlin/dependency-conventions.gradle.kts
+++ b/simulator/opendc-platform/build.gradle.kts
@@ -1,7 +1,3 @@
-import org.gradle.kotlin.dsl.`java-library`
-import org.gradle.kotlin.dsl.kotlin
-import org.gradle.kotlin.dsl.repositories
-
 /*
  * Copyright (c) 2021 AtLarge Research
  *
@@ -25,19 +21,17 @@ import org.gradle.kotlin.dsl.repositories
  */
 
 plugins {
-    `java-library`
+    `java-platform`
 }
 
-repositories {
-    mavenCentral()
-    jcenter()
-}
+description = "Java platform for the OpenDC project"
 
-/* Dependency constraints across modules */
 dependencies {
     constraints {
         api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlinxCoroutines}")
-        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${versions.kotlinxCoroutines}")
-        implementation("io.github.microutils:kotlin-logging:${versions.kotlinLogging}")
+        api("org.jetbrains.kotlinx:kotlinx-coroutines-test:${versions.kotlinxCoroutines}")
+
+        api("io.github.microutils:kotlin-logging:${versions.kotlinLogging}")
+        runtime("org.slf4j:slf4j-simple:${versions.slf4j}")
     }
 }
diff --git a/simulator/opendc-runner-web/build.gradle.kts b/simulator/opendc-runner-web/build.gradle.kts
index a9c679f6..d0b80cc7 100644
--- a/simulator/opendc-runner-web/build.gradle.kts
+++ b/simulator/opendc-runner-web/build.gradle.kts
@@ -33,6 +33,7 @@ application {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api(project(":opendc-core"))
     implementation(project(":opendc-compute:opendc-compute-simulator"))
     implementation(project(":opendc-format"))
diff --git a/simulator/opendc-simulator/opendc-simulator-compute/build.gradle.kts b/simulator/opendc-simulator/opendc-simulator-compute/build.gradle.kts
index 7354cad6..19af6fe8 100644
--- a/simulator/opendc-simulator/opendc-simulator-compute/build.gradle.kts
+++ b/simulator/opendc-simulator/opendc-simulator-compute/build.gradle.kts
@@ -28,6 +28,7 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api(project(":opendc-simulator:opendc-simulator-core"))
     implementation(project(":opendc-utils"))
 }
diff --git a/simulator/opendc-simulator/opendc-simulator-core/build.gradle.kts b/simulator/opendc-simulator/opendc-simulator-core/build.gradle.kts
index c2175043..309afb19 100644
--- a/simulator/opendc-simulator/opendc-simulator-core/build.gradle.kts
+++ b/simulator/opendc-simulator/opendc-simulator-core/build.gradle.kts
@@ -28,5 +28,6 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api("org.jetbrains.kotlinx:kotlinx-coroutines-test")
 }
diff --git a/simulator/opendc-simulator/opendc-simulator-failures/build.gradle.kts b/simulator/opendc-simulator/opendc-simulator-failures/build.gradle.kts
index 5220992d..0f6b2de2 100644
--- a/simulator/opendc-simulator/opendc-simulator-failures/build.gradle.kts
+++ b/simulator/opendc-simulator/opendc-simulator-failures/build.gradle.kts
@@ -27,5 +27,6 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 }
diff --git a/simulator/opendc-trace/opendc-trace-core/build.gradle.kts b/simulator/opendc-trace/opendc-trace-core/build.gradle.kts
index fd94d89d..3051f733 100644
--- a/simulator/opendc-trace/opendc-trace-core/build.gradle.kts
+++ b/simulator/opendc-trace/opendc-trace-core/build.gradle.kts
@@ -28,5 +28,6 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 }
diff --git a/simulator/opendc-utils/build.gradle.kts b/simulator/opendc-utils/build.gradle.kts
index 8f587939..48214665 100644
--- a/simulator/opendc-utils/build.gradle.kts
+++ b/simulator/opendc-utils/build.gradle.kts
@@ -29,6 +29,7 @@ plugins {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 
     testImplementation(project(":opendc-simulator:opendc-simulator-core"))
diff --git a/simulator/settings.gradle.kts b/simulator/settings.gradle.kts
index 59efacac..77d78318 100644
--- a/simulator/settings.gradle.kts
+++ b/simulator/settings.gradle.kts
@@ -21,6 +21,7 @@
  */
 rootProject.name = "opendc-simulator"
 
+include(":opendc-platform")
 include(":opendc-core")
 include(":opendc-compute:opendc-compute-core")
 include(":opendc-compute:opendc-compute-simulator")