Add dependencies on RxJava and rxjava2-swing.

This commit is contained in:
Fedor Isakov 2017-07-17 17:55:34 +02:00
parent 75ff3e3edf
commit c8b4fff148
8 changed files with 218 additions and 6 deletions

1
.gitignore vendored
View File

@ -13,5 +13,6 @@ config/*
system/*
logic/solutions/jetbrains.mps.logic.reactor/lib/*
logic/solutions/jetbrains.mps.logic.test/lib/*
typechecking/solutions/jetbrains.mps.typechecking/lib/*
MPS_HOME
TEST-*

View File

@ -62,7 +62,8 @@ task installMps(type: Copy) {
def allInitDependencies = [
'installMps',
'logic/solutions/jetbrains.mps.logic.reactor:copyDependencies',
'logic/solutions/jetbrains.mps.logic.test:copyDependencies' ]
'logic/solutions/jetbrains.mps.logic.test:copyDependencies',
'typechecking/solutions/jetbrains.mps.typechecking:copyDependencies' ]
task init(dependsOn: allInitDependencies) {
doLast {

View File

@ -456,6 +456,9 @@
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
</dependencies>
<library jar="lib/rxjava-2.1.1.jar" />
<library jar="lib/rxjava2-swing-0.2.1.jar" />
<library jar="lib/reactive-streams-1.0.0.final.jar" />
<classpath>
<entry path="." />
</classpath>
@ -819,6 +822,9 @@
<copy todir="${build.layout}/tests/lib">
<fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib" />
</copy>
<copy todir="${build.layout}/tests/lib">
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib" />
</copy>
<mkdir dir="${build.tmp}/default/typechecking-0.1.zip" />
<mkdir dir="${build.tmp}/default/typechecking-0.1.zip/typechecking" />
<mkdir dir="${build.tmp}/default/typechecking-0.1.zip/typechecking/META-INF" />
@ -1221,6 +1227,9 @@
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
</dependencies>
<library jar="../lib/rxjava-2.1.1.jar" />
<library jar="../lib/rxjava2-swing-0.2.1.jar" />
<library jar="../lib/reactive-streams-1.0.0.final-0.7.jar" />
<classpath>
<entry path="." />
</classpath>
@ -1329,6 +1338,7 @@
</jar>
<zip destfile="${build.layout}/typechecking-0.1.zip">
<zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib" prefix="typechecking/lib" />
<zipfileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/lib" prefix="typechecking/lib" />
<fileset dir="${build.tmp}/default/typechecking-0.1.zip" />
</zip>
<echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
@ -2141,6 +2151,9 @@
<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}/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" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
@ -2211,6 +2224,9 @@
<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}/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" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
@ -2411,7 +2427,7 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
<target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@ -2425,13 +2441,14 @@
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
<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" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
@ -2443,6 +2460,9 @@
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
<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}/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" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />

View File

@ -1,2 +1,3 @@
include 'logic/solutions/jetbrains.mps.logic.reactor'
include 'logic/solutions/jetbrains.mps.logic.test'
include 'typechecking/solutions/jetbrains.mps.typechecking'

View File

@ -1100,7 +1100,7 @@
</node>
<node concept="1SiIV0" id="65DJywFj18g" role="3bR37C">
<node concept="3bR9La" id="65DJywFj18h" role="1SiIV1">
<property role="3bR36h" value="false" />
<property role="3bR36h" value="true" />
<ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
</node>
</node>
@ -1172,7 +1172,7 @@
</node>
<node concept="1SiIV0" id="6i42QSs2bfI" role="3bR37C">
<node concept="3bR9La" id="6i42QSs2bfJ" role="1SiIV1">
<property role="3bR36h" value="false" />
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:7Kfy9QB6Lfd" resolve="jetbrains.mps.findUsages.runtime" />
</node>
</node>
@ -1188,6 +1188,72 @@
<ref role="3bR37D" to="ffeo:7Kfy9QB6Lg2" resolve="jetbrains.mps.smodel.resources" />
</node>
</node>
<node concept="1SiIV0" id="3NqN4u$_mkE" role="3bR37C">
<node concept="1BurEX" id="3NqN4u$_mkF" role="1SiIV1">
<node concept="398BVA" id="3NqN4u$_mku" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="3NqN4u$_mkv" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_mkw" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_mkx" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_mky" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3NqN4u$_mkz" role="2Ry0An">
<property role="2Ry0Am" value="rxjava-2.1.1.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="3NqN4u$_mkS" role="3bR37C">
<node concept="1BurEX" id="3NqN4u$_mkT" role="1SiIV1">
<node concept="398BVA" id="3NqN4u$_mkG" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="3NqN4u$_mkH" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_mkI" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_mkJ" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_mkK" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3NqN4u$_mkL" role="2Ry0An">
<property role="2Ry0Am" value="rxjava2-swing-0.2.1.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="3NqN4u$_ml6" role="3bR37C">
<node concept="1BurEX" id="3NqN4u$_ml7" role="1SiIV1">
<node concept="398BVA" id="3NqN4u$_mkU" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="3NqN4u$_mkV" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_mkW" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_mkX" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_mkY" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3NqN4u$_mkZ" role="2Ry0An">
<property role="2Ry0Am" value="reactive-streams-1.0.0.final.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtD" id="46o4wsH5PJF" role="2G$12L">
<property role="BnDLt" value="true" />
@ -1292,7 +1358,7 @@
</node>
<node concept="1SiIV0" id="46o4wsH5OKC" role="3bR37C">
<node concept="3bR9La" id="46o4wsH5OKD" role="1SiIV1">
<property role="3bR36h" value="false" />
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
@ -1517,6 +1583,23 @@
</node>
</node>
</node>
<node concept="2HvfSZ" id="3NqN4u$_rqd" role="39821P">
<node concept="398BVA" id="3NqN4u$_rqe" role="2HvfZ0">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="3NqN4u$_rqf" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_rqg" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_rqh" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_rqi" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3981dG" id="65DJywFjdtY" role="39821P">
@ -1662,6 +1745,69 @@
</node>
<node concept="L2wRC" id="65DJywFj_1R" role="39821P">
<ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
<node concept="3yLZsm" id="3NqN4u$_rT6" role="3yL2VB">
<property role="3yLZsk" value="../lib/reactive-streams-1.0.0.final-0.7.jar" />
<node concept="398BVA" id="3NqN4u$_rT7" role="3yLZsn">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="3NqN4u$_rT8" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_rT9" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_rTa" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_rTb" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3NqN4u$_s8k" role="2Ry0An">
<property role="2Ry0Am" value="reactive-streams-1.0.0.final.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3yLZsm" id="3NqN4u$_sim" role="3yL2VB">
<property role="3yLZsk" value="../lib/rxjava-2.1.1.jar" />
<node concept="398BVA" id="3NqN4u$_sin" role="3yLZsn">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="3NqN4u$_sio" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_sip" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_siq" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_sir" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3NqN4u$_snF" role="2Ry0An">
<property role="2Ry0Am" value="rxjava-2.1.1.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3yLZsm" id="3NqN4u$_sxH" role="3yL2VB">
<property role="3yLZsk" value="../lib/rxjava2-swing-0.2.1.jar" />
<node concept="398BVA" id="3NqN4u$_sxI" role="3yLZsn">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="3NqN4u$_sxJ" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_sxK" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_sxL" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_sxM" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3NqN4u$_sB9" role="2Ry0An">
<property role="2Ry0Am" value="rxjava2-swing-0.2.1.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="L2wRC" id="3u5wJtgSbK" role="39821P">
<ref role="L2wRA" node="3u5wJtgiSM" resolve="jetbrains.mps.lang.smodel.types" />
@ -1684,6 +1830,22 @@
</node>
</node>
</node>
<node concept="2HvfSZ" id="3NqN4u$_rD_" role="39821P">
<node concept="55IIr" id="3NqN4u$_rDA" role="2HvfZ0">
<node concept="2Ry0Ak" id="3NqN4u$_rDB" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_rDC" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_rDD" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_rDE" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3_J27D" id="65DJywFkElP" role="Nbhlr">
<node concept="3Mxwew" id="65DJywFkEoC" role="3MwsjC">
<property role="3MwjfP" value="lib" />

View File

@ -0,0 +1,14 @@
configurations {
typeChecking
}
dependencies {
typeChecking "io.reactivex.rxjava2:rxjava:${rxjavaRevision}@jar"
typeChecking "com.github.akarnokd:rxjava2-swing:${rxjavaswingRevision}@jar"
typeChecking "org.reactivestreams:reactive-streams:${reactivestreamsRevision}@jar"
}
task copyDependencies (type: Copy) {
from configurations.typeChecking
into 'lib'
}

View File

@ -0,0 +1,3 @@
rxjavaRevision = 2.1.1
rxjavaswingRevision = 0.2.1
reactivestreamsRevision = 1.0.0.final

View File

@ -4,7 +4,17 @@
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="models" />
</modelRoot>
<modelRoot contentPath="${module}" type="java_classes">
<sourceRoot location="lib/rxjava-2.1.1.jar" />
<sourceRoot location="lib/reactive-streams-1.0.0.final.jar" />
<sourceRoot location="lib/rxjava2-swing-0.2.1.jar" />
</modelRoot>
</models>
<stubModelEntries>
<stubModelEntry path="${module}/lib/rxjava-2.1.1.jar" />
<stubModelEntry path="${module}/lib/rxjava2-swing-0.2.1.jar" />
<stubModelEntry path="${module}/lib/reactive-streams-1.0.0.final.jar" />
</stubModelEntries>
<sourcePath />
<dependencies>
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>