MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA project configuration: replace annotation modules by libraries (IDEA-192182)

Browse Source 
jetbrains-annotations and jetbrains-annotations-java5 libraries are added, modules and artifacts now refer to these libraries instead of old modules.
This commit is contained in:
nik
2018-05-17 18:03:14 +03:00
parent d57422a982
commit ef95829a7a
30 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/artifacts/standalone_jps.xml
Generated
+1 -2
View File
@@ -5,8 +5,6 @@
<element id="archive" name="util.jar">
<element id="module-output" name="intellij.platform.util" />
<element id="module-output" name="intellij.platform.util.rt" />
<element id="module-output" name="intellij.platform.annotations.java5" />
<element id="module-output" name="intellij.platform.annotations.common" />
</element>
<element id="archive" name="jps-model.jar">
<element id="module-output" name="intellij.platform.jps.model" />
@@ -46,6 +44,7 @@
<element id="archive" name="testFramework.core.jar">
<element id="module-output" name="intellij.platform.testFramework.core" />
</element>
<element id="library" level="project" name="jetbrains-annotations-java5" />
</root>
</artifact>
</component>
.idea/libraries/jetbrains_annotations.xml
Generated
+12
View File
@@ -0,0 +1,12 @@
<component name="libraryTable">
<library name="jetbrains-annotations" type="repository">
<properties maven-id="org.jetbrains:annotations:16.0.2" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/16.0.2/annotations-16.0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/16.0.2/annotations-16.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/jetbrains_annotations_java5.xml
Generated
+12
View File
@@ -0,0 +1,12 @@
<component name="libraryTable">
<library name="jetbrains-annotations-java5" type="repository">
<properties maven-id="org.jetbrains:annotations-java5:16.0.2" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations-java5/16.0.2/annotations-java5-16.0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations-java5/16.0.2/annotations-java5-16.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/modules.xml
Generated
-3
View File
@@ -537,9 +537,6 @@
<module fileurl="file://$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" filepath="$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" filepath="$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/annotations/java8/intellij.platform.annotations.iml" filepath="$PROJECT_DIR$/platform/annotations/java8/intellij.platform.annotations.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/annotations/common/intellij.platform.annotations.common.iml" filepath="$PROJECT_DIR$/platform/annotations/common/intellij.platform.annotations.common.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/annotations/intellij.platform.annotations.java5.iml" filepath="$PROJECT_DIR$/platform/annotations/intellij.platform.annotations.java5.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/boot/intellij.platform.boot.iml" filepath="$PROJECT_DIR$/platform/boot/intellij.platform.boot.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/bootstrap/intellij.platform.bootstrap.iml" filepath="$PROJECT_DIR$/platform/bootstrap/intellij.platform.bootstrap.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/build-scripts/intellij.platform.buildScripts.iml" filepath="$PROJECT_DIR$/platform/build-scripts/intellij.platform.buildScripts.iml" />
aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
+1 -1
View File
@@ -8,7 +8,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="library" exported="" name="http-client" level="project" />
<orderEntry type="library" exported="" name="commons-logging" level="project" />
<orderEntry type="library" exported="" name="Slf4j" level="project" />
intellij.idea.community.main.iml
+1 -1
View File
@@ -9,7 +9,7 @@
<orderEntry type="module" module-name="intellij.ant" />
<orderEntry type="module" module-name="intellij.platform.boot" />
<orderEntry type="module" module-name="intellij.platform.bootstrap" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.java.compiler.impl" />
<orderEntry type="module" module-name="intellij.java.compiler" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" />
jetCheck/intellij.tools.jetCheck.iml
+1 -1
View File
@@ -9,7 +9,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.util" scope="RUNTIME" />
</component>
</module>
jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml
+1 -1
View File
@@ -7,7 +7,7 @@
</content>
<orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.util.rt" />
<orderEntry type="library" name="Log4J" level="project" />
<orderEntry type="library" name="protobuf" level="project" />
jps/model-api/intellij.platform.jps.model.iml
+1 -1
View File
@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.util" />
</component>
</module>
platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml
+1 -1
View File
@@ -8,7 +8,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
<orderEntry type="library" exported="" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
<orderEntry type="module" module-name="intellij.platform.util" exported="" />
<orderEntry type="module" module-name="intellij.platform.indexing" exported="" />
platform/editor-ui-api/intellij.platform.editor.iml
+1 -1
View File
@@ -9,7 +9,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="module" module-name="intellij.platform.indexing" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
platform/editor-ui-ex/intellij.platform.editor.ex.iml
+1 -1
View File
@@ -9,7 +9,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.editor" exported="" />
<orderEntry type="module" module-name="intellij.platform.util" exported="" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
<orderEntry type="library" exported="" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
<orderEntry type="module" module-name="intellij.platform.indexing.impl" />
<orderEntry type="module" module-name="intellij.platform.projectModel" />
platform/external-system-api/intellij.platform.externalSystem.iml
+1 -1
View File
@@ -8,7 +8,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
<orderEntry type="library" exported="" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="module" module-name="intellij.platform.ide" />
platform/external-system-rt/intellij.platform.externalSystem.rt.iml
+1 -1
View File
@@ -7,6 +7,6 @@
</content>
<orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
</component>
</module>
platform/smRunner/intellij.platform.smRunner.iml
+1 -1
View File
@@ -13,7 +13,7 @@
<orderEntry type="module" module-name="intellij.platform.debugger" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="library" exported="" name="tcServiceMessages" level="project" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="library" scope="TEST" name="Mocks" level="project" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.lang" />
platform/util-rt/intellij.platform.util.rt.iml
+1 -1
View File
@@ -10,6 +10,6 @@
</content>
<orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
</component>
</module>
platform/util/intellij.platform.util.iml
+1 -1
View File
@@ -16,7 +16,7 @@
<orderEntry type="library" name="Log4J" level="project" />
<orderEntry type="library" exported="" name="Trove4j" level="project" />
<orderEntry type="module" module-name="intellij.platform.resources.en" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
<orderEntry type="library" exported="" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.util.rt" exported="" />
<orderEntry type="library" name="jna" level="project" />
<orderEntry type="library" name="OroMatcher" level="project" />
platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml
+1 -1
View File
@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.editor" />
<orderEntry type="module" module-name="intellij.platform.diff" />
platform/vcs-log/graph-api/intellij.platform.vcs.log.graph.iml
+1 -1
View File
@@ -8,6 +8,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.util.rt" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
</component>
</module>
plugins/coverage-common/intellij.platform.coverage.iml
+1 -1
View File
@@ -11,7 +11,7 @@
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="module" module-name="intellij.platform.extensions" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="library" exported="" name="ASM" level="project" />
<orderEntry type="library" exported="" name="intellij-coverage" level="project" />
<orderEntry type="library" exported="" name="intellij-test-discovery" level="project" />
plugins/eclipse/intellij.eclipse.iml
+1 -1
View File
@@ -18,7 +18,7 @@
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.compiler" />
<orderEntry type="module" module-name="intellij.java.ui" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.java.impl" />
<orderEntry type="module" module-name="intellij.eclipse.jps" />
<orderEntry type="module" module-name="intellij.eclipse.common" />
plugins/git4idea/rt/intellij.vcs.git.rt.iml
+1 -1
View File
@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.util.rt" />
<orderEntry type="library" name="trilead-ssh2" level="project" />
<orderEntry type="library" name="XmlRPC" level="project" />
plugins/gradle/native/tooling/intellij.gradle.native.tooling.iml
+1 -1
View File
@@ -8,7 +8,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.gradle.toolingExtension" />
<orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
<orderEntry type="library" name="Gradle" level="project" />
plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml
+1 -1
View File
@@ -8,7 +8,7 @@
<orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.externalSystem.rt" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="library" exported="" name="Slf4j" level="project" />
<orderEntry type="library" exported="" name="Gradle" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Groovy" level="project" />
plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
+1 -1
View File
@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.externalSystem.rt" />
<orderEntry type="module" module-name="intellij.gradle.toolingExtension" />
<orderEntry type="library" name="Gradle" level="project" />
plugins/groovy/groovy-psi/intellij.groovy.psi.iml
+1 -1
View File
@@ -18,7 +18,7 @@
<orderEntry type="module" module-name="intellij.java.impl" />
<orderEntry type="module" module-name="intellij.platform.core.impl" />
<orderEntry type="module" module-name="intellij.platform.extensions" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.xml.psi.impl" />
<orderEntry type="module" module-name="intellij.platform.editor.ex" />
<orderEntry type="module" module-name="intellij.java.analysis.impl" />
plugins/properties/intellij.properties.iml
+1 -1
View File
@@ -12,7 +12,7 @@
<orderEntry type="module" module-name="intellij.platform.ide" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.spellchecker" />
<orderEntry type="module" module-name="intellij.java.resources" scope="TEST" />
plugins/stats-collector/log-events/intellij.statsCollector.logEvents.iml
+1 -1
View File
@@ -11,7 +11,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="gson" level="project" />
<orderEntry type="module" module-name="intellij.platform.annotations" />
<orderEntry type="library" name="jetbrains-annotations" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
</component>
plugins/xpath/intellij.xpath.iml
+1 -1
View File
@@ -17,7 +17,7 @@
<orderEntry type="module" module-name="intellij.xml.impl" />
<orderEntry type="module" module-name="intellij.xslt.debugger.rt" />
<orderEntry type="module" module-name="intellij.platform.lvcs.impl" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" />
<orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="library" name="Jaxen" level="project" />
<orderEntry type="module" module-name="intellij.java.resources.en" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
xml/xml-analysis-api/intellij.xml.analysis.iml
+1 -1
View File
@@ -9,7 +9,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.xml.psi" exported="" />
<orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
<orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
<orderEntry type="library" exported="" name="jetbrains-annotations-java5" level="project" />
<orderEntry type="module" module-name="intellij.platform.core" exported="" />
<orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
<orderEntry type="module" module-name="intellij.platform.util" exported="" />