natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update kotlin to the latest beta, make all dependencies on kotlin "compile"

This commit is contained in:
Fedor Isakov 2015-12-07 16:50:24 +01:00
parent fc49da63d8
commit 1ce311a0bf
7 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
reactor/.idea/codeStyleSettings.xml Normal file
View File

@ -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>

4
reactor/.idea/libraries/com_github_andrewoma_dexx_dexx_collections_0_2.xml
View File

@ -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>

8
reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_2423.xml → reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_3595.xml
View File

@ -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>

11
reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_2423.xml
View File

@ -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>

13
reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_3595.xml Normal file
View File

@ -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>

3
reactor/Core/Core.iml
View File

@ -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>

4
reactor/Test/Test.iml
View File

@ -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>