From 6acf279a34a957be3ed0bef94e0cbfd1632b234e Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 14 Jan 2020 15:01:06 +0300 Subject: [PATCH] Wizard: Use default Java source roots for JPS projects #KT-35710 fixed --- .../wizard/service/IdeaJpsWizardService.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaJpsWizardService.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaJpsWizardService.kt index cab709ad7e9..e8dd1b40fdf 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaJpsWizardService.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaJpsWizardService.kt @@ -17,14 +17,15 @@ import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.vfs.VfsUtil import com.intellij.util.PathUtil import org.jetbrains.idea.maven.utils.library.RepositoryLibraryProperties -import org.jetbrains.kotlin.config.ResourceKotlinRootType -import org.jetbrains.kotlin.config.SourceKotlinRootType -import org.jetbrains.kotlin.config.TestResourceKotlinRootType -import org.jetbrains.kotlin.config.TestSourceKotlinRootType +import org.jetbrains.jps.model.java.JavaResourceRootType +import org.jetbrains.jps.model.java.JavaSourceRootType import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.tools.projectWizard.core.* import org.jetbrains.kotlin.tools.projectWizard.core.service.ProjectImportingWizardService -import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.* +import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.DependencyType +import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.LibraryDependencyIR +import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.ModuleIR +import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.isKotlinStdlib import org.jetbrains.kotlin.tools.projectWizard.library.MavenArtifact import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemType import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.SourcesetType @@ -68,11 +69,11 @@ private class ProjectImporter( val isTest = sourceset == SourcesetType.test contentRoot.addSourceFolder( (moduleIr.path / "src" / sourceset.name / "kotlin").url, - if (isTest) TestSourceKotlinRootType else SourceKotlinRootType + if (isTest) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE ) contentRoot.addSourceFolder( (moduleIr.path / "src" / sourceset.name / "resources").url, - if (isTest) TestResourceKotlinRootType else ResourceKotlinRootType + if (isTest) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE ) }