From 6417003054393807280f7b0aab16f0455ddec2cf Mon Sep 17 00:00:00 2001
From: Fernando Freire <dogonthehorizon@gmail.com>
Date: Tue, 13 Oct 2020 13:16:23 -0700
Subject: [PATCH] chore(kotlin): move to new kotlin version and upgrade kork
 (#981)

---
 build.gradle                           |  3 ++-
 front50-api-tck/front50-api-tck.gradle |  7 -------
 gradle.properties                      |  3 ++-
 gradle/kotlin.gradle                   | 21 +++++++++++++++++++--
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4b1adabef..5dd25861b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,8 @@
 
 plugins {
   id 'io.spinnaker.project' version "$spinnakerGradleVersion" apply false
-  id 'nebula.kotlin' version '1.3.70' apply false
+  id "org.jetbrains.kotlin.jvm" version "$kotlinVersion" apply false
+  id "org.jetbrains.kotlin.plugin.allopen" version "$kotlinVersion" apply false
 }
 
 subprojects { project ->
diff --git a/front50-api-tck/front50-api-tck.gradle b/front50-api-tck/front50-api-tck.gradle
index be93691f9..982b07fe8 100644
--- a/front50-api-tck/front50-api-tck.gradle
+++ b/front50-api-tck/front50-api-tck.gradle
@@ -20,10 +20,3 @@ test {
     includeEngines "junit-jupiter"
   }
 }
-
-compileTestKotlin {
-  kotlinOptions {
-    languageVersion = "1.4"
-    jvmTarget = "11"
-  }
-}
diff --git a/gradle.properties b/gradle.properties
index dc4a86452..232bbdf28 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,10 @@
 fiatVersion=1.26.0
 includeProviders=azure,gcs,oracle,redis,s3,swift,sql
-korkVersion=7.77.0
+korkVersion=7.78.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.10.0
 targetJava11=true
+kotlinVersion=1.4.0
 
 # To enable a composite reference to a project, set the
 #  project property `'<projectName>Composite=true'`.
diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle
index 3cf600f56..7a028fd70 100644
--- a/gradle/kotlin.gradle
+++ b/gradle/kotlin.gradle
@@ -14,12 +14,29 @@
  * limitations under the License.
  */
 
-apply plugin: "nebula.kotlin"
+apply plugin: "kotlin"
 apply plugin: "kotlin-spring"
 
 compileKotlin {
   kotlinOptions {
-    languageVersion = "1.3"
+    languageVersion = "1.4"
     jvmTarget = "11"
   }
 }
+
+compileTestKotlin {
+  kotlinOptions {
+    languageVersion = "1.4"
+    jvmTarget = "11"
+  }
+}
+
+configurations.all {
+  resolutionStrategy {
+    eachDependency { details ->
+      if (details.requested.group == "org.jetbrains.kotlin") {
+        details.useVersion kotlinVersion
+      }
+    }
+  }
+}