IDEA-CR-51946: eliminate dependency on intellij.java.testFramework module

(cherry picked from commit a34daa5f602c94210ebe10df24331d01c0db6fef)

GitOrigin-RevId: 2c1d881a0469de9283a477fb44233109dc817a69
This commit is contained in:
vadim.lomshakov
2019-09-03 14:59:03 +00:00
committed by intellij-monorepo-bot
parent 9dcbfb78fd
commit 9de8cb1e20
4 changed files with 21 additions and 5 deletions
+1
View File
@@ -676,6 +676,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/sh/intellij.sh.iml" filepath="$PROJECT_DIR$/plugins/sh/intellij.sh.iml" />
<module fileurl="file://$PROJECT_DIR$/spellchecker/intellij.spellchecker.iml" filepath="$PROJECT_DIR$/spellchecker/intellij.spellchecker.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.tests.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/completion-ranker/intellij.statsCollector.completionRanker.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/completion-ranker/intellij.statsCollector.completionRanker.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/features/intellij.statsCollector.features.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/features/intellij.statsCollector.features.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/log-events/intellij.statsCollector.logEvents.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/log-events/intellij.statsCollector.logEvents.iml" />
+1
View File
@@ -136,5 +136,6 @@
<orderEntry type="module" module-name="intellij.sh" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.gradle.java.maven" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.markdown" scope="TEST" />
<orderEntry type="module" module-name="intellij.statsCollector.tests" scope="TEST" />
</component>
</module>
@@ -5,7 +5,6 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -15,12 +14,8 @@
<orderEntry type="library" name="http-client" level="project" />
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="library" name="gson" level="project" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="library" scope="TEST" name="mockito" level="project" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="module" module-name="intellij.statsCollector.features" />
<orderEntry type="module" module-name="intellij.statsCollector.logEvents" />
<orderEntry type="library" name="commons-codec" level="project" />
<orderEntry type="library" name="fluent-hc" level="project" />
<orderEntry type="module" module-name="intellij.statsCollector.completionRanker" />
</component>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/test">
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<content url="file://$MODULE_DIR$/testResources" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="library" scope="TEST" name="mockito" level="project" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="library" scope="TEST" name="commons-codec" level="project" />
<orderEntry type="module" module-name="intellij.statsCollector.features" scope="TEST" />
<orderEntry type="module" module-name="intellij.statsCollector.logEvents" scope="TEST" />
<orderEntry type="module" module-name="intellij.statsCollector" scope="TEST" />
</component>
</module>