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

Removed Android dependencies from core modules

Browse Source
This commit is contained in:
Yan Zhulanow
2015-02-18 17:39:55 +03:00
parent 17bdcfe03f
commit 7423e30065
4 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli.iml
+1 -2
View File
@@ -19,6 +19,5 @@
<orderEntry type="module" module-name="serialization" />
<orderEntry type="module" module-name="serialization.jvm" />
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="android-compiler-plugin" />
</component>
</module>
</module>
compiler/tests/compiler-tests.iml
+1 -2
View File
@@ -21,7 +21,6 @@
<orderEntry type="module" module-name="js.tests" />
<orderEntry type="module" module-name="preloader" />
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="frontend.android" scope="TEST" />
<orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
</component>
</module>
</module>
idea/idea.iml
-2
View File
@@ -38,13 +38,11 @@
<orderEntry type="module" module-name="serialization.jvm" />
<orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
<orderEntry type="module" module-name="eval4j" />
<orderEntry type="library" name="android" level="project" />
<orderEntry type="module" module-name="idea-analysis" exported="" />
<orderEntry type="module" module-name="kotlin-android-plugin" />
<orderEntry type="module" module-name="js.frontend" />
<orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
<orderEntry type="module" module-name="util" />
<orderEntry type="library" name="android_tests" level="project" />
<orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
<orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
</component>
jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
-1
View File
@@ -66,7 +66,6 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind
import org.jetbrains.jps.builders.java.dependencyView.Mappings
import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import org.jetbrains.jps.model.module.JpsModule
import org.jetbrains.jps.android.AndroidJpsUtil
import org.jetbrains.kotlin.utils.sure
import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider