summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Data/Aviation/Stratux/Websockets.hs10
-rw-r--r--stratux-websockets.cabal6
2 files changed, 8 insertions, 8 deletions
diff --git a/src/Data/Aviation/Stratux/Websockets.hs b/src/Data/Aviation/Stratux/Websockets.hs
index 4ee8969..4c544c8 100644
--- a/src/Data/Aviation/Stratux/Websockets.hs
+++ b/src/Data/Aviation/Stratux/Websockets.hs
@@ -16,8 +16,8 @@ import Data.Aeson(FromJSON)
import qualified Data.Aeson as A(eitherDecode, eitherDecode')
import Control.Concurrent(forkIO)
import Control.Monad(Monad((>>=), (>>)), forever, unless)
-import Control.Monad.Trans.Either(EitherT(EitherT))
import Control.Monad.Trans.Reader(ReaderT(ReaderT))
+import Control.Monad.Trans.Except(ExceptT(ExceptT))
import Data.Aviation.Stratux.Types(Traffic)
import Data.Either(Either)
import Data.Function(($))
@@ -46,17 +46,17 @@ decodeWith d k =
-- Parses immediately, but defers conversion.
decode ::
FromJSON a =>
- WSConnectionIO (EitherT String) a
+ WSConnectionIO (ExceptT String) a
decode =
- decodeWith A.eitherDecode EitherT
+ decodeWith A.eitherDecode ExceptT
-- | Decode from JSON anything received on the websocket.
-- Parses and performs conversion immediately.
decode' ::
FromJSON a =>
- WSConnectionIO (EitherT String) a
+ WSConnectionIO (ExceptT String) a
decode' =
- decodeWith A.eitherDecode' EitherT
+ decodeWith A.eitherDecode' ExceptT
-- | A stratux websockets application. Loops receiving data and waits for input
-- from stdin. An empty line to stdin terminates the program loop.
diff --git a/stratux-websockets.cabal b/stratux-websockets.cabal
index 91140b7..956063a 100644
--- a/stratux-websockets.cabal
+++ b/stratux-websockets.cabal
@@ -1,5 +1,5 @@
name: stratux-websockets
-version: 0.0.10
+version: 0.0.11
license: BSD3
license-file: LICENCE
author: Tony Morris <ʇǝu˙sıɹɹoɯʇ@ןןǝʞsɐɥ>
@@ -24,10 +24,10 @@ library
build-depends:
base >= 4 && < 6
- , stratux-types >= 0.0.10 && < 0.1
+ , stratux-types >= 0.0.11 && < 0.1
, websockets >= 0.9 && < 1.0
, transformers >= 0.4 && < 1.0
- , aeson >= 1.0 && < 1.1
+ , aeson >= 1.0 && < 1.5
, either >= 4.0 && < 5.0
, text >= 1.2 && < 2.0
, network >= 2.6 && < 3.0