Gradle: allow to use bundled JDK for gradle tooling

This commit is contained in:
Vladislav.Soroka
2018-08-29 16:13:57 +03:00
parent e2abdc207b
commit 36ff590899
@@ -285,7 +285,8 @@ 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)) {
if (!ExternalSystemJdkUtil.USE_INTERNAL_JAVA.equals(sdkPair.first) ||
ExternalSystemJdkUtil.isValidJdk(sdkPair.second.getHomePath())) {
projectSettings.setGradleJvm(sdkPair.first);
return true;
}