Move simulation kernels into topology entities

This change embeds simulation kernels into the entities and relations of
the topology.

1 files changed, 11 insertions, 14 deletions

diff --git a/opendc-core/build.gradle b/opendc-core/build.gradle
index f2999d82..bf71b63b 100644
--- a/opendc-core/build.gradle
+++ b/opendc-core/build.gradle
@@ -25,7 +25,6 @@
 /* Build configuration */
 buildscript {
 	ext.kotlin_version = '1.1.4-3'
-	ext.kotlin_version = '1.1.4'
 
 	repositories {
 		mavenCentral()
@@ -45,7 +44,13 @@ plugins {
 apply plugin: 'org.junit.platform.gradle.plugin'
 apply plugin: 'kotlin'
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+compileKotlin {
+	kotlinOptions {
+		jvmTarget = "1.8"
+	}
+}
+
+compileTestKotlin {
 	kotlinOptions {
 		jvmTarget = "1.8"
 	}
@@ -67,19 +72,11 @@ repositories {
 
 dependencies {
 	compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.18'
+	compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+	compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:0.18"
+	compile "io.github.microutils:kotlin-logging:1.4.6"
 
 	testCompile "org.junit.jupiter:junit-jupiter-api:5.0.0-RC3"
 	testRuntime "org.junit.jupiter:junit-jupiter-engine:5.0.0-RC3"
-	compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
-}
-compileKotlin {
-	kotlinOptions {
-		jvmTarget = "1.8"
-	}
-}
-compileTestKotlin {
-	kotlinOptions {
-		jvmTarget = "1.8"
-	}
+	testCompile "org.slf4j:slf4j-simple:1.7.25"
 }