chore(build): bump kotlin settings to match orca

spinnaker · Jan 15, 2021 · baa471e · baa471e
1 parent bf6c47e
commit baa471e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,10 @@
 
 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.allopen" version "$kotlinVersion" apply false
+  id "io.gitlab.arturbosch.detekt" version "1.7.4" apply false
+  id "org.jetbrains.dokka" version "1.4.10" apply false
   id 'idea'
 }
 
@@ -28,7 +31,6 @@ subprojects { project ->
   if (name != "kayenta-bom") {
     apply plugin: "java-library"
     apply plugin: "groovy"
-    apply plugin: "nebula.kotlin"
 
     def localVersions = [orcaVersion].find { it.endsWith('-SNAPSHOT') }
     if (localVersions) {

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-kotlinVersion=1.3.70
+kotlinVersion=1.4.0
 orcaVersion=8.12.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.10.0

diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle
@@ -14,19 +14,46 @@
  * limitations under the License.
  */
 
-apply plugin: "nebula.kotlin"
+apply plugin: "kotlin"
 apply plugin: "kotlin-spring"
+apply plugin: "io.gitlab.arturbosch.detekt"
 
 compileKotlin {
   kotlinOptions {
-    languageVersion = "1.3"
+    languageVersion = "1.4"
     jvmTarget = "11"
   }
 }
 
 compileTestKotlin {
   kotlinOptions {
-    languageVersion = "1.3"
+    languageVersion = "1.4"
     jvmTarget = "11"
   }
 }
+
+
+configurations.all {
+  resolutionStrategy {
+    eachDependency { details ->
+      if (details.requested.group == "org.jetbrains.kotlin") {
+        details.useVersion kotlinVersion
+      }
+    }
+  }
+}
+
+detekt {
+  parallel = false
+  config = files("$rootDir/.detekt.yml")
+  buildUponDefaultConfig = true
+  ignoreFailures = true
+  reports {
+    xml {
+      enabled = false
+    }
+    txt {
+      enabled = false
+    }
+  }
+}
diff --git a/kayenta-core/kayenta-core.gradle b/kayenta-core/kayenta-core.gradle
@@ -1,3 +1,5 @@
+apply from: "$rootDir/gradle/kotlin.gradle"
+
 dependencies {
   api "redis.clients:jedis"
   api "com.netflix.spinnaker.kork:kork-core"