Skip to content

Commit cb9093d

Browse files
committed
Support both rx/websocket 2.x and 1.x
1 parent 2213a8e commit cb9093d

File tree

3 files changed

+97
-112
lines changed

3 files changed

+97
-112
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
"clue/block-react": "^1.1",
1616
"ocramius/package-versions": "^1.1",
1717
"react/dns": "^0.4.9",
18-
"react/http-client": "^0.4.17",
18+
"react/http-client": "^0.5 || ^0.4.17",
1919
"reactivex/rxphp": "^2.0.4",
2020
"rx/helpers": "^1.0",
2121
"rx/operator-extras": "^2.1",
22-
"rx/websocket": "^1.0",
22+
"rx/websocket": "^2.0 || ^1.0",
2323
"voryx/event-loop": "^2.0.2"
2424
},
2525
"require-dev": {

composer.lock

Lines changed: 81 additions & 109 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)