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

Switch to the latest Kotlin RC 1050

This commit is contained in:
Fedor Isakov 2016-02-11 16:49:36 +01:00
parent d38373fc79
commit 6cfa569663
10 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_0_0_rc_1007.xml → reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_0_0_rc_1050.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1007">
<library name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1007/kotlin-compiler-1.0.0-rc-1007.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1050/kotlin-compiler-1.0.0-rc-1050.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1007/kotlin-compiler-1.0.0-rc-1007-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1050/kotlin-compiler-1.0.0-rc-1050-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1007/kotlin-compiler-1.0.0-rc-1007-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1050/kotlin-compiler-1.0.0-rc-1050-sources.jar!/" />
</SOURCES>
</library>
</component>

8
reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_0_0_rc_1007.xml → reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_0_0_rc_1050.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1007">
<library name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1007/kotlin-maven-plugin-1.0.0-rc-1007.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1050/kotlin-maven-plugin-1.0.0-rc-1050.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1007/kotlin-maven-plugin-1.0.0-rc-1007-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1050/kotlin-maven-plugin-1.0.0-rc-1050-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1007/kotlin-maven-plugin-1.0.0-rc-1007-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1050/kotlin-maven-plugin-1.0.0-rc-1050-sources.jar!/" />
</SOURCES>
</library>
</component>

8
reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0_rc_1007.xml → reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0_rc_1050.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1007">
<library name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1007/kotlin-runtime-1.0.0-rc-1007.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1050/kotlin-runtime-1.0.0-rc-1050.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1007/kotlin-runtime-1.0.0-rc-1007-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1050/kotlin-runtime-1.0.0-rc-1050-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1007/kotlin-runtime-1.0.0-rc-1007-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1050/kotlin-runtime-1.0.0-rc-1050-sources.jar!/" />
</SOURCES>
</library>
</component>

8
reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0_rc_1007.xml → reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0_rc_1050.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1007">
<library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1007/kotlin-stdlib-1.0.0-rc-1007.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1050/kotlin-stdlib-1.0.0-rc-1050.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1007/kotlin-stdlib-1.0.0-rc-1007-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1050/kotlin-stdlib-1.0.0-rc-1050-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1007/kotlin-stdlib-1.0.0-rc-1007-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1050/kotlin-stdlib-1.0.0-rc-1050-sources.jar!/" />
</SOURCES>
</library>
</component>

8
reactor/API/API.iml
View File

@ -9,9 +9,9 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@ -36,7 +36,7 @@
<orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
<orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
<orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />

8
reactor/Core/Core.iml
View File

@ -20,9 +20,9 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="code-1.0" level="project" />
<orderEntry type="module" module-name="API" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@ -47,7 +47,7 @@
<orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
<orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
<orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />

8
reactor/Reactor.iml
View File

@ -9,9 +9,9 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@ -36,7 +36,7 @@
<orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
<orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
<orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />

8
reactor/Test/Test.iml
View File

@ -23,9 +23,9 @@
<orderEntry type="module" module-name="Core" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@ -50,7 +50,7 @@
<orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1007" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050" level="project" />
<orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
<orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
<orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />

4
reactor/Test/src/program/MemProgram.kt
View File

@ -141,12 +141,10 @@ class ConstraintRegistry(val sessionSolver: SessionSolver) {
unmodifiableSet(myConstraintArgTypes.keys)
fun constraintArgTypes(symbol: ConstraintSymbol): List<Class<*>> =
unmodifiableList(myConstraintArgTypes.getOrImplicitDefault(symbol))
unmodifiableList(myConstraintArgTypes.getOrPut(symbol, { emptyList() }))
fun predicateSymbols(): Iterable<PredicateSymbol> =
unmodifiableSet(myPredicateSolvers.keys)
fun solverClass(symbol: PredicateSymbol): Class<out Queryable> =
myPredicateSolvers.getOrImplicitDefault(symbol)
}

2
reactor/pom.xml
View File

@ -8,7 +8,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kotlin.version>1.0.0-rc-1007</kotlin.version>
<kotlin.version>1.0.0-rc-1050</kotlin.version>
</properties>
<groupId>jetbrains.mps.logic.memreactor</groupId>