mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-18 09:34:34 +07:00
[maven] IDEA-255308 create dependencies from additional compileSourceRoot modules to default 'main' module
GitOrigin-RevId: ca2762124bee7d4cc9590beaa25b80ba9b990151
This commit is contained in:
committed by
intellij-monorepo-bot
parent
21f94f905a
commit
58285bd196
+7
-1
@@ -115,10 +115,15 @@ internal class MavenProjectImportContextProvider(
|
||||
|
||||
val result = mutableListOf(MavenTreeModuleImportData(project, module, emptyList(), changes))
|
||||
|
||||
val defaultMainSubmodule = importData.defaultMainSubmodule
|
||||
val additionalMainDependencies =
|
||||
if (null == defaultMainSubmodule) emptyList()
|
||||
else listOf(ModuleDependency(defaultMainSubmodule.moduleName, DependencyScope.COMPILE, false))
|
||||
|
||||
for (submodule in submodules) {
|
||||
val dependencies = when (submodule.type) {
|
||||
StandardMavenModuleType.MAIN_ONLY -> mainDependencies
|
||||
StandardMavenModuleType.MAIN_ONLY_ADDITIONAL -> mainDependencies
|
||||
StandardMavenModuleType.MAIN_ONLY_ADDITIONAL -> mainDependencies + additionalMainDependencies
|
||||
StandardMavenModuleType.TEST_ONLY -> testDependencies + mainDependencies
|
||||
else -> null
|
||||
} ?: continue
|
||||
@@ -379,6 +384,7 @@ private class MavenProjectImportData(
|
||||
val submodules: List<ModuleData>,
|
||||
) {
|
||||
|
||||
val defaultMainSubmodule = submodules.firstOrNull { it.type == StandardMavenModuleType.MAIN_ONLY }
|
||||
val mainSubmodules = submodules.filter { it.type == StandardMavenModuleType.MAIN_ONLY || it.type == StandardMavenModuleType.MAIN_ONLY_ADDITIONAL }
|
||||
val testSubmodules = submodules.filter { it.type == StandardMavenModuleType.TEST_ONLY }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user