From d57cd3726693db53d57238e50f0c07c350b155c2 Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Sat, 24 Jun 2017 01:13:22 +0200
Subject: [PATCH] Upgrade to Kotlin 1.1.3

This commit also enables Kotlin build with JDK 9 since this new
version supports it.
---
 build.gradle | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 83875cd53d..392123ca3a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-	ext.kotlinVersion = '1.1.2-5'
+	ext.kotlinVersion = '1.1.3'
 	repositories {
 		maven { url "https://repo.spring.io/plugins-release" }
 	}
@@ -109,17 +109,15 @@ configure(allprojects) { project ->
 	apply from: "${gradleScriptDir}/ide.gradle"
 	apply from: "${gradleScriptDir}/sniffer.gradle"
 
-	if(!JavaVersion.current().java9Compatible) {
-		apply plugin: "kotlin"
-		compileKotlin {
-			kotlinOptions.jvmTarget = "1.8"
-			kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
+	apply plugin: "kotlin"
+	compileKotlin {
+		kotlinOptions.jvmTarget = "1.8"
+		kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
 
-		}
-		compileTestKotlin {
-			kotlinOptions.jvmTarget = "1.8"
-			kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
-		}
+	}
+	compileTestKotlin {
+		kotlinOptions.jvmTarget = "1.8"
+		kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
 	}
 
 	configurations.all {