From 98d900e7d54d3c1da119af8137499565062259c8 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 18 Mar 2015 19:37:06 +0100
Subject: remove unused library; split kotlin-compiler and kotlin-plugin
 libraries; fix Dokka artifact

---
 .idea/artifacts/dokka_jar.xml       |   1 +
 .idea/libraries/idea_markdown.xml   |   9 ---
 .idea/libraries/kotlin_compiler.xml |   1 -
 .idea/libraries/kotlin_plugin.xml   | 134 ++++++++++++++++++++++++++++++++++++
 resources/META-INF/MANIFEST.MF      |   1 +
 5 files changed, 136 insertions(+), 10 deletions(-)
 delete mode 100644 .idea/libraries/idea_markdown.xml
 create mode 100644 .idea/libraries/kotlin_plugin.xml

diff --git a/.idea/artifacts/dokka_jar.xml b/.idea/artifacts/dokka_jar.xml
index fd03fd07..6ee7df3e 100644
--- a/.idea/artifacts/dokka_jar.xml
+++ b/.idea/artifacts/dokka_jar.xml
@@ -7,6 +7,7 @@
       <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-compiler.jar" path-in-jar="/" />
       <element id="module-output" name="ant" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/markdown.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/jsoup-1.8.1.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/idea_markdown.xml b/.idea/libraries/idea_markdown.xml
deleted file mode 100644
index d2fae338..00000000
--- a/.idea/libraries/idea_markdown.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="idea-markdown">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/idea-markdown.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlin_compiler.xml b/.idea/libraries/kotlin_compiler.xml
index 82dac0f8..d3199a12 100644
--- a/.idea/libraries/kotlin_compiler.xml
+++ b/.idea/libraries/kotlin_compiler.xml
@@ -2,7 +2,6 @@
   <library name="kotlin-compiler">
     <CLASSES>
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-compiler.jar!/" />
-      <root url="jar://$KOTLIN_PLUGIN$/lib/kotlin-plugin.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/kotlin_plugin.xml b/.idea/libraries/kotlin_plugin.xml
new file mode 100644
index 00000000..e2975946
--- /dev/null
+++ b/.idea/libraries/kotlin_plugin.xml
@@ -0,0 +1,134 @@
+<component name="libraryTable">
+  <library name="kotlin-plugin">
+    <CLASSES>
+      <root url="jar://$KOTLIN_PLUGIN$/lib/kotlin-plugin.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$PROJECT_DIR$/../kotlin/js/js.tests/test" />
+      <root url="file://$PROJECT_DIR$/../kotlin/js/js.dart-ast/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/js/js.translator/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/j2k/tests/test" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/descriptors/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/runtime.jvm/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/util.runtime/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/serialization/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/serialization.java/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/descriptor.loader.java/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/docs/exPuzzlers/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/idea/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/idea/tests" />
+      <root url="file://$PROJECT_DIR$/../kotlin/eval4j/test" />
+      <root url="file://$PROJECT_DIR$/../kotlin/grammar/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/cli-common/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/util/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/tests" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/instrumentation/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/tests" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/android-module/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend.java/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend-common/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/jet.as.java.psi/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/integration-tests/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/runtime/target/copied-sources" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/main/kotlin" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Lib/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Android/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/kotlinJavaProject/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-js-tests-junit/src/test/kotlin" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-classpath/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-helloworld/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/generated" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/simpleProject/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/generated" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/examples/kotlin-java-example/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/generators/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/generators/tests" />
+      <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/test" />
+      <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/kannotator-jps-plugin-test/test" />
+      <root url="file://$PROJECT_DIR$/../kotlin/dependencies/download/asm-src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/injector-generator/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/ide-compiler-runner/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/js/js.tests/test" />
+      <root url="file://$PROJECT_DIR$/../kotlin/js/js.dart-ast/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/js/js.translator/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/j2k/tests/test" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/descriptors/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/runtime.jvm/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/util.runtime/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/serialization/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/serialization.java/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/core/descriptor.loader.java/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/docs/exPuzzlers/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/idea/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/idea/tests" />
+      <root url="file://$PROJECT_DIR$/../kotlin/eval4j/test" />
+      <root url="file://$PROJECT_DIR$/../kotlin/grammar/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/cli-common/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/util/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/tests" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/instrumentation/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/tests" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/android-module/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend.java/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend-common/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/jet.as.java.psi/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/compiler/integration-tests/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/runtime/target/copied-sources" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/main/kotlin" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Lib/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Android/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/kotlinJavaProject/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-js-tests-junit/src/test/kotlin" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-classpath/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-helloworld/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/generated" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/simpleProject/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/generated" />
+      <root url="file://$PROJECT_DIR$/../kotlin/libraries/examples/kotlin-java-example/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../kotlin/generators/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/generators/tests" />
+      <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/test" />
+      <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/kannotator-jps-plugin-test/test" />
+      <root url="file://$PROJECT_DIR$/../kotlin/dependencies/download/asm-src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/injector-generator/src" />
+      <root url="file://$PROJECT_DIR$/../kotlin/ide-compiler-runner/src" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/resources/META-INF/MANIFEST.MF b/resources/META-INF/MANIFEST.MF
index 5801d0d3..78fabddc 100644
--- a/resources/META-INF/MANIFEST.MF
+++ b/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,4 @@
 Manifest-Version: 1.0
+Class-Path: kotlin-plugin.jar
 Main-Class: org.jetbrains.dokka.DokkaPackage
 
-- 
cgit