From 1ce311a0bf4ce40db47d59d19053916b204c94f8 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 7 Dec 2015 16:50:24 +0100
Subject: [PATCH] Update kotlin to the latest beta, make all dependencies on
 kotlin "compile"

---
 reactor/.idea/codeStyleSettings.xml            | 18 ++++++++++++++++++
 ...hub_andrewoma_dexx_dexx_collections_0_2.xml |  4 +++-
 ..._kotlin_kotlin_runtime_1_0_0_beta_3595.xml} |  8 ++++----
 ...ns_kotlin_kotlin_stdlib_1_0_0_beta_2423.xml | 11 -----------
 ...ns_kotlin_kotlin_stdlib_1_0_0_beta_3595.xml | 13 +++++++++++++
 reactor/Core/Core.iml                          |  3 ++-
 reactor/Test/Test.iml                          |  4 ++--
 7 files changed, 42 insertions(+), 19 deletions(-)
 create mode 100644 reactor/.idea/codeStyleSettings.xml
 rename reactor/.idea/libraries/{org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_2423.xml => org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_3595.xml} (54%)
 delete mode 100644 reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_2423.xml
 create mode 100644 reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_3595.xml

diff --git a/reactor/.idea/codeStyleSettings.xml b/reactor/.idea/codeStyleSettings.xml
new file mode 100644
index 00000000..03a62570
--- /dev/null
+++ b/reactor/.idea/codeStyleSettings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <codeStyleSettings language="kotlin">
+          <indentOptions>
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+          </indentOptions>
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/com_github_andrewoma_dexx_dexx_collections_0_2.xml b/reactor/.idea/libraries/com_github_andrewoma_dexx_dexx_collections_0_2.xml
index 04a680e7..1b8a94ea 100644
--- a/reactor/.idea/libraries/com_github_andrewoma_dexx_dexx_collections_0_2.xml
+++ b/reactor/.idea/libraries/com_github_andrewoma_dexx_dexx_collections_0_2.xml
@@ -5,6 +5,8 @@
       <root url="jar://$MAVEN_REPOSITORY$/com/github/andrewoma/dexx/dexx-collections/0.2/dexx-collections-0.2.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/andrewoma/dexx/dexx-collections/0.2/dexx-collections-0.2-sources.jar!/" />
+    </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_2423.xml b/reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_3595.xml
similarity index 54%
rename from reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_2423.xml
rename to reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_3595.xml
index 46203338..7465f93b 100644
--- a/reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_2423.xml
+++ b/reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_3595.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
-  <library name="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-2423" type="repository">
-    <properties maven-id="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-2423" />
+  <library name="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" type="repository">
+    <properties maven-id="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-2423/kotlin-runtime-1.0.0-beta-2423.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-3595/kotlin-runtime-1.0.0-beta-3595.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-3595/kotlin-runtime-1.0.0-beta-3595-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_2423.xml b/reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_2423.xml
deleted file mode 100644
index 4607d026..00000000
--- a/reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_2423.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-2423" type="repository">
-    <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-2423" />
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../../../DotFolder/M2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-2423/kotlin-stdlib-1.0.0-beta-2423.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../../../DotFolder/M2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-2423/kotlin-runtime-1.0.0-beta-2423.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_3595.xml b/reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_3595.xml
new file mode 100644
index 00000000..013b12c8
--- /dev/null
+++ b/reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_3595.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" type="repository">
+    <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-3595/kotlin-stdlib-1.0.0-beta-3595.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-3595/kotlin-runtime-1.0.0-beta-3595.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-3595/kotlin-stdlib-1.0.0-beta-3595-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/reactor/Core/Core.iml b/reactor/Core/Core.iml
index 37a1f7f3..068042b9 100644
--- a/reactor/Core/Core.iml
+++ b/reactor/Core/Core.iml
@@ -8,8 +8,9 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="API" exported="" />
-    <orderEntry type="library" name="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-2423" level="project" />
     <orderEntry type="library" name="com.intellij:annotations:12.0" level="project" />
     <orderEntry type="library" name="com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
+    <orderEntry type="library" name="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" level="project" />
+    <orderEntry type="library" name="org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/reactor/Test/Test.iml b/reactor/Test/Test.iml
index 76f87b79..44be45ed 100644
--- a/reactor/Test/Test.iml
+++ b/reactor/Test/Test.iml
@@ -10,9 +10,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="junit:junit:4.12" level="project" />
     <orderEntry type="module" module-name="Core" scope="TEST" />
-    <orderEntry type="library" scope="RUNTIME" name="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-2423" level="project" />
-    <orderEntry type="library" name="org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-2423" level="project" />
     <orderEntry type="library" name="com.intellij:annotations:12.0" level="project" />
     <orderEntry type="library" name="com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
+    <orderEntry type="library" name="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" level="project" />
+    <orderEntry type="library" name="org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" level="project" />
   </component>
 </module>
\ No newline at end of file