chore(*): Upgrade to Kotlin 1.4 (#200)

spinnaker · Sep 4, 2020 · 484e6db · 484e6db
1 parent e9f6e7f
commit 484e6db
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id("io.spinnaker.project").version("$spinnakerGradleVersion").apply(false)
-  id("nebula.kotlin").version("$kotlinVersion").apply(false)
+  id("org.jetbrains.kotlin.jvm").version("$kotlinVersion").apply(false)
   id("org.jetbrains.kotlin.plugin.spring").version("$kotlinVersion").apply(false)
   id("org.jetbrains.dokka").version("0.9.18").apply(false)
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 korkVersion=7.63.0
-kotlinVersion=1.3.70
+kotlinVersion=1.4.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.5.0
 

diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-apply plugin: "nebula.kotlin"
+apply plugin: "kotlin"
 apply plugin: "kotlin-spring"
 apply plugin: "kotlin-allopen"
 apply from: "${project.rootDir}/gradle/ktlint.gradle"
@@ -25,14 +25,14 @@ allOpen {
 
 compileKotlin {
   kotlinOptions {
-    languageVersion = "1.3"
+    languageVersion = "1.4"
     jvmTarget = "1.8"
   }
 }
 
 compileTestKotlin {
   kotlinOptions {
-    languageVersion = "1.3"
+    languageVersion = "1.4"
     jvmTarget = "1.8"
   }
 }