Skip to content

Commit ed77f0e

Browse files
authored
Merge pull request #4 from FRC125/install-instructions
Added install instructions to readme and updates RxJava to 2.0.4.
2 parents f05da22 + f420905 commit ed77f0e

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,20 @@
22

33
# FRamework
44
A functional-reactive wrapper around WPILib.
5+
6+
# Install instructions
7+
To install, run:
8+
9+
```
10+
ant install -buildfile install.xml
11+
```
12+
13+
To compile, run
14+
```
15+
ant compile
16+
```
17+
18+
To test, run:
19+
```
20+
ant test
21+
```

ivy.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<conf name="test" description="Required for test only" extends="runtime"/>
77
</configurations>
88
<dependencies>
9-
<dependency org="io.reactivex" name="rxjava" rev="1.1.6" />
9+
<dependency org="io.reactivex.rxjava2" name="rxjava" rev="2.0.4"/>
1010
<dependency org="org.hamcrest" name="hamcrest-library" rev="1.3"/>
1111
<dependency org="junit" name="junit" rev="4.12"/>
1212
<dependency org="org.apache.ant" name="ant-junit" rev="1.9.7"/>

0 commit comments

Comments
 (0)