Switch to latest release of constraints reactor lib. Update the dependency libs.
This commit is contained in:
Fedor Isakov
parent
26cd2c0416
commit
3ed8d2e375
90
build.xml
90
build.xml
|
|
@ -118,11 +118,12 @@
|
|||
<dependencies>
|
||||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
|
||||
</dependencies>
|
||||
<library jar="lib/kotlin-runtime-1.1.2.jar" />
|
||||
<library jar="lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<library jar="lib/collection-0.7.jar" />
|
||||
<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" />
|
||||
<classpath>
|
||||
<entry path="." />
|
||||
</classpath>
|
||||
|
|
@ -938,11 +939,12 @@
|
|||
<dependencies>
|
||||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
|
||||
</dependencies>
|
||||
<library jar="../lib/kotlin-runtime-1.1.2.jar" />
|
||||
<library jar="../lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<library jar="../lib/collection-0.7.jar" />
|
||||
<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="../../../tests/lib/kotlin-runtime-1.1.4.jar" />
|
||||
<library jar="../../../tests/lib/kotlin-stdlib-1.1.4.jar" />
|
||||
<classpath>
|
||||
<entry path="." />
|
||||
</classpath>
|
||||
|
|
@ -1521,11 +1523,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
|
|
@ -1571,11 +1574,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
|
|
@ -1613,11 +1617,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
|
|
@ -1650,11 +1655,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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.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" />
|
||||
|
|
@ -1697,11 +1703,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
|
|
@ -1761,11 +1768,12 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
|
|
@ -1814,11 +1822,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
|
|
@ -1857,11 +1866,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
|
|
@ -1902,11 +1912,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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}/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" />
|
||||
|
|
@ -1961,11 +1972,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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}/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" />
|
||||
|
|
@ -2026,11 +2038,12 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-test.jar" />
|
||||
<fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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}/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" />
|
||||
|
|
@ -2091,11 +2104,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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}/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" />
|
||||
|
|
@ -2144,11 +2158,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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}/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" />
|
||||
|
|
@ -2243,11 +2258,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
|
|
@ -2309,11 +2325,12 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.test" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-test.jar" />
|
||||
<fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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.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" />
|
||||
|
|
@ -2377,11 +2394,12 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-test.jar" />
|
||||
<fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<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}/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" />
|
||||
|
|
|
|||
|
|
@ -3050,14 +3050,19 @@
|
|||
<node concept="3uibUv" id="7K4Mb_J$cIC" role="1tU5fm">
|
||||
<ref role="3uigEE" to="yt73:~Substitution" resolve="Substitution" />
|
||||
</node>
|
||||
<node concept="2YIFZM" id="7K4Mb_J$cID" role="33vP2m">
|
||||
<ref role="1Pybhc" to="yt73:~Unification" resolve="Unification" />
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<node concept="37vLTw" id="7K4Mb_J$cIE" role="37wK5m">
|
||||
<ref role="3cqZAo" node="6GYQG_SpvAH" resolve="leftVal" />
|
||||
<node concept="2OqwBi" id="6OkhGGhHPa$" role="33vP2m">
|
||||
<node concept="10M0yZ" id="6OkhGGhHOO5" role="2Oq$k0">
|
||||
<ref role="3cqZAo" to="yt73:~Unification.INSTANCE" resolve="INSTANCE" />
|
||||
<ref role="1PxDUh" to="yt73:~Unification" resolve="Unification" />
|
||||
</node>
|
||||
<node concept="37vLTw" id="7K4Mb_J$cIF" role="37wK5m">
|
||||
<ref role="3cqZAo" node="6GYQG_SpvAJ" resolve="rightVal" />
|
||||
<node concept="liA8E" id="6OkhGGhHPxp" role="2OqNvi">
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<node concept="37vLTw" id="7K4Mb_J$cIE" role="37wK5m">
|
||||
<ref role="3cqZAo" node="6GYQG_SpvAH" resolve="leftVal" />
|
||||
</node>
|
||||
<node concept="37vLTw" id="7K4Mb_J$cIF" role="37wK5m">
|
||||
<ref role="3cqZAo" node="6GYQG_SpvAJ" resolve="rightVal" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -3408,19 +3413,24 @@
|
|||
<node concept="3uibUv" id="_oAIrg3tH2" role="1tU5fm">
|
||||
<ref role="3uigEE" to="yt73:~Substitution" resolve="Substitution" />
|
||||
</node>
|
||||
<node concept="2YIFZM" id="_oAIrg3tHd" role="33vP2m">
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<ref role="1Pybhc" to="yt73:~Unification" resolve="Unification" />
|
||||
<node concept="2ShNRf" id="_oAIrg3tHe" role="37wK5m">
|
||||
<node concept="1pGfFk" id="_oAIrg3tHf" role="2ShVmc">
|
||||
<ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
|
||||
<node concept="37vLTw" id="6HKur8$jCv_" role="37wK5m">
|
||||
<ref role="3cqZAo" node="7d$oK1$qfYd" resolve="leftRepr" />
|
||||
<node concept="2OqwBi" id="6OkhGGhHQGF" role="33vP2m">
|
||||
<node concept="10M0yZ" id="6OkhGGhHQxS" role="2Oq$k0">
|
||||
<ref role="3cqZAo" to="yt73:~Unification.INSTANCE" resolve="INSTANCE" />
|
||||
<ref role="1PxDUh" to="yt73:~Unification" resolve="Unification" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6OkhGGhHQRO" role="2OqNvi">
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<node concept="2ShNRf" id="_oAIrg3tHe" role="37wK5m">
|
||||
<node concept="1pGfFk" id="_oAIrg3tHf" role="2ShVmc">
|
||||
<ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
|
||||
<node concept="37vLTw" id="6HKur8$jCv_" role="37wK5m">
|
||||
<ref role="3cqZAo" node="7d$oK1$qfYd" resolve="leftRepr" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="37vLTw" id="_oAIrg3tHh" role="37wK5m">
|
||||
<ref role="3cqZAo" node="4U_yxogBZLC" resolve="rightVal" />
|
||||
<node concept="37vLTw" id="_oAIrg3tHh" role="37wK5m">
|
||||
<ref role="3cqZAo" node="4U_yxogBZLC" resolve="rightVal" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -3621,22 +3631,27 @@
|
|||
<node concept="3uibUv" id="_oAIrg3wr4" role="1tU5fm">
|
||||
<ref role="3uigEE" to="yt73:~Substitution" resolve="Substitution" />
|
||||
</node>
|
||||
<node concept="2YIFZM" id="_oAIrg3wr5" role="33vP2m">
|
||||
<ref role="1Pybhc" to="yt73:~Unification" resolve="Unification" />
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<node concept="2ShNRf" id="_oAIrg3wr6" role="37wK5m">
|
||||
<node concept="1pGfFk" id="_oAIrg3wr7" role="2ShVmc">
|
||||
<ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
|
||||
<node concept="37vLTw" id="6HKur8$jCK9" role="37wK5m">
|
||||
<ref role="3cqZAo" node="7d$oK1$rAnE" resolve="leftRepr" />
|
||||
<node concept="2OqwBi" id="6OkhGGhHRt9" role="33vP2m">
|
||||
<node concept="10M0yZ" id="6OkhGGhHRid" role="2Oq$k0">
|
||||
<ref role="3cqZAo" to="yt73:~Unification.INSTANCE" resolve="INSTANCE" />
|
||||
<ref role="1PxDUh" to="yt73:~Unification" resolve="Unification" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6OkhGGhHRCr" role="2OqNvi">
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<node concept="2ShNRf" id="_oAIrg3wr6" role="37wK5m">
|
||||
<node concept="1pGfFk" id="_oAIrg3wr7" role="2ShVmc">
|
||||
<ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
|
||||
<node concept="37vLTw" id="6HKur8$jCK9" role="37wK5m">
|
||||
<ref role="3cqZAo" node="7d$oK1$rAnE" resolve="leftRepr" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2ShNRf" id="_oAIrg3wRH" role="37wK5m">
|
||||
<node concept="1pGfFk" id="_oAIrg3wRI" role="2ShVmc">
|
||||
<ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
|
||||
<node concept="37vLTw" id="6HKur8$jD0Z" role="37wK5m">
|
||||
<ref role="3cqZAo" node="7d$oK1$rAnK" resolve="rightRepr" />
|
||||
<node concept="2ShNRf" id="_oAIrg3wRH" role="37wK5m">
|
||||
<node concept="1pGfFk" id="_oAIrg3wRI" role="2ShVmc">
|
||||
<ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
|
||||
<node concept="37vLTw" id="6HKur8$jD0Z" role="37wK5m">
|
||||
<ref role="3cqZAo" node="7d$oK1$rAnK" resolve="rightRepr" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -3774,14 +3789,19 @@
|
|||
<node concept="3uibUv" id="7K4Mb_J$cIW" role="1tU5fm">
|
||||
<ref role="3uigEE" to="yt73:~Substitution" resolve="Substitution" />
|
||||
</node>
|
||||
<node concept="2YIFZM" id="7K4Mb_J$cIX" role="33vP2m">
|
||||
<ref role="1Pybhc" to="yt73:~Unification" resolve="Unification" />
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<node concept="37vLTw" id="7K4Mb_J$cIY" role="37wK5m">
|
||||
<ref role="3cqZAo" node="6GYQG_SpvAT" resolve="leftVal" />
|
||||
<node concept="2OqwBi" id="6OkhGGhHULL" role="33vP2m">
|
||||
<node concept="10M0yZ" id="6OkhGGhHU$r" role="2Oq$k0">
|
||||
<ref role="3cqZAo" to="yt73:~Unification.INSTANCE" resolve="INSTANCE" />
|
||||
<ref role="1PxDUh" to="yt73:~Unification" resolve="Unification" />
|
||||
</node>
|
||||
<node concept="37vLTw" id="7K4Mb_J$cIZ" role="37wK5m">
|
||||
<ref role="3cqZAo" node="6GYQG_SpvAV" resolve="rightVal" />
|
||||
<node concept="liA8E" id="6OkhGGhHV2K" role="2OqNvi">
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<node concept="37vLTw" id="7K4Mb_J$cIY" role="37wK5m">
|
||||
<ref role="3cqZAo" node="6GYQG_SpvAT" resolve="leftVal" />
|
||||
</node>
|
||||
<node concept="37vLTw" id="7K4Mb_J$cIZ" role="37wK5m">
|
||||
<ref role="3cqZAo" node="6GYQG_SpvAV" resolve="rightVal" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -4007,19 +4027,24 @@
|
|||
<node concept="3uibUv" id="7K4Mb_J$cJW" role="1tU5fm">
|
||||
<ref role="3uigEE" to="yt73:~Substitution" resolve="Substitution" />
|
||||
</node>
|
||||
<node concept="2YIFZM" id="7K4Mb_J$cJX" role="33vP2m">
|
||||
<ref role="1Pybhc" to="yt73:~Unification" resolve="Unification" />
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<node concept="2OqwBi" id="6HKur8$jDgl" role="37wK5m">
|
||||
<node concept="37vLTw" id="6HKur8$jDgm" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="4U_yxogDnOj" resolve="leftRepr" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6HKur8$jDgn" role="2OqNvi">
|
||||
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
|
||||
</node>
|
||||
<node concept="2OqwBi" id="6OkhGGhHSln" role="33vP2m">
|
||||
<node concept="10M0yZ" id="6OkhGGhHS7n" role="2Oq$k0">
|
||||
<ref role="3cqZAo" to="yt73:~Unification.INSTANCE" resolve="INSTANCE" />
|
||||
<ref role="1PxDUh" to="yt73:~Unification" resolve="Unification" />
|
||||
</node>
|
||||
<node concept="37vLTw" id="7K4Mb_J$cJZ" role="37wK5m">
|
||||
<ref role="3cqZAo" node="4U_yxogC1Ei" resolve="rightVal" />
|
||||
<node concept="liA8E" id="6OkhGGhHS$E" role="2OqNvi">
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<node concept="2OqwBi" id="6HKur8$jDgl" role="37wK5m">
|
||||
<node concept="37vLTw" id="6HKur8$jDgm" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="4U_yxogDnOj" resolve="leftRepr" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6HKur8$jDgn" role="2OqNvi">
|
||||
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="37vLTw" id="7K4Mb_J$cJZ" role="37wK5m">
|
||||
<ref role="3cqZAo" node="4U_yxogC1Ei" resolve="rightVal" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -4295,23 +4320,28 @@
|
|||
<node concept="3uibUv" id="7K4Mb_J$cJw" role="1tU5fm">
|
||||
<ref role="3uigEE" to="yt73:~Substitution" resolve="Substitution" />
|
||||
</node>
|
||||
<node concept="2YIFZM" id="7K4Mb_J$cJx" role="33vP2m">
|
||||
<ref role="1Pybhc" to="yt73:~Unification" resolve="Unification" />
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<node concept="2OqwBi" id="6HKur8$jE$z" role="37wK5m">
|
||||
<node concept="37vLTw" id="6HKur8$jE$$" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="7d$oK1$nL7F" resolve="leftRepr" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6HKur8$jE$_" role="2OqNvi">
|
||||
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
|
||||
</node>
|
||||
<node concept="2OqwBi" id="6OkhGGhHTzD" role="33vP2m">
|
||||
<node concept="10M0yZ" id="6OkhGGhHTkA" role="2Oq$k0">
|
||||
<ref role="3cqZAo" to="yt73:~Unification.INSTANCE" resolve="INSTANCE" />
|
||||
<ref role="1PxDUh" to="yt73:~Unification" resolve="Unification" />
|
||||
</node>
|
||||
<node concept="2OqwBi" id="6HKur8$jFZg" role="37wK5m">
|
||||
<node concept="37vLTw" id="6HKur8$jFZh" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="7d$oK1$nLDN" resolve="rightRepr" />
|
||||
<node concept="liA8E" id="6OkhGGhHTN0" role="2OqNvi">
|
||||
<ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
|
||||
<node concept="2OqwBi" id="6HKur8$jE$z" role="37wK5m">
|
||||
<node concept="37vLTw" id="6HKur8$jE$$" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="7d$oK1$nL7F" resolve="leftRepr" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6HKur8$jE$_" role="2OqNvi">
|
||||
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="liA8E" id="6HKur8$jFZi" role="2OqNvi">
|
||||
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
|
||||
<node concept="2OqwBi" id="6HKur8$jFZg" role="37wK5m">
|
||||
<node concept="37vLTw" id="6HKur8$jFZh" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="7d$oK1$nLDN" resolve="rightRepr" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6HKur8$jFZi" role="2OqNvi">
|
||||
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
|
|||
|
|
@ -13,17 +13,18 @@ configurations {
|
|||
|
||||
dependencies {
|
||||
// logicReactor 'conreactor:conreactor-api:0.9:v0.9-snapshot.1@jar'
|
||||
logicReactor 'org.jetbrains.kotlin:kotlin-runtime:1.1.2@jar'
|
||||
logicReactor 'org.jetbrains.kotlin:kotlin-stdlib:1.1.2@jar'
|
||||
logicReactor 'com.github.andrewoma.dexx:collection:0.7@jar'
|
||||
logicReactor "org.jetbrains.kotlin:kotlin-runtime:${kotlinVersion}@jar"
|
||||
logicReactor "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}@jar"
|
||||
logicReactor "com.github.andrewoma.dexx:collection:${dexxVersion}@jar"
|
||||
logicReactor "net.sf.trove4j:trove4j:${trove4jVersion}@jar"
|
||||
}
|
||||
|
||||
task downloadReactor {
|
||||
ant.mkdir(dir: 'lib')
|
||||
def url = 'https://github.com/fisakov/conreactor/releases/download'
|
||||
ant.get(src: "${url}/${conreactorTag}/conreactor-api-${conreactorRevision}.jar",
|
||||
ant.get(src: "${url}/${conreactorTag}/conreactor-api-${conreactorVersion}.jar",
|
||||
dest: 'lib', usetimestamp: 'true', skipexisting: 'true')
|
||||
ant.get(src: "${url}/${conreactorTag}/conreactor-core-${conreactorRevision}.jar",
|
||||
ant.get(src: "${url}/${conreactorTag}/conreactor-core-${conreactorVersion}.jar",
|
||||
dest: 'lib', usetimestamp: 'true', skipexisting: 'true')
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,5 @@
|
|||
conreactorRevision = 0.9
|
||||
conreactorTag = v0.9-snapshot.3
|
||||
kotlinVersion = 1.1.4
|
||||
trove4jVersion = 3.0.3
|
||||
dexxVersion = 0.7
|
||||
conreactorVersion = 0.9
|
||||
conreactorTag = v0.9-snapshot.4
|
||||
|
|
|
|||
|
|
@ -8,11 +8,12 @@
|
|||
</modelRoot>
|
||||
</models>
|
||||
<stubModelEntries>
|
||||
<stubModelEntry path="${module}/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<stubModelEntry path="${module}/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<stubModelEntry path="${module}/lib/collection-0.7.jar" />
|
||||
<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" />
|
||||
</stubModelEntries>
|
||||
<sourcePath />
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -370,50 +370,6 @@
|
|||
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1BDNG5xC0YU" role="3bR37C">
|
||||
<node concept="1BurEX" id="1BDNG5xC0YV" role="1SiIV1">
|
||||
<node concept="398BVA" id="1BDNG5xC0YI" role="1BurEY">
|
||||
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
|
||||
<node concept="2Ry0Ak" id="1BDNG5xC0YJ" role="iGT6I">
|
||||
<property role="2Ry0Am" value="logic" />
|
||||
<node concept="2Ry0Ak" id="1BDNG5xC0YK" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="solutions" />
|
||||
<node concept="2Ry0Ak" id="1BDNG5xC0YL" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
|
||||
<node concept="2Ry0Ak" id="1BDNG5xC0YM" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="lib" />
|
||||
<node concept="2Ry0Ak" id="1BDNG5xC0YN" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="kotlin-runtime-1.1.2.jar" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1BDNG5xC0Z8" role="3bR37C">
|
||||
<node concept="1BurEX" id="1BDNG5xC0Z9" role="1SiIV1">
|
||||
<node concept="398BVA" id="1BDNG5xC0YW" role="1BurEY">
|
||||
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
|
||||
<node concept="2Ry0Ak" id="1BDNG5xC0YX" role="iGT6I">
|
||||
<property role="2Ry0Am" value="logic" />
|
||||
<node concept="2Ry0Ak" id="1BDNG5xC0YY" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="solutions" />
|
||||
<node concept="2Ry0Ak" id="1BDNG5xC0YZ" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
|
||||
<node concept="2Ry0Ak" id="1BDNG5xC0Z0" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="lib" />
|
||||
<node concept="2Ry0Ak" id="1BDNG5xC0Z1" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="kotlin-stdlib-1.1.2.jar" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1BDNG5xC0Zm" role="3bR37C">
|
||||
<node concept="1BurEX" id="1BDNG5xC0Zn" role="1SiIV1">
|
||||
<node concept="398BVA" id="1BDNG5xC0Za" role="1BurEY">
|
||||
|
|
@ -480,6 +436,72 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="6OkhGGhHeL$" role="3bR37C">
|
||||
<node concept="1BurEX" id="6OkhGGhHeL_" role="1SiIV1">
|
||||
<node concept="398BVA" id="6OkhGGhHeLo" role="1BurEY">
|
||||
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
|
||||
<node concept="2Ry0Ak" id="6OkhGGhHeLp" role="iGT6I">
|
||||
<property role="2Ry0Am" value="logic" />
|
||||
<node concept="2Ry0Ak" id="6OkhGGhHeLq" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="solutions" />
|
||||
<node concept="2Ry0Ak" id="6OkhGGhHeLr" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
|
||||
<node concept="2Ry0Ak" id="6OkhGGhHeLs" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="lib" />
|
||||
<node concept="2Ry0Ak" id="6OkhGGhHeLt" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="trove4j-3.0.3.jar" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</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>
|
||||
</node>
|
||||
<node concept="2G$12M" id="7Ant4WkHLpc" role="3989C9">
|
||||
|
|
|
|||
Loading…
Reference in New Issue