Use script-runtime properly in IDEA project:

use it from the installed plugin for dependent modules (frontend)
use it from bootstrap in the plugin being built
also drop unused daemon-client from the plugin

This makes it consistent with ant build and allow building idea project
without prior ant dist
This commit is contained in:
Ilya Chernikov
2017-04-14 13:22:10 +02:00
parent 2360d5f330
commit ea71d57808
3 changed files with 1 additions and 4 deletions
+1 -2
View File
@@ -92,8 +92,7 @@
<element id="archive" name="noarg-ide-plugin.jar">
<element id="module-output" name="noarg-ide" />
</element>
<element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-daemon-client.jar" />
<element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-script-runtime.jar" />
<element id="file-copy" path="$PROJECT_DIR$/dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-script-runtime.jar" />
<element id="archive" name="sam-with-receiver-compiler-plugin.jar">
<element id="module-output" name="sam-with-receiver-cli" />
</element>
-1
View File
@@ -22,7 +22,6 @@
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="annotation-collector" />
<orderEntry type="module" module-name="builtins-serializer" />
<orderEntry type="module" module-name="script.runtime" />
<orderEntry type="module" module-name="frontend.script" />
</component>
</module>
-1
View File
@@ -16,7 +16,6 @@
<orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
<orderEntry type="module" module-name="resolution" exported="" />
<orderEntry type="library" exported="" name="kotlin-script-runtime" level="project" />
<orderEntry type="module" module-name="script.runtime" />
<orderEntry type="library" name="javaslang" level="project" />
</component>
</module>