azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kapt: Improve check for the current JDK version (KT-27188)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-10-18 18:39:07 +03:00
parent 1f6dbc74da
commit 6e6a036f98
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.gradle.internal 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.GradleException
import org.gradle.api.file.FileCollection import org.gradle.api.file.FileCollection
import org.gradle.api.tasks.Classpath import org.gradle.api.tasks.Classpath
@@ -81,7 +81,7 @@ open class KaptWithKotlincTask : KaptTask(), CompilerArgumentAwareWithInput<K2JV
} }
private val isAtLeastJava9: Boolean private val isAtLeastJava9: Boolean
get() = StringUtil.compareVersionNumbers(getJavaRuntimeVersion(), "9") >= 0 get() = SystemInfo.isJavaVersionAtLeast(9, 0, 0)
private fun getJavaRuntimeVersion(): String { private fun getJavaRuntimeVersion(): String {
val rtVersion = System.getProperty("java.runtime.version") val rtVersion = System.getProperty("java.runtime.version")