MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[build] reverts premature migration to new API

Browse Source
This commit is contained in:
Roman Shevchenko
2017-12-21 17:34:35 +01:00
parent ff1842bfda
commit ec5440bbdd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/utils.gant
+1 -1
View File
@@ -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
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy
+1 -1
View File
@@ -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