Merge branch 'master' into cdevents_artifacts_params

spinnaker · Nov 27, 2023 · 2855762 · 2855762
2 parents 164ee30 + b381254
commit 2855762
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 fiatVersion=1.42.0
-korkVersion=7.202.0
-kotlinVersion=1.4.0
+korkVersion=7.204.0
+kotlinVersion=1.5.32
 org.gradle.parallel=true
 spinnakerGradleVersion=8.31.0
 targetJava11=true

diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle
@@ -18,14 +18,14 @@ apply plugin: "kotlin"
 
 compileKotlin {
   kotlinOptions {
-    languageVersion = "1.4"
+    languageVersion = "1.5"
     jvmTarget = "11"
   }
 }
 
 compileTestKotlin {
   kotlinOptions {
-    languageVersion = "1.4"
+    languageVersion = "1.5"
     jvmTarget = "11"
   }
 }