Skip to content

Commit

Permalink
chore(dependency): upgrade kotlin to 1.6.21 and unpin kotlinx-corouti…
Browse files Browse the repository at this point in the history
…nes (spinnaker#1176)

Upgrade kotlin from 1.5.32 to 1.6.21, in order to sync with spring boot 2.6.15.
Unpinning kotlinx-coroutines, that brings version 1.5.2 as transitive dependency of spring boot 2.6.15. So, effectively no change in kotlinx-coroutines version.
https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.15/spring-boot-dependencies-2.6.15.pom
  • Loading branch information
j-sandy authored Apr 2, 2024
1 parent a3e98b5 commit 3a6adac
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlinVersion=1.5.32
kotlinVersion=1.6.21
org.gradle.parallel=true
spinnakerGradleVersion=8.32.1
targetJava11=true
Expand Down
2 changes: 1 addition & 1 deletion gradle/kotlin-test.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {

compileTestKotlin {
kotlinOptions {
languageVersion = "1.5"
languageVersion = "1.6"
jvmTarget = "11"
}
}
4 changes: 2 additions & 2 deletions gradle/kotlin.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ dependencies {

compileKotlin {
kotlinOptions {
languageVersion = "1.5"
languageVersion = "1.6"
jvmTarget = "11"
}
}

compileTestKotlin {
kotlinOptions {
languageVersion = "1.5"
languageVersion = "1.6"
jvmTarget = "11"
}
}
Expand Down
1 change: 0 additions & 1 deletion spinnaker-dependencies/spinnaker-dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ dependencies {
// 2.16.0 is subject to CVE-2021-45105. 2.17.0 is subject to CVE-2021-44832, so use >= 2.17.1.
api(platform("org.apache.logging.log4j:log4j-bom:2.20.0"))

api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"))
//kotlinVersion comes from gradle.properties since we have kotlin code in
// this project and need to configure gradle plugins etc.
api(platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion"))
Expand Down

0 comments on commit 3a6adac

Please sign in to comment.