diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/gradleRoutines.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/gradleRoutines.kt index da3836f7aff..c5a1f8336cd 100644 --- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/gradleRoutines.kt +++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/gradleRoutines.kt @@ -12,16 +12,15 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.externalSystem.util.ExternalSystemUtil import com.intellij.openapi.project.DumbService import com.intellij.openapi.project.Project -import com.intellij.openapi.roots.ProjectRootManager import org.gradle.util.GradleVersion -import org.jetbrains.plugins.gradle.service.project.open.setupGradleSettings +import org.jetbrains.plugins.gradle.service.project.open.setupGradleProjectSettings import org.jetbrains.plugins.gradle.settings.GradleProjectSettings import org.jetbrains.plugins.gradle.settings.GradleSettings import org.jetbrains.plugins.gradle.util.GradleConstants import org.jetbrains.plugins.gradle.util.GradleLog import org.jetbrains.plugins.gradle.util.suggestGradleVersion import java.io.File -import kotlin.test.assertNotNull +import java.nio.file.Paths fun refreshGradleProject(projectPath: String, project: Project) { _importProject(File(projectPath).absolutePath, project) @@ -42,7 +41,7 @@ private fun _importProject(projectPath: String, project: Project) { GradleSettings.getInstance(project).gradleVmOptions = "-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${System.getProperty("user.dir")}" - setupGradleSettings(project, gradleProjectSettings, projectPath, gradleVersion) + gradleProjectSettings.setupGradleProjectSettings(Paths.get(projectPath)) gradleProjectSettings.gradleJvm = GRADLE_JDK_NAME GradleSettings.getInstance(project).getLinkedProjectSettings(projectPath)?.let { linkedProjectSettings -> diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt index 756f62ec7f0..9064f7ebce9 100644 --- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt +++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt @@ -21,7 +21,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.project.Project import com.intellij.openapi.project.ex.ProjectManagerEx import com.intellij.openapi.startup.StartupManager -import com.intellij.platform.PlatformProjectOpenProcessor import com.intellij.psi.PsiDocumentManager import com.intellij.psi.impl.PsiDocumentManagerBase import com.intellij.testFramework.ExtensionTestUtil @@ -70,7 +69,7 @@ fun dispatchAllInvocationEvents() { } fun loadProjectWithName(path: String, name: String): Project? = - PlatformProjectOpenProcessor.openExistingProject(Paths.get(path), Paths.get(path), OpenProjectTask(projectName = name)) + ProjectManagerEx.getInstanceEx().openProject(Paths.get(path), OpenProjectTask(projectName = name)) fun TestApplicationManager.closeProject(project: Project) { val name = project.name @@ -114,4 +113,4 @@ fun replaceWithCustomHighlighter(parentDisposable: Disposable, fromImplementatio if (filteredExtensions.size < extensions.size) { ExtensionTestUtil.maskExtensions(pointName, filteredExtensions + listOf(point), parentDisposable) } -} \ No newline at end of file +}