diff options
| author | Yan Zhulanow <yan.zhulanow@jetbrains.com> | 2020-12-10 19:35:23 +0900 |
|---|---|---|
| committer | kotlin-ide-monorepo-bot <kotlin-ide-monorepo-bot-no-reply@jetbrains.com> | 2020-12-30 13:35:10 +0000 |
| commit | d05b3bcf45c5b300cb9c98264883b6931e6a6604 (patch) | |
| tree | fed65e02b7a872a1d35175f597581b278caae87d /project-wizard | |
| parent | 6208918dfd55f32f7a5d2fb16f7dd7c97b4c16d3 (diff) | |
| download | intellij-kotlin-d05b3bcf45c5b300cb9c98264883b6931e6a6604.tar.gz | |
Fix tests with Gradle project importer
Adds explicit 'android.dir' preference to 'local.properties' of a Gradle project so Android components don't get in the way.
(cherry picked from commit 3b83f67587bb04810f5de50d6a29ab7963bd24ec)
GitOrigin-RevId: d47aa627724226cdc65cdb09df80794c2b3c4fe1
Diffstat (limited to 'project-wizard')
| -rw-r--r-- | project-wizard/idea/test/org/jetbrains/kotlin/tools/projectWizard/wizard/services/ProjectImportingTestWizardService.kt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/project-wizard/idea/test/org/jetbrains/kotlin/tools/projectWizard/wizard/services/ProjectImportingTestWizardService.kt b/project-wizard/idea/test/org/jetbrains/kotlin/tools/projectWizard/wizard/services/ProjectImportingTestWizardService.kt index 3a1a99dcadad..abd7b3fc4293 100644 --- a/project-wizard/idea/test/org/jetbrains/kotlin/tools/projectWizard/wizard/services/ProjectImportingTestWizardService.kt +++ b/project-wizard/idea/test/org/jetbrains/kotlin/tools/projectWizard/wizard/services/ProjectImportingTestWizardService.kt @@ -15,6 +15,7 @@ import com.intellij.openapi.externalSystem.service.project.ProjectDataManager import com.intellij.openapi.externalSystem.util.ExternalSystemUtil import com.intellij.openapi.project.Project import org.jetbrains.kotlin.idea.framework.MAVEN_SYSTEM_ID +import org.jetbrains.kotlin.test.AndroidStudioTestUtils import org.jetbrains.kotlin.tools.projectWizard.cli.TestWizardService import org.jetbrains.kotlin.tools.projectWizard.core.* import org.jetbrains.kotlin.tools.projectWizard.core.service.ProjectImportingWizardService @@ -23,6 +24,7 @@ import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemT import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.isGradle import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.KotlinPlugin import org.jetbrains.plugins.gradle.util.GradleConstants +import java.io.File import java.nio.file.Path class GradleProjectImportingTestWizardService(private val project: Project) : ProjectImportingWizardService, TestWizardService { @@ -35,6 +37,8 @@ class GradleProjectImportingTestWizardService(private val project: Project) : Pr modulesIrs: List<ModuleIR>, buildSystem: BuildSystemType ): TaskResult<Unit> { + AndroidStudioTestUtils.specifyAndroidSdk(path.toFile()) + var importingErrorMessage: String? = null ExternalSystemUtil.refreshProjects( |