azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Register JDK for default project to prevent create leaking one for Gradle import

Browse Source
This commit is contained in:
Nikolay Krasko
2020-02-26 19:54:27 +03:00
parent c9fd79c311
commit dd21736471
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt
+5 -1
View File
@@ -26,6 +26,7 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemUtil
import com.intellij.openapi.fileTypes.FileTypeManager import com.intellij.openapi.fileTypes.FileTypeManager
import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.project.ProjectManager
import com.intellij.openapi.projectRoots.SimpleJavaSdkType import com.intellij.openapi.projectRoots.SimpleJavaSdkType
import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.roots.ProjectRootManager
@@ -247,9 +248,12 @@ abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase<Abs
super.setUp() super.setUp()
val javaHome = IdeaTestUtil.requireRealJdkHome() val javaHome = IdeaTestUtil.requireRealJdkHome()
ApplicationManager.getApplication().runWriteAction { ApplicationManager.getApplication().runWriteAction {
addSdk(SimpleJavaSdkType().createJdk(DEFAULT_SDK, javaHome)) val defaultJDK = SimpleJavaSdkType().createJdk(DEFAULT_SDK, javaHome)
addSdk(defaultJDK)
addSdk(SimpleJavaSdkType().createJdk("_other", javaHome)) addSdk(SimpleJavaSdkType().createJdk("_other", javaHome))
ProjectRootManager.getInstance(ProjectManager.getInstance().defaultProject).projectSdk = defaultJDK
println("ProjectWizardTestCase.configureJdk:") println("ProjectWizardTestCase.configureJdk:")
println(listOf(*getProjectJdkTableSafe().allJdks)) println(listOf(*getProjectJdkTableSafe().allJdks))