fix module dependencies which are unresolved or duplicated

GitOrigin-RevId: fb991dfcefb0663e9ccd6167681cff6642bd57f7
This commit is contained in:
Alexey Kudravtsev
2021-08-17 12:46:07 +02:00
committed by intellij-monorepo-bot
parent 34185aa146
commit 151cd4e242
9 changed files with 5 additions and 10 deletions

View File

@@ -29,7 +29,6 @@
<orderEntry type="module" module-name="intellij.jsp" />
<orderEntry type="module" module-name="intellij.jsp.spi" />
<orderEntry type="module" module-name="intellij.java.execution" />
<orderEntry type="module" module-name="intellij.xml.dom" />
<orderEntry type="module" module-name="intellij.xml.dom.impl" />
<orderEntry type="module" module-name="intellij.platform.vcs.impl" />
<orderEntry type="module" module-name="intellij.platform.icons" />
@@ -81,7 +80,6 @@
<orderEntry type="module" module-name="intellij.platform.statistics" />
<orderEntry type="module" module-name="intellij.platform.inspect" />
<orderEntry type="library" name="fastutil-min" level="project" />
<orderEntry type="module" module-name="intellij.platform.workspaceModel.storage" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
<orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />

View File

@@ -27,7 +27,6 @@
<orderEntry type="library" name="kotlin-test" level="project" />
<orderEntry type="module" module-name="intellij.platform.jps.build" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="library" name="fastutil-min" level="project" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />

View File

@@ -64,4 +64,9 @@ public class JpsSdkReferenceImpl<P extends JpsElement> extends JpsNamedElementRe
protected JpsElementCollection<? extends JpsLibrary> getCollection(@NotNull JpsCompositeElement parent) {
return parent.getContainer().getChild(JpsLibraryRole.LIBRARIES_COLLECTION_ROLE);
}
@Override
public String toString() {
return "SDK reference: '" + myElementName + "' in " + getParentReference();
}
}

View File

@@ -12,7 +12,6 @@
<orderEntry type="module" module-name="intellij.java" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" />
<orderEntry type="module" module-name="intellij.java.execution.impl" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.debugger" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />

View File

@@ -30,7 +30,6 @@
<orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
<orderEntry type="module" module-name="kotlin.compiler-plugins.kotlinx-serialization.common" scope="TEST" />
<orderEntry type="module" module-name="kotlin.performance-tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.jps.build" scope="TEST" />
<orderEntry type="module" module-name="kotlin.common" scope="TEST" />
<orderEntry type="module" module-name="kotlin.compiler-plugins.parcelize.tests" scope="TEST" />

View File

@@ -35,7 +35,6 @@
<orderEntry type="module" module-name="kotlin.fir.frontend-independent" scope="TEST" />
<orderEntry type="library" scope="TEST" name="kotlinc.sam-with-receiver-compiler-plugin" level="project" />
<orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />
<orderEntry type="library" scope="TEST" name="kotlinc.kotlin-scripting-compiler" level="project" />
<orderEntry type="module" module-name="kotlin.idea" scope="TEST" />
<orderEntry type="library" name="kotlinc.kotlin-scripting-compiler" level="project" />
<orderEntry type="module" module-name="kotlin.gradle.gradle-idea" scope="RUNTIME" />
@@ -54,7 +53,6 @@
<orderEntry type="module" module-name="kotlin.compiler-plugins.allopen.maven" scope="RUNTIME" />
<orderEntry type="module" module-name="kotlin.compiler-plugins.parcelize.common" scope="RUNTIME" />
<orderEntry type="module" module-name="kotlin.compiler-plugins.parcelize.gradle" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.structuralSearch" scope="TEST" />
<orderEntry type="module" module-name="intellij.gradle.common" scope="TEST" />
<orderEntry type="module" module-name="intellij.regexp" scope="TEST" />

View File

@@ -13,7 +13,6 @@
<orderEntry type="library" name="JDOM" level="project" />
<orderEntry type="module" module-name="kotlin.common" />
<orderEntry type="module" module-name="kotlin.core" />
<orderEntry type="module" module-name="kotlin.common" />
<orderEntry type="module" module-name="kotlin.idea" />
<orderEntry type="module" module-name="intellij.platform.core.impl" />
<orderEntry type="module" module-name="intellij.platform.lang" />

View File

@@ -15,7 +15,6 @@
<orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
<orderEntry type="module" module-name="intellij.xml.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.properties" exported="" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.boot" scope="TEST" />

View File

@@ -18,7 +18,6 @@
<orderEntry type="module" module-name="intellij.java.guiForms.rt" />
<orderEntry type="module" module-name="intellij.platform.jps.model.serialization.tests" scope="TEST" />
<orderEntry type="library" scope="TEST" name="Java Compatibility" level="project" />
<orderEntry type="library" scope="TEST" name="ASM" level="project" />
<orderEntry type="library" name="ASM" level="project" />
</component>
</module>