azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JPS: fixed duplicate meta.js in case of multiple source roots in the same module.

Browse Source
This commit is contained in:
Anton Bannykh
2017-02-02 16:50:01 +03:00
parent 289a7a9cc3
commit f0e3c87b84
8 changed files with 83 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.iml
Vendored
+12
View File
@@ -0,0 +1,12 @@
<?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" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="srcs" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.ipr
Vendored
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/srcs/srcs.iml" filepath="$PROJECT_DIR$/srcs/srcs.iml" />
<module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/src/Main.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
fun main() {
src()
src2()
}
jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src/Src.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
fun src() {
src2()
}
jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src2/Src2.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
fun src2() {
src()
}
jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/srcs.iml
Vendored
+12
View File
@@ -0,0 +1,12 @@
<?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$/src2" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>