Skip to content
This repository has been archived by the owner on Oct 8, 2020. It is now read-only.

chore(*): Upgrade to Kotlin 1.4 #200

Merged
merged 1 commit into from
Sep 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
korkVersion=7.63.0
kotlinVersion=1.3.70
kotlinVersion=1.4.0
org.gradle.parallel=true
spinnakerGradleVersion=8.5.0

Expand Down
6 changes: 3 additions & 3 deletions gradle/kotlin.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
}
}