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

build scripts: remove dependency on Kotlin library

Browse Source 
Build scripts dynamically add Kotlin compiler JARs into classpath so if a build scripts module depends on KotlinJavaRuntime library it may end up with Kotlin JARs from two different version of Kotlin in classpath and compilation may fail (IDEA-177205). To fix the problem Kotlin files were extracted into a separate 'images-build-scripts' module and KotlinJavaRuntime library was removed from dependencies of build script modules. This won't be needed when we change build scripts to start compilation in a separate process.
This commit is contained in:
nik
2017-08-08 18:09:32 +03:00
parent 18c7e291bf
commit d7b9f38d19
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+1
View File
@@ -119,6 +119,7 @@
<module fileurl="file://$PROJECT_DIR$/java/idea-ui/idea-ui.iml" filepath="$PROJECT_DIR$/java/idea-ui/idea-ui.iml" group="java" />
<module fileurl="file://$PROJECT_DIR$/java/idea-ui/idea-ui-tests.iml" filepath="$PROJECT_DIR$/java/idea-ui/idea-ui-tests.iml"/>
<module fileurl="file://$PROJECT_DIR$/images/images.iml" filepath="$PROJECT_DIR$/images/images.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/build-scripts/icons/images-build-scripts.iml" filepath="$PROJECT_DIR$/platform/build-scripts/icons/images-build-scripts.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/indexing-api/indexing-api.iml" filepath="$PROJECT_DIR$/platform/indexing-api/indexing-api.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/indexing-impl/indexing-impl.iml" filepath="$PROJECT_DIR$/platform/indexing-impl/indexing-impl.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/instant-run/instant-run-annotations/instant-run-annotations.iml" filepath="$PROJECT_DIR$/android/tools-base/instant-run/instant-run-annotations/instant-run-annotations.iml" group="android/sdktools/instant-run" />
community-main.iml
+1
View File
@@ -122,6 +122,7 @@
<orderEntry type="module" module-name="terminal" />
<orderEntry type="module" module-name="javac-ref-scanner-8" scope="RUNTIME" />
<orderEntry type="module" module-name="platform-build-scripts" scope="TEST" />
<orderEntry type="module" module-name="images-build-scripts" scope="TEST" />
<orderEntry type="module" module-name="android-plugin" />
<orderEntry type="module" module-name="stats-collector" />
<orderEntry type="module" module-name="jetCheck" scope="TEST" />
platform/build-scripts/icons/images-build-scripts.iml
+18
View File
@@ -0,0 +1,18 @@
<?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$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="jps-model-api" />
<orderEntry type="module" module-name="jps-model-impl" />
<orderEntry type="module" module-name="jps-model-serialization" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="module" module-name="util" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
</component>
</module>
platform/build-scripts/platform-build-scripts.iml
-3
View File
@@ -4,8 +4,6 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/groovy" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/icons/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/icons/tests" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
@@ -36,7 +34,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
</component>
</module>