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

Gradle: allow to use bundled JDK for gradle tooling

Browse Source
This commit is contained in:
Vladislav.Soroka
2018-08-29 16:37:44 +03:00
parent 2328a09b50
commit c89df57c99
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectOpenProcessor.java
+2 -1
View File
@@ -30,6 +30,7 @@ import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.project.ex.ProjectManagerEx;
import com.intellij.openapi.projectRoots.JdkUtil;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
@@ -286,7 +287,7 @@ public class GradleProjectOpenProcessor extends ProjectOpenProcessor {
private static boolean setupGradleJvm(@Nullable Project project, @NotNull GradleProjectSettings projectSettings) {
final Pair<String, Sdk> sdkPair = ExternalSystemJdkUtil.getAvailableJdk(project);
if (!ExternalSystemJdkUtil.USE_INTERNAL_JAVA.equals(sdkPair.first) ||
ExternalSystemJdkUtil.isValidJdk(sdkPair.second.getHomePath())) {
(!StringUtil.isEmptyOrSpaces(sdkPair.second.getHomePath()) && JdkUtil.checkForJdk(sdkPair.second.getHomePath()))) {
projectSettings.setGradleJvm(sdkPair.first);
return true;
}