From d269c194c771c2b82e42ad30933b017cec9dc75a Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Wed, 20 Nov 2019 11:17:41 +0000 Subject: [PATCH] Fix java version parsing in KAPT Handle case when "java.version" returns "11" or "12". Previously, we expected it to contain at least one dot in the version string. --- .../src/org/jetbrains/kotlin/kapt3/base/util/java9Utils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/util/java9Utils.kt b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/util/java9Utils.kt index f7e9d8991bb..dd92a0caa57 100644 --- a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/util/java9Utils.kt +++ b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/util/java9Utils.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.kapt3.base.plus fun isJava9OrLater(): Boolean = !System.getProperty("java.version").startsWith("1.") fun isJava11OrLater(): Boolean { - val majorVersion = System.getProperty("java.version").substringBefore(".", "") + val majorVersion = System.getProperty("java.version").substringBefore(".") if (majorVersion.isEmpty()) return false return try {