part of external-system-api module which is used in gradle-tooling process classpath extracted to a separate module (external-system-rt)

This commit is contained in:
nik
2015-12-08 18:23:44 +03:00
parent bb1129067a
commit a852c05b9b
11 changed files with 22 additions and 4 deletions
+1
View File
@@ -88,6 +88,7 @@
<module fileurl="file://$PROJECT_DIR$/platform/extensions/extensions.iml" filepath="$PROJECT_DIR$/platform/extensions/extensions.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/external-system-api/external-system-api.iml" filepath="$PROJECT_DIR$/platform/external-system-api/external-system-api.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/external-system-impl/external-system-impl.iml" filepath="$PROJECT_DIR$/platform/external-system-impl/external-system-impl.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/external-system-rt/external-system-rt.iml" filepath="$PROJECT_DIR$/platform/external-system-rt/external-system-rt.iml" group="platform"/>
<module fileurl="file://$PROJECT_DIR$/java/compiler/forms-compiler/forms-compiler.iml" filepath="$PROJECT_DIR$/java/compiler/forms-compiler/forms-compiler.iml" group="java/compiler" />
<module fileurl="file://$PROJECT_DIR$/platform/forms_rt/forms_rt.iml" filepath="$PROJECT_DIR$/platform/forms_rt/forms_rt.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/plugins/git4idea/git4idea.iml" filepath="$PROJECT_DIR$/plugins/git4idea/git4idea.iml" group="plugins/VCS" />
+2
View File
@@ -44,6 +44,8 @@
1.8 => redist/annotations-java8.jar
1.3 => plugins/junit/lib/junit-rt.jar
1.6 => lib/external-system-rt.jar
1.6 => plugins/gradle/lib/gradle-tooling-extension-api.jar
1.6 => plugins/gradle/lib/gradle-tooling-extension-impl.jar
+2
View File
@@ -181,6 +181,8 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
jar("extensions.jar") { module("extensions")}
jar("external-system-rt.jar") { module("external-system-rt")}
jar([name: "idea.jar", duplicate: "preserve"]) {
implementationModules.each { module it}
}
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -14,5 +14,6 @@
<orderEntry type="module" module-name="platform-api" />
<orderEntry type="module" module-name="lang-api" />
<orderEntry type="module" module-name="compiler-openapi" />
<orderEntry type="module" module-name="external-system-rt" exported="" />
</component>
</module>
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="annotations" />
</component>
</module>
@@ -495,7 +495,7 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
@Override
public Set<Class> getToolingExtensionsClasses() {
return ContainerUtil.<Class>set(
// externalSystem api jar
// external-system-rt.jar
ExternalSystemSourceType.class,
// gradle-tooling-extension-api jar
ProjectImportAction.class,
@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="external-system-api" />
<orderEntry type="module" module-name="external-system-rt" />
<orderEntry type="module" module-name="annotations" />
<orderEntry type="module" module-name="testFramework" scope="TEST" />
<orderEntry type="module" module-name="testFramework-java" scope="TEST" />
@@ -10,7 +10,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="annotations" />
<orderEntry type="module" module-name="external-system-api" />
<orderEntry type="module" module-name="external-system-rt" />
<orderEntry type="module" module-name="gradle-tooling-extension-api" />
<orderEntry type="module" module-name="gradle" scope="TEST" />
<orderEntry type="module" module-name="testFramework" scope="TEST" />