summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2020-08-19 12:02:57 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2020-09-24 18:59:36 +0200
commitc0f9343293392c357d4a3d5ea889a25a91ea0123 (patch)
treeb644619ca159dc0ba85ef57788294c05f6f53976
parent6fdfaa20042bef01c34b2512345c54e097dfca3a (diff)
Update Kotlin to 1.4
This change updates the code base to use Kotlin 1.4 which promises better performance in IDEs and a new interference algorithm to solve more complex type checking cases. See https://kotlinlang.org/docs/reference/whatsnew14.html for more information.
-rw-r--r--simulator/buildSrc/build.gradle.kts2
-rw-r--r--simulator/buildSrc/src/main/kotlin/library.kt2
-rw-r--r--simulator/odcsim/odcsim-api/build.gradle.kts1
-rw-r--r--simulator/odcsim/odcsim-engine-omega/build.gradle.kts1
-rw-r--r--simulator/opendc/opendc-compute/build.gradle.kts1
-rw-r--r--simulator/opendc/opendc-core/build.gradle.kts1
-rw-r--r--simulator/opendc/opendc-experiments-sc20/build.gradle.kts1
-rw-r--r--simulator/opendc/opendc-format/build.gradle.kts1
-rw-r--r--simulator/opendc/opendc-workflows/build.gradle.kts1
9 files changed, 2 insertions, 9 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/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"))