From ec5440bbdd32068b6874d3aa47fbf62a114664b1 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 21 Dec 2017 17:34:15 +0100 Subject: [PATCH] [build] reverts premature migration to new API --- build/scripts/utils.gant | 2 +- .../groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant index 527d55f6ec5e..723410b95e79 100644 --- a/build/scripts/utils.gant +++ b/build/scripts/utils.gant @@ -184,7 +184,7 @@ private String setupJdkPath(String propertyName, String defaultDir, String envVa else { jdk = guessJdk() def jdkInfo = JdkVersionDetector.instance.detectJdkVersionInfo(jdk) - if (propertyName.contains("8") && jdkInfo.@version.feature != 8) { + if (propertyName.contains("8") && jdkInfo.version.contains("1.8.")) { projectBuilder.error("JDK 1.8 is required to compile the project, but '$propertyName' property and '$envVarName' environment variable" + " aren't defined and default JDK $jdk ($jdkInfo) cannot be used as JDK 1.8") return null diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy index 5639f78cd23f..727ef7f5314f 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy @@ -43,7 +43,7 @@ class JdkUtils { else { jdkDir = getCurrentJdk() def jdkInfo = JdkVersionDetector.instance.detectJdkVersionInfo(jdkDir) - if (propertyName.contains("8") && jdkInfo.@version.feature != 8) { + if (propertyName.contains("8") && !jdkInfo.version.contains("1.8.")) { messages.error("JDK 1.8 is required to compile the project, but '$propertyName' property and '$envVarName' environment variable" + " aren't defined and default JDK $jdkDir ($jdkInfo) cannot be used as JDK 1.8") return null