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

Implement basic power usage model

See merge request opendc/opendc-simulator!36

3 files changed, 8 insertions, 7 deletions

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index c56e7e95..6ed95c71 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -40,7 +40,7 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin", "1.3.61"))
-    implementation("org.jlleitschuh.gradle:ktlint-gradle:9.1.1")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.10.0")
+    implementation(kotlin("gradle-plugin", version = "1.3.70"))
+    implementation("org.jlleitschuh.gradle:ktlint-gradle:9.2.1")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.10.1")
 }
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"
 }