From f092ae567b1e61461a621850f9c2fdb5d02beb1d Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Tue, 13 Jun 2017 09:45:27 -0500
Subject: [PATCH] Conditionally apply Kotlin if not using JDK 9

Kotlin does not yet work with JDK 9, so we need to disable the Kotlin
plugin if we are using JDK 9.
---
 build.gradle | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2f0157c6bb6..83875cd53de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -109,15 +109,17 @@ configure(allprojects) { project ->
 	apply from: "${gradleScriptDir}/ide.gradle"
 	apply from: "${gradleScriptDir}/sniffer.gradle"
 
-	apply plugin: "kotlin"
-	compileKotlin {
-		kotlinOptions.jvmTarget = "1.8"
-		kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
+	if(!JavaVersion.current().java9Compatible) {
+		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 {