13 files changed, 7 insertions, 29 deletions
diff --git a/simulator/buildSrc/build.gradle.kts b/simulator/buildSrc/build.gradle.kts
index 6ed95c71..79ae0de9 100644
--- a/simulator/buildSrc/build.gradle.kts
+++ b/simulator/buildSrc/build.gradle.kts
@@ -40,7 +40,7 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin", version = "1.3.70"))
+    implementation(kotlin("gradle-plugin", version = "1.4.10"))
     implementation("org.jlleitschuh.gradle:ktlint-gradle:9.2.1")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.10.1")
 }
diff --git a/simulator/buildSrc/src/main/kotlin/library.kt b/simulator/buildSrc/src/main/kotlin/library.kt
index 1a3c30a6..af278a07 100644
--- a/simulator/buildSrc/src/main/kotlin/library.kt
+++ b/simulator/buildSrc/src/main/kotlin/library.kt
@@ -45,5 +45,5 @@ object Library {
     /**
      * Kotlin coroutines support
      */
-    val KOTLINX_COROUTINES = "1.3.7"
+    val KOTLINX_COROUTINES = "1.3.9"
 }
diff --git a/simulator/gradle/wrapper/gradle-wrapper.jar b/simulator/gradle/wrapper/gradle-wrapper.jar
index 62d4c053..e708b1c0 100644
--- a/simulator/gradle/wrapper/gradle-wrapper.jar
+++ b/simulator/gradle/wrapper/gradle-wrapper.jar
diff --git a/simulator/gradle/wrapper/gradle-wrapper.properties b/simulator/gradle/wrapper/gradle-wrapper.properties
index bb8b2fc2..12d38de6 100644
--- a/simulator/gradle/wrapper/gradle-wrapper.properties
+++ b/simulator/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/simulator/gradlew b/simulator/gradlew
index fbd7c515..4f906e0c 100755
--- a/simulator/gradlew
+++ b/simulator/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/simulator/gradlew.bat b/simulator/gradlew.bat
index 5093609d..107acd32 100644
--- a/simulator/gradlew.bat
+++ b/simulator/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/simulator/odcsim/odcsim-api/build.gradle.kts b/simulator/odcsim/odcsim-api/build.gradle.kts
index c8c6c90c..3ebe8dd7 100644
--- a/simulator/odcsim/odcsim-api/build.gradle.kts
+++ b/simulator/odcsim/odcsim-api/build.gradle.kts
@@ -30,7 +30,6 @@ plugins {
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
     api("org.slf4j:slf4j-api:${Library.SLF4J}")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Library.KOTLINX_COROUTINES}")
 
diff --git a/simulator/odcsim/odcsim-engine-omega/build.gradle.kts b/simulator/odcsim/odcsim-engine-omega/build.gradle.kts
index 98e2469e..f9c0b94f 100644
--- a/simulator/odcsim/odcsim-engine-omega/build.gradle.kts
+++ b/simulator/odcsim/odcsim-engine-omega/build.gradle.kts
@@ -37,7 +37,6 @@ repositories {
 dependencies {
     api(project(":odcsim:odcsim-api"))
 
-    implementation(kotlin("stdlib"))
     implementation("org.jetbrains:annotations:17.0.0")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:${Library.JUNIT_JUPITER}")
diff --git a/simulator/opendc/opendc-compute/build.gradle.kts b/simulator/opendc/opendc-compute/build.gradle.kts
index acdcd5a7..376c4269 100644
--- a/simulator/opendc/opendc-compute/build.gradle.kts
+++ b/simulator/opendc/opendc-compute/build.gradle.kts
@@ -30,7 +30,6 @@ plugins {
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
     api(project(":odcsim:odcsim-api"))
     api(project(":opendc:opendc-core"))
     implementation("io.github.microutils:kotlin-logging:1.7.9")
diff --git a/simulator/opendc/opendc-core/build.gradle.kts b/simulator/opendc/opendc-core/build.gradle.kts
index 5443f056..45c38ffd 100644
--- a/simulator/opendc/opendc-core/build.gradle.kts
+++ b/simulator/opendc/opendc-core/build.gradle.kts
@@ -30,7 +30,6 @@ plugins {
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
     api(project(":odcsim:odcsim-api"))
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:${Library.JUNIT_JUPITER}")
diff --git a/simulator/opendc/opendc-experiments-sc20/build.gradle.kts b/simulator/opendc/opendc-experiments-sc20/build.gradle.kts
index 46d99564..a66612e4 100644
--- a/simulator/opendc/opendc-experiments-sc20/build.gradle.kts
+++ b/simulator/opendc/opendc-experiments-sc20/build.gradle.kts
@@ -38,7 +38,6 @@ application {
 dependencies {
     api(project(":opendc:opendc-core"))
     implementation(project(":opendc:opendc-format"))
-    implementation(kotlin("stdlib"))
 
     implementation("com.github.ajalt:clikt:2.6.0")
     implementation("me.tongfei:progressbar:0.8.1")
diff --git a/simulator/opendc/opendc-format/build.gradle.kts b/simulator/opendc/opendc-format/build.gradle.kts
index 4414b638..4cccd302 100644
--- a/simulator/opendc/opendc-format/build.gradle.kts
+++ b/simulator/opendc/opendc-format/build.gradle.kts
@@ -34,7 +34,6 @@ dependencies {
     api(project(":opendc:opendc-compute"))
     api(project(":opendc:opendc-workflows"))
     api("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8")
-    implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:${Library.JUNIT_JUPITER}")
diff --git a/simulator/opendc/opendc-workflows/build.gradle.kts b/simulator/opendc/opendc-workflows/build.gradle.kts
index 7a5e2067..893c9020 100644
--- a/simulator/opendc/opendc-workflows/build.gradle.kts
+++ b/simulator/opendc/opendc-workflows/build.gradle.kts
@@ -32,7 +32,6 @@ plugins {
 dependencies {
     api(project(":opendc:opendc-core"))
     api(project(":opendc:opendc-compute"))
-    implementation(kotlin("stdlib"))
 
     testRuntimeOnly(project(":odcsim:odcsim-engine-omega"))
     testImplementation(project(":opendc:opendc-format"))