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

Extract util.runtime module out of util

Browse Source 
Cleanup module dependencies: a lot of modules depended on 'frontend.java' just
to use something from 'util' module, exported by 'frontend.java', whereas they
really need nothing from 'frontend.java'. Also 'frontend.java' just exported
'util', not using anything from it.

Create a new 'util.runtime' module, which will be available at runtime. Make
'util' export 'util.runtime' and make all modules who needed these utils depend
on 'util' directly instead of 'frontend.java'
This commit is contained in:
Alexander Udalov
2013-09-17 19:26:32 +04:00
parent 15efeaba22
commit 8e59e789dc
21 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/artifacts/KotlinPlugin.xml
Generated
+1
View File
@@ -13,6 +13,7 @@
<element id="module-output" name="jet.as.java.psi" />
<element id="module-output" name="runtime" />
<element id="module-output" name="util" />
<element id="module-output" name="util.runtime" />
<element id="module-output" name="j2k" />
<element id="module-output" name="js.translator" />
<element id="module-output" name="cli-common" />
.idea/modules.xml
Generated
+2 -1
View File
@@ -31,8 +31,9 @@
<module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
<module fileurl="file://$PROJECT_DIR$/runtime/runtime.iml" filepath="$PROJECT_DIR$/runtime/runtime.iml" />
<module fileurl="file://$PROJECT_DIR$/compiler/frontend/serialization/serialization.iml" filepath="$PROJECT_DIR$/compiler/frontend/serialization/serialization.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/core/serialization.java/serialization.java.iml" filepath="$PROJECT_DIR$/core/serialization.java/serialization.java.iml" group="compiler/java" />
<module fileurl="file://$PROJECT_DIR$/core/serialization.java/serialization.java.iml" filepath="$PROJECT_DIR$/core/serialization.java/serialization.java.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
<module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
</modules>
</component>
</project>
build-tools/build-tools.iml
+1 -1
View File
@@ -9,7 +9,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="cli" />
<orderEntry type="module" module-name="frontend.java" />
<orderEntry type="module" module-name="runtime" />
<orderEntry type="module-library">
<library>
@@ -23,6 +22,7 @@
<orderEntry type="library" name="idea-full" level="project" />
<orderEntry type="module" module-name="frontend" />
<orderEntry type="module" module-name="backend" />
<orderEntry type="module" module-name="util" />
</component>
</module>
build.xml
+3
View File
@@ -32,6 +32,7 @@
<include name="compiler/cli/src"/>
<include name="compiler/cli/cli-common/src"/>
<include name="compiler/util/src"/>
<include name="core/util.runtime/src"/>
<!--<include name="j2k/src"/>-->
<include name="compiler/jet.as.java.psi/src"/>
@@ -51,6 +52,7 @@
<include name="cli/**"/>
<include name="cli-common/**"/>
<include name="util/**"/>
<include name="util.runtime/**"/>
<include name="jet.as.java.psi/**"/>
<include name="runtime/**"/>
@@ -136,6 +138,7 @@
<fileset dir="compiler/cli/src"/>
<fileset dir="j2k/src"/>
<fileset dir="compiler/util/src"/>
<fileset dir="core/util.runtime/src"/>
<fileset dir="compiler/jet.as.java.psi/src"/>
<fileset dir="runtime/src"/>
<fileset dir="js/js.translator/src"/>
compiler/android-tests/android-tests.iml
+1 -1
View File
@@ -11,10 +11,10 @@
<orderEntry type="library" name="idea-full" level="project" />
<orderEntry type="module" module-name="cli" />
<orderEntry type="module" module-name="compiler-tests" />
<orderEntry type="module" module-name="frontend.java" />
<orderEntry type="module" module-name="frontend" />
<orderEntry type="module" module-name="backend" />
<orderEntry type="library" name="jps-test" level="project" />
<orderEntry type="module" module-name="util" />
</component>
</module>
compiler/cli/cli.iml
+1
View File
@@ -17,6 +17,7 @@
<orderEntry type="library" name="jline" level="project" />
<orderEntry type="module" module-name="cli-common" exported="" />
<orderEntry type="module" module-name="descriptor.loader.java" />
<orderEntry type="module" module-name="util" />
</component>
</module>
compiler/frontend.java/frontend.java.iml
-1
View File
@@ -9,7 +9,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="frontend" />
<orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
<orderEntry type="module" module-name="util" exported="" />
<orderEntry type="module" module-name="runtime" />
<orderEntry type="library" name="javax.inject" level="project" />
<orderEntry type="module" module-name="serialization" />
compiler/frontend/serialization/serialization.iml
+1 -1
View File
@@ -13,7 +13,7 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="trove4j" level="project" />
<orderEntry type="library" name="intellij-core" level="project" />
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="util.runtime" />
</component>
</module>
compiler/jet.as.java.psi/jet.as.java.psi.iml
+1
View File
@@ -12,6 +12,7 @@
<orderEntry type="module" module-name="frontend.java" />
<orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
<orderEntry type="module" module-name="descriptor.loader.java" />
<orderEntry type="module" module-name="util" />
</component>
</module>
compiler/tests/compiler-tests.iml
+1
View File
@@ -19,6 +19,7 @@
<orderEntry type="module" module-name="serialization" />
<orderEntry type="module" module-name="serialization.java" />
<orderEntry type="module" module-name="descriptor.loader.java" />
<orderEntry type="module" module-name="util" />
</component>
</module>
compiler/util/util.iml
+1
View File
@@ -8,6 +8,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
<orderEntry type="module" module-name="util.runtime" exported="" />
</component>
</module>
compiler/util/src/org/jetbrains/jet/utils/DFS.java → core/util.runtime/src/org/jetbrains/jet/utils/DFS.java
View File
compiler/util/src/org/jetbrains/jet/utils/ExceptionUtils.java → core/util.runtime/src/org/jetbrains/jet/utils/ExceptionUtils.java
View File
compiler/util/src/org/jetbrains/jet/utils/NotNullMemoizedFunction.java → core/util.runtime/src/org/jetbrains/jet/utils/NotNullMemoizedFunction.java
View File
compiler/util/src/org/jetbrains/jet/utils/NullableMemoizedFunction.java → core/util.runtime/src/org/jetbrains/jet/utils/NullableMemoizedFunction.java
View File
compiler/util/src/org/jetbrains/jet/utils/WrappedValues.java → core/util.runtime/src/org/jetbrains/jet/utils/WrappedValues.java
View File
core/util.runtime/util.runtime.iml
+13
View File
@@ -0,0 +1,13 @@
<?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="library" scope="PROVIDED" name="intellij-core" level="project" />
</component>
</module>
generators/generators.iml
+1
View File
@@ -20,6 +20,7 @@
<orderEntry type="module" module-name="descriptor.loader.java" scope="TEST" />
<orderEntry type="module" module-name="js.tests" scope="TEST" />
<orderEntry type="module" module-name="jps-plugin" scope="TEST" />
<orderEntry type="module" module-name="util" scope="TEST" />
</component>
</module>
idea/idea.iml
+1
View File
@@ -40,6 +40,7 @@
<orderEntry type="module" module-name="serialization.java" />
<orderEntry type="module" module-name="descriptor.loader.java" />
<orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
<orderEntry type="module" module-name="util" />
</component>
</module>
injector-generator/injector-generator.iml
+1 -1
View File
@@ -8,10 +8,10 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="frontend" />
<orderEntry type="module" module-name="frontend.java" />
<orderEntry type="library" name="intellij-core" level="project" />
<orderEntry type="library" name="javax.inject" level="project" />
<orderEntry type="module" module-name="backend" />
<orderEntry type="module" module-name="util" />
</component>
</module>
js/js.tests/js.tests.iml
+1 -1
View File
@@ -14,8 +14,8 @@
<orderEntry type="module" module-name="cli" />
<orderEntry type="library" name="intellij-core" level="project" />
<orderEntry type="library" name="idea-full" level="project" />
<orderEntry type="module" module-name="frontend.java" />
<orderEntry type="library" name="js-libs" level="project" />
<orderEntry type="module" module-name="util" />
</component>
</module>