Merge pull request #51 from jeyrschabu/updateDependencies

chore(dependencies): Update kotlin dependencies & misc

build.gradle

@@ -23,7 +23,7 @@ buildscript {
     classpath "com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.16.0"
     classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.9.RELEASE"
     classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.0"
-    classpath "com.netflix.nebula:nebula-kotlin-plugin:1.2.21"
+    classpath "com.netflix.nebula:nebula-kotlin-plugin:$kotlinVersion"
     classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.15"
     classpath "com.netflix.nebula:gradle-dependency-lock-plugin:4.9.5"
   }

gradle.properties

@@ -0,0 +1,5 @@
+org.gradle.parallel=true
+
+kotlinVersion=1.2.21
+jacksonVersion=2.9.4
+jackson.version=2.9.4

gradle/kotlin.gradle

@@ -18,7 +18,16 @@ apply plugin: "nebula.kotlin"
 
 compileKotlin {
   kotlinOptions {
-    languageVersion = "1.1"
+    languageVersion = "1.2"
     jvmTarget = "1.8"
   }
 }
+configurations.all {
+  resolutionStrategy {
+    eachDependency { details ->
+      if (details.requested.group == "org.jetbrains.kotlin") {
+        details.useVersion kotlinVersion
+      }
+    }
+  }
+}

swabbie-core/swabbie-core.gradle

@@ -19,14 +19,14 @@ dependencies {
   compile "org.slf4j:slf4j-api:1.7.+"
   compile "com.netflix.spinnaker.kork:kork-core:+"
   compile "net.logstash.logback:logstash-logback-encoder:4.+"
-  testCompile "com.squareup.retrofit:retrofit-mock:1.9.+"
 
-  compile "com.fasterxml.jackson.core:jackson-databind:2.9.+"
-  compile "com.fasterxml.jackson.core:jackson-annotations:2.9.+"
+  compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+  compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
 
-  compile "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.+"
+  compile "com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion"
   compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.+"
   compile spinnaker.dependency("rxJava")
 
+  testCompile "com.squareup.retrofit:retrofit-mock:1.9.+"
   testCompile project(":swabbie-test")
 }

swabbie-retrofit/src/main/kotlin/com/netflix/spinnaker/swabbie/retrofit/SwabbieRetrofitConfiguration.kt

@@ -16,6 +16,7 @@
 
 package com.netflix.spinnaker.swabbie.retrofit
 
+import com.netflix.spinnaker.config.OkHttp3ClientConfiguration
 import com.netflix.spinnaker.config.OkHttpClientConfiguration
 import com.squareup.okhttp.ConnectionPool
 import com.squareup.okhttp.Interceptor
@@ -33,7 +34,7 @@ import retrofit.client.OkClient
 
 
 @Configuration
-@Import(OkHttpClientConfiguration::class)
+@Import(OkHttp3ClientConfiguration::class)
 @EnableConfigurationProperties
 open class SwabbieRetrofitConfiguration {