Skip to content

Commit

Permalink
chore(kotlin): move to new kotlin version and upgrade kork (#981)
Browse files Browse the repository at this point in the history
  • Loading branch information
dogonthehorizon committed Oct 13, 2020
1 parent 00da4e9 commit 6417003
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 11 deletions.
3 changes: 2 additions & 1 deletion build.gradle
Expand Up @@ -16,7 +16,8 @@

plugins {
id 'io.spinnaker.project' version "$spinnakerGradleVersion" apply false
id 'nebula.kotlin' version '1.3.70' apply false
id "org.jetbrains.kotlin.jvm" version "$kotlinVersion" apply false
id "org.jetbrains.kotlin.plugin.allopen" version "$kotlinVersion" apply false
}

subprojects { project ->
Expand Down
7 changes: 0 additions & 7 deletions front50-api-tck/front50-api-tck.gradle
Expand Up @@ -20,10 +20,3 @@ test {
includeEngines "junit-jupiter"
}
}

compileTestKotlin {
kotlinOptions {
languageVersion = "1.4"
jvmTarget = "11"
}
}
3 changes: 2 additions & 1 deletion gradle.properties
@@ -1,9 +1,10 @@
fiatVersion=1.26.0
includeProviders=azure,gcs,oracle,redis,s3,swift,sql
korkVersion=7.77.0
korkVersion=7.78.0
org.gradle.parallel=true
spinnakerGradleVersion=8.10.0
targetJava11=true
kotlinVersion=1.4.0

# To enable a composite reference to a project, set the
# project property `'<projectName>Composite=true'`.
Expand Down
21 changes: 19 additions & 2 deletions gradle/kotlin.gradle
Expand Up @@ -14,12 +14,29 @@
* limitations under the License.
*/

apply plugin: "nebula.kotlin"
apply plugin: "kotlin"
apply plugin: "kotlin-spring"

compileKotlin {
kotlinOptions {
languageVersion = "1.3"
languageVersion = "1.4"
jvmTarget = "11"
}
}

compileTestKotlin {
kotlinOptions {
languageVersion = "1.4"
jvmTarget = "11"
}
}

configurations.all {
resolutionStrategy {
eachDependency { details ->
if (details.requested.group == "org.jetbrains.kotlin") {
details.useVersion kotlinVersion
}
}
}
}

0 comments on commit 6417003

Please sign in to comment.