From 4a8b32d288ba3ee986ecef7933fa77554d34e762 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 4 May 2021 19:19:47 +0200
Subject: harness: Split harness into separate modules

This change splits the OpenDC Experiment Harness into separate modules.
This prevents users from pulling in unnecessary dependencies when
depending on the harness API.
---
 buildSrc/src/main/kotlin/experiment-conventions.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'buildSrc/src/main/kotlin/experiment-conventions.gradle.kts')

diff --git a/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts b/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts
index 4745ff1a..ae256a62 100644
--- a/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts
@@ -25,7 +25,8 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":opendc-harness"))
+    implementation(project(":opendc-harness:opendc-harness-engine"))
+    runtimeOnly(project(":opendc-harness:opendc-harness-junit5"))
 }
 
 tasks.register<Test>("experiment") {
-- 
cgit v1.2.3


From 54edc2d5e92d8c117e116a8c507442e49d17e24e Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 5 May 2021 11:55:30 +0200
Subject: exp: Include experiments in main distribution

This change updates the Gradle configuration to include experiments in
the main distribution of OpenDC. Users can directly execute the
experiments from the command-line without having to recompile the entire
code-base.
---
 .../main/kotlin/experiment-conventions.gradle.kts  | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'buildSrc/src/main/kotlin/experiment-conventions.gradle.kts')

diff --git a/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts b/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts
index ae256a62..580f67cb 100644
--- a/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts
@@ -1,3 +1,5 @@
+import gradle.kotlin.dsl.accessors._9bf86420fccbde1948375f641de89b70.sourceSets
+
 /*
  * Copyright (c) 2021 AtLarge Research
  *
@@ -22,10 +24,11 @@
 
 plugins {
     `java-library`
+    distribution
+    id("com.github.johnrengelman.shadow")
 }
 
 dependencies {
-    implementation(project(":opendc-harness:opendc-harness-engine"))
     runtimeOnly(project(":opendc-harness:opendc-harness-junit5"))
 }
 
@@ -39,3 +42,20 @@ tasks.register<Test>("experiment") {
     testClassesDirs = sourceSets["main"].output.classesDirs
     classpath = sourceSets["main"].runtimeClasspath
 }
+
+distributions {
+    create("experiment") {
+        contents {
+            from("README.md")
+            from(tasks.shadowJar.get())
+        }
+    }
+}
+
+tasks.shadowJar {
+    dependencies {
+        // Do not include the JUnit 5 runner in the final shadow jar, since it is only necessary for development
+        // inside IDE
+        exclude(project(":opendc-harness:opendc-harness-junit5"))
+    }
+}
-- 
cgit v1.2.3