Merge branch 'master' into config-simplifications

spinnaker · Nov 27, 2023 · 723eade · 723eade
2 parents 8f25053 + 3947a1b
commit 723eade
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -70,7 +70,7 @@ subprojects {
       testImplementation "org.springframework:spring-test"
       testImplementation "org.hamcrest:hamcrest-core"
       testRuntimeOnly "cglib:cglib-nodep"
-      testRuntimeOnly "org.junit.vintage:junit-vintage-engine"
+      testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
       testRuntimeOnly "org.objenesis:objenesis"
     }
   }

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,9 @@
 includeProviders=file,github,google-groups,ldap
-korkVersion=7.193.0
+korkVersion=7.204.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.31.0
 targetJava11=true
-kotlinVersion=1.4.0
+kotlinVersion=1.5.32
 # 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
@@ -19,14 +19,14 @@ apply plugin: "kotlin-spring"
 
 compileKotlin {
     kotlinOptions {
-        languageVersion = "1.4"
+        languageVersion = "1.5"
         jvmTarget = "11"
     }
 }
 
 compileTestKotlin {
     kotlinOptions {
-        languageVersion = "1.4"
+        languageVersion = "1.5"
         jvmTarget = "11"
     }
 }