Add some version constaints

Author: saep

library/Neovim/RPC/EventHandler.hs

@@ -28,12 +28,7 @@ import           Control.Concurrent.STM       hiding (writeTQueue)
 import           Control.Monad.Reader
 import           Control.Monad.Trans.Resource
 import           Data.ByteString              (ByteString)
-import           Data.Conduit                 as C
-#if MIN_VERSION_conduit_extra(1,2,2)
-import           Data.Conduit.Binary          (sinkHandleFlush)
-#else
-import           Data.Conduit.Binary          (sinkHandle)
-#endif
+import           Conduit                      as C
 import qualified Data.Map                     as Map
 import           Data.Serialize               (encode)
 import           System.IO                    (Handle)
@@ -51,11 +46,7 @@ runEventHandler writeableHandle env =
     runEventHandlerContext env . runConduit $ do
         eventHandlerSource
             .| eventHandler
-#if MIN_VERSION_conduit_extra(1,2,2)
             .| (sinkHandleFlush writeableHandle)
-#else
-            .| (sinkHandle writeableHandle)
-#endif
 
 
 -- | Convenient monad transformer stack for the event handler
@@ -86,21 +77,13 @@ eventHandler = await >>= \case
         eventHandler
 
 
-#if MIN_VERSION_conduit_extra(1,2,2)
-type EncodedResponse = Flush ByteString
-#else
-type EncodedResponse = ByteString
-#endif
+type EncodedResponse = C.Flush ByteString
 
 yield' :: (MonadIO io) => MsgpackRPC.Message -> ConduitM i EncodedResponse io ()
 yield' o = do
     liftIO . debugM "EventHandler" $ "Sending: " ++ show o
-#if MIN_VERSION_conduit_extra(1,2,2)
     yield . Chunk . encode $ toObject o
     yield Flush
-#else
-    yield . encode $ toObject o
-#endif
 
 handleMessage :: (Maybe FunctionCall, Maybe MsgpackRPC.Message)
               -> ConduitM i EncodedResponse EventHandler ()

library/Neovim/RPC/SocketReader.hs

@@ -36,9 +36,8 @@ import           Control.Concurrent         (forkIO)
 import           Control.Concurrent.STM
 import           Control.Monad              (void)
 import           Control.Monad.Trans.Class  (lift)
-import           Data.Conduit               as C
-import           Data.Conduit.Binary
-import           Data.Conduit.Cereal
+import           Conduit               as C
+import           Data.Conduit.Cereal        (conduitGet2)
 import           Data.Default               (def)
 import           Data.Foldable              (foldl', forM_)
 import qualified Data.Map                   as Map
@@ -65,12 +64,6 @@ runSocketReader :: Handle
                 -> IO ()
 runSocketReader readableHandle cfg =
     void . runNeovim (Internal.retypeConfig (Internal.customConfig cfg) cfg) . runConduit $ do
-        -- addCleanup (cleanUpHandle h) (sourceHandle h)
-        -- TODO test whether/how this should be handled
-        -- this has been commented out because I think that restarting the
-        -- plugin provider should not cause the stdin and stdout handles to be
-        -- closed since that would cause neovim to stop the plugin provider (I
-        -- think).
         sourceHandle readableHandle
             .| conduitGet2 Data.Serialize.get
             .| messageHandlerSink

nvim-hs.cabal

@@ -1,5 +1,5 @@
 name:                nvim-hs
-version:             0.3.0
+version:             1.0.0.0
 synopsis:            Haskell plugin backend for neovim
 description:
   This package provides a plugin provider for neovim. It allows you to write
@@ -99,17 +99,7 @@ library
                       , bytestring
                       , cereal
                       , cereal-conduit >= 0.7.3
-                      , conduit
-
-                      -- sinkHandle flushed after every yield in the releases
-                      -- [1.1.2, 1.1.17) and in release 1.2.2 an API was added
-                      -- to flush manually, so any other version probably does
-                      -- not work unless you set NoBuffering on the handle (see #61)
-                      -- I think having NoBuffering on TCP-Handles is kind of
-                      -- ridicilous, so the version range [1.1.17, 1.2.2) is
-                      -- simply excluded
-                      , conduit-extra >= 1.1.2 && < 1.1.17 || >= 1.2.2
-
+                      , conduit >= 1.3.0
                       , containers
                       , data-default
                       , deepseq >= 1.1 && < 1.5
@@ -125,7 +115,7 @@ library
                       , time-locale-compat
                       , megaparsec
                       , process
-                      , resourcet
+                      , resourcet >= 1.1.10
                       , setenv >= 0.1.1.3
                       , stm
                       , streaming-commons
@@ -134,7 +124,7 @@ library
                       , time
                       , transformers
                       , transformers-base
-                      , unliftio
+                      , unliftio >= 0.2
                       , unliftio-core
                       , utf8-string
                       , void
@@ -160,7 +150,6 @@ test-suite hspec
                       , cereal
                       , cereal-conduit
                       , conduit
-                      , conduit-extra
                       , containers
                       , data-default
                       , directory