Merge branch 'feat/2.x-power-model' into '2.x'

Implement basic power usage model

See merge request opendc/opendc-simulator!36

2 files changed, 5 insertions, 4 deletions

diff --git a/buildSrc/src/main/kotlin/kotlin-library-convention.gradle.kts b/buildSrc/src/main/kotlin/kotlin-library-convention.gradle.kts
index 8b71ad91..c0c37a09 100644
--- a/buildSrc/src/main/kotlin/kotlin-library-convention.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-library-convention.gradle.kts
@@ -42,6 +42,7 @@ java {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
 }
 
 tasks.test {
diff --git a/buildSrc/src/main/kotlin/library.kt b/buildSrc/src/main/kotlin/library.kt
index 9532122d..6333e351 100644
--- a/buildSrc/src/main/kotlin/library.kt
+++ b/buildSrc/src/main/kotlin/library.kt
@@ -30,20 +30,20 @@ object Library {
     /**
      * The library for testing the projects.
      */
-    val JUNIT_JUPITER = "5.5.2"
+    val JUNIT_JUPITER = "5.6.0"
 
     /**
      * The library for hosting the tests.
      */
-    val JUNIT_PLATFORM = "1.5.2"
+    val JUNIT_PLATFORM = "1.6.0"
 
     /**
      * Logging facade.
      */
-    val SLF4J = "1.7.29"
+    val SLF4J = "1.7.30"
 
     /**
      * Kotlin coroutines support
      */
-    val KOTLINX_COROUTINES = "1.3.3"
+    val KOTLINX_COROUTINES = "1.3.4"
 }