Switch to latest conreactor, update Kotlin runtime libs.

This commit is contained in:
Fedor Isakov 2018-03-05 15:06:01 +01:00
parent eb11b1f933
commit b052790f8c
5 changed files with 110 additions and 110 deletions

112
build.xml
View File

@ -121,8 +121,8 @@
<library jar="lib/conreactor-api-0.9.jar" />
<library jar="lib/conreactor-core-0.9.jar" />
<library jar="lib/trove4j-3.0.3.jar" />
<library jar="lib/kotlin-runtime-1.1.4.jar" />
<library jar="lib/kotlin-stdlib-1.1.4.jar" />
<library jar="lib/kotlin-runtime-1.2.30.jar" />
<library jar="lib/kotlin-stdlib-1.2.30.jar" />
<classpath>
<entry path="." />
</classpath>
@ -940,8 +940,8 @@
<library jar="../lib/conreactor-api-0.9.jar" />
<library jar="../lib/conreactor-core-0.9.jar" />
<library jar="../../../tests/lib/trove4j-3.0.3.jar" />
<library jar="../lib/kotlin-runtime-1.1.4.jar" />
<library jar="../lib/kotlin-stdlib-1.1.4.jar" />
<library jar="../lib/kotlin-runtime-1.2.30.jar" />
<library jar="../lib/kotlin-stdlib-1.2.30.jar" />
<classpath>
<entry path="." />
</classpath>
@ -1531,13 +1531,13 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@ -1582,13 +1582,13 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@ -1625,13 +1625,13 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
</classpath>
</javac>
@ -1663,8 +1663,8 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
<fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
@ -1672,7 +1672,7 @@
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
</classpath>
</javac>
@ -1711,13 +1711,13 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@ -1776,13 +1776,13 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@ -1835,8 +1835,8 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
@ -1844,7 +1844,7 @@
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@ -1893,8 +1893,8 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
@ -1902,7 +1902,7 @@
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@ -1942,13 +1942,13 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
</classpath>
@ -1988,8 +1988,8 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
@ -1997,7 +1997,7 @@
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@ -2048,8 +2048,8 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
@ -2057,7 +2057,7 @@
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@ -2114,8 +2114,8 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
@ -2125,7 +2125,7 @@
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@ -2176,8 +2176,8 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
@ -2185,7 +2185,7 @@
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
@ -2231,8 +2231,8 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
@ -2240,7 +2240,7 @@
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
@ -2279,7 +2279,7 @@
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@ -2331,13 +2331,13 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@ -2398,8 +2398,8 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
<fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
@ -2408,7 +2408,7 @@
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@ -2464,8 +2464,8 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.4.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
@ -2475,7 +2475,7 @@
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />

View File

@ -23,9 +23,9 @@ task downloadReactor {
ant.mkdir(dir: 'lib')
def url = 'https://github.com/fisakov/conreactor/releases/download'
ant.get(src: "${url}/${conreactorTag}/conreactor-api-${conreactorVersion}.jar",
dest: 'lib', usetimestamp: 'true', skipexisting: 'true')
dest: 'lib', usetimestamp: 'true', skipexisting: 'false')
ant.get(src: "${url}/${conreactorTag}/conreactor-core-${conreactorVersion}.jar",
dest: 'lib', usetimestamp: 'true', skipexisting: 'true')
dest: 'lib', usetimestamp: 'true', skipexisting: 'false')
}
task copyDependencies (type: Copy, dependsOn: downloadReactor) {

View File

@ -1,5 +1,5 @@
kotlinVersion = 1.1.4
kotlinVersion = 1.2.30
trove4jVersion = 3.0.3
dexxVersion = 0.7
conreactorVersion = 0.9
conreactorTag = v0.9-snapshot.6
conreactorTag = v0.9-snapshot.7

View File

@ -12,8 +12,8 @@
<stubModelEntry path="${module}/lib/conreactor-api-0.9.jar" />
<stubModelEntry path="${module}/lib/conreactor-core-0.9.jar" />
<stubModelEntry path="${module}/lib/trove4j-3.0.3.jar" />
<stubModelEntry path="${module}/lib/kotlin-runtime-1.1.4.jar" />
<stubModelEntry path="${module}/lib/kotlin-stdlib-1.1.4.jar" />
<stubModelEntry path="${module}/lib/kotlin-runtime-1.2.30.jar" />
<stubModelEntry path="${module}/lib/kotlin-stdlib-1.2.30.jar" />
</stubModelEntries>
<sourcePath />
<dependencies>

View File

@ -520,50 +520,6 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="65oFETaV2Um" role="3bR37C">
<node concept="1BurEX" id="65oFETaV2Un" role="1SiIV1">
<node concept="398BVA" id="65oFETaV2Ua" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="65oFETaV2Ub" role="iGT6I">
<property role="2Ry0Am" value="logic" />
<node concept="2Ry0Ak" id="65oFETaV2Uc" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="65oFETaV2Ud" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
<node concept="2Ry0Ak" id="65oFETaV2Ue" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="65oFETaV2Uf" role="2Ry0An">
<property role="2Ry0Am" value="kotlin-runtime-1.1.4.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="65oFETaV2U$" role="3bR37C">
<node concept="1BurEX" id="65oFETaV2U_" role="1SiIV1">
<node concept="398BVA" id="65oFETaV2Uo" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="65oFETaV2Up" role="iGT6I">
<property role="2Ry0Am" value="logic" />
<node concept="2Ry0Ak" id="65oFETaV2Uq" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="65oFETaV2Ur" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
<node concept="2Ry0Ak" id="65oFETaV2Us" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="65oFETaV2Ut" role="2Ry0An">
<property role="2Ry0Am" value="kotlin-stdlib-1.1.4.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMp$6" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMp$7" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMp$8" role="3LXTna">
@ -582,6 +538,50 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="2D8WQQliKxH" role="3bR37C">
<node concept="1BurEX" id="2D8WQQliKxI" role="1SiIV1">
<node concept="398BVA" id="2D8WQQliKxx" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="2D8WQQliKxy" role="iGT6I">
<property role="2Ry0Am" value="logic" />
<node concept="2Ry0Ak" id="2D8WQQliKxz" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2D8WQQliKx$" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
<node concept="2Ry0Ak" id="2D8WQQliKx_" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="2D8WQQliKxA" role="2Ry0An">
<property role="2Ry0Am" value="kotlin-runtime-1.2.30.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="2D8WQQliKxV" role="3bR37C">
<node concept="1BurEX" id="2D8WQQliKxW" role="1SiIV1">
<node concept="398BVA" id="2D8WQQliKxJ" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="2D8WQQliKxK" role="iGT6I">
<property role="2Ry0Am" value="logic" />
<node concept="2Ry0Ak" id="2D8WQQliKxL" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2D8WQQliKxM" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
<node concept="2Ry0Ak" id="2D8WQQliKxN" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="2D8WQQliKxO" role="2Ry0An">
<property role="2Ry0Am" value="kotlin-stdlib-1.2.30.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="7Ant4WkHLpc" role="3989C9">
@ -2064,7 +2064,7 @@
</node>
</node>
<node concept="3yLZsm" id="4EvsDTBGxZx" role="3yL2VB">
<property role="3yLZsk" value="../lib/kotlin-runtime-1.1.4.jar" />
<property role="3yLZsk" value="../lib/kotlin-runtime-1.2.30.jar" />
<node concept="398BVA" id="4EvsDTBGxZy" role="3yLZsn">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="4EvsDTBGxZz" role="iGT6I">
@ -2076,7 +2076,7 @@
<node concept="2Ry0Ak" id="4EvsDTBGxZA" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="4EvsDTBGxZB" role="2Ry0An">
<property role="2Ry0Am" value="kotlin-runtime-1.1.4.jar" />
<property role="2Ry0Am" value="kotlin-runtime-1.2.30.jar" />
</node>
</node>
</node>
@ -2085,7 +2085,7 @@
</node>
</node>
<node concept="3yLZsm" id="4EvsDTBGxZC" role="3yL2VB">
<property role="3yLZsk" value="../lib/kotlin-stdlib-1.1.4.jar" />
<property role="3yLZsk" value="../lib/kotlin-stdlib-1.2.30.jar" />
<node concept="398BVA" id="4EvsDTBGxZD" role="3yLZsn">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="4EvsDTBGxZE" role="iGT6I">
@ -2097,7 +2097,7 @@
<node concept="2Ry0Ak" id="4EvsDTBGxZH" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="4EvsDTBGxZI" role="2Ry0An">
<property role="2Ry0Am" value="kotlin-stdlib-1.1.4.jar" />
<property role="2Ry0Am" value="kotlin-stdlib-1.2.30.jar" />
</node>
</node>
</node>