diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-07 14:16:21 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-07 14:16:21 +0100 |
commit | 7065a8cc1b8b01cd32d4b1d5317b323fec5238bd (patch) | |
tree | d6608f463b066aa6caf33357fd9ae0e508e49084 /server | |
parent | 75d9fe614dca572aa1d7cfa53553e9c103eb2dd0 (diff) | |
download | thermoprint-7065a8cc1b8b01cd32d4b1d5317b323fec5238bd.tar thermoprint-7065a8cc1b8b01cd32d4b1d5317b323fec5238bd.tar.gz thermoprint-7065a8cc1b8b01cd32d4b1d5317b323fec5238bd.tar.bz2 thermoprint-7065a8cc1b8b01cd32d4b1d5317b323fec5238bd.tar.xz thermoprint-7065a8cc1b8b01cd32d4b1d5317b323fec5238bd.zip |
Bump versions
Diffstat (limited to 'server')
-rw-r--r-- | server/src/Thermoprint/Server/Push.hs | 2 | ||||
-rw-r--r-- | server/thermoprint-server.cabal | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/src/Thermoprint/Server/Push.hs b/server/src/Thermoprint/Server/Push.hs index 07b81fb..7ae03a6 100644 --- a/server/src/Thermoprint/Server/Push.hs +++ b/server/src/Thermoprint/Server/Push.hs | |||
@@ -32,7 +32,7 @@ import qualified Data.Text as Text | |||
32 | type Notification = URI | 32 | type Notification = URI |
33 | 33 | ||
34 | withPush :: TChan Notification -> Application -> Application | 34 | withPush :: TChan Notification -> Application -> Application |
35 | withPush chan = websocketsOr defaultConnectionOptions $ flip acceptRequestWith (AcceptRequest $ Just protocolSpec) >=> handleClient chan | 35 | withPush chan = websocketsOr defaultConnectionOptions $ flip acceptRequestWith (AcceptRequest (Just protocolSpec) []) >=> handleClient chan |
36 | 36 | ||
37 | protocolSpec :: ByteString | 37 | protocolSpec :: ByteString |
38 | protocolSpec = CBS.pack $ "thermoprint-server.notification." ++ showVersion version | 38 | protocolSpec = CBS.pack $ "thermoprint-server.notification." ++ showVersion version |
diff --git a/server/thermoprint-server.cabal b/server/thermoprint-server.cabal index eae3754..1ed55a6 100644 --- a/server/thermoprint-server.cabal +++ b/server/thermoprint-server.cabal | |||
@@ -50,7 +50,7 @@ library | |||
50 | , servant-server >=0.4.4 && <1 | 50 | , servant-server >=0.4.4 && <1 |
51 | , stm >=2.4.4 && <3 | 51 | , stm >=2.4.4 && <3 |
52 | , text >=1.2.1 && <2 | 52 | , text >=1.2.1 && <2 |
53 | , thermoprint-spec ==5.0.* | 53 | , thermoprint-spec ==6.0.* |
54 | , time >=1.5.0 && <2 | 54 | , time >=1.5.0 && <2 |
55 | , wai >=3.0.4 && <4 | 55 | , wai >=3.0.4 && <4 |
56 | , warp >=3.1.9 && <4 | 56 | , warp >=3.1.9 && <4 |
@@ -76,7 +76,7 @@ Test-Suite tests | |||
76 | main-is: Spec.hs | 76 | main-is: Spec.hs |
77 | build-depends: base >=4.8.1 && <5 | 77 | build-depends: base >=4.8.1 && <5 |
78 | , thermoprint-server ==2.0.* | 78 | , thermoprint-server ==2.0.* |
79 | , thermoprint-client ==1.0.* | 79 | , thermoprint-client ==2.0.* |
80 | , thermoprint-spec -any | 80 | , thermoprint-spec -any |
81 | , hspec >=2.2.1 && <3 | 81 | , hspec >=2.2.1 && <3 |
82 | , QuickCheck >=2.8.1 && <3 | 82 | , QuickCheck >=2.8.1 && <3 |