From 6e6a036f98cb2e73c4dab0e3d1c425dece62d628 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Thu, 18 Oct 2018 18:39:07 +0300
Subject: [PATCH] Kapt: Improve check for the current JDK version (KT-27188)

---
 .../kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt
index 90203934ee5..d168c89e590 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt
@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.gradle.internal
 
-import com.intellij.openapi.util.text.StringUtil
+import com.intellij.openapi.util.SystemInfo
 import org.gradle.api.GradleException
 import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.Classpath
@@ -81,7 +81,7 @@ open class KaptWithKotlincTask : KaptTask(), CompilerArgumentAwareWithInput<K2JV
     }
 
     private val isAtLeastJava9: Boolean
-        get() = StringUtil.compareVersionNumbers(getJavaRuntimeVersion(), "9") >= 0
+        get() = SystemInfo.isJavaVersionAtLeast(9, 0, 0)
 
     private fun getJavaRuntimeVersion(): String {
         val rtVersion = System.getProperty("java.runtime.version")