8fc9439 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

Merge pull request #103 from matthewbauer/master

Increase jsaddle dependency range

commit8fc9439557f4947404c70820736e35ff351d73b9 authorJohn Ericson <git@JohnEricson.me> dateTue 1 Oct 2019, 13:12 (7 years ago) parentbf2921c 0cbbfe4

3 files changed+6−3

unifiedsplit

jsaddle-warp/jsaddle-warp.cabal+1−1

@@ -81,7 +81,7 @@ test-suite test-tool

8181 wai -any,

8282 wai-websockets -any,

8383 warp -any,

84− webdriver >=0.8.4 && <0.9,

84+ webdriver >=0.8.4 && <1.0,

8585 websockets -any

8686 type: exitcode-stdio-1.0

8787 main-is: DocTest.hs

jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+2−2

@@ -35,8 +35,8 @@ library

3535 gi-gtk >=3.0.17 && <3.1,

3636 gi-webkit2 >=4.0.14 && <4.1,

3737 gi-javascriptcore >=4.0.14 && <4.1,

38− haskell-gi-base >=0.20 && <0.23,

39− haskell-gi-overloading ==0.0.*,

38+ haskell-gi-base >=0.20 && <0.24,

39+ haskell-gi-overloading >=0.0 && < 2.0,

4040 jsaddle >=0.9.4.0 && <0.10,

4141 text >=1.2.1.3 && <1.3,

4242 webkit2gtk3-javascriptcore >=0.14.0.0 && <0.15

jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+3

@@ -145,6 +145,9 @@ connectUserContentManagerScriptMessageReceived obj cb after = liftIO $ do

145145 let cb' = wrap_UserContentManagerScriptMessageReceivedCallback cb

146146 cb'' <- mk_UserContentManagerScriptMessageReceivedCallback cb'

147147 connectSignalFunPtr obj "script-message-received::jsaddle" cb'' after

148+#if MIN_VERSION_haskell_gi_base(0,23,0)

149+ Nothing

150+#endif

148151

149152addJSaddleHandler :: WebView -> (Results -> IO ()) -> (Results -> IO Batch) -> IO ()

150153addJSaddleHandler webView processResult syncResults = do