on master help sign in
Increase jsaddle dependency range
0cbbfe4Matthew Bauer
jsaddle-warp/jsaddle-warp.cabal+1−1
@@ -81,7 +81,7 @@ test-suite test-tool
81 wai -any,
81 wai -any,
82 wai-websockets -any,
82 wai-websockets -any,
83 warp -any,
83 warp -any,
84− webdriver >=0.8.4 && <0.9,
84+ webdriver >=0.8.4 && <1.0,
85 websockets -any
85 websockets -any
86 type: exitcode-stdio-1.0
86 type: exitcode-stdio-1.0
87 main-is: DocTest.hs
87 main-is: DocTest.hs
jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+2−2
@@ -35,8 +35,8 @@ library
35 gi-gtk >=3.0.17 && <3.1,
35 gi-gtk >=3.0.17 && <3.1,
36 gi-webkit2 >=4.0.14 && <4.1,
36 gi-webkit2 >=4.0.14 && <4.1,
37 gi-javascriptcore >=4.0.14 && <4.1,
37 gi-javascriptcore >=4.0.14 && <4.1,
38− haskell-gi-base >=0.20 && <0.23,
38+ haskell-gi-base >=0.20 && <0.24,
39− haskell-gi-overloading ==0.0.*,
39+ haskell-gi-overloading >=0.0 && < 2.0,
40 jsaddle >=0.9.4.0 && <0.10,
40 jsaddle >=0.9.4.0 && <0.10,
41 text >=1.2.1.3 && <1.3,
41 text >=1.2.1.3 && <1.3,
42 webkit2gtk3-javascriptcore >=0.14.0.0 && <0.15
42 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
145 let cb' = wrap_UserContentManagerScriptMessageReceivedCallback cb
145 let cb' = wrap_UserContentManagerScriptMessageReceivedCallback cb
146 cb'' <- mk_UserContentManagerScriptMessageReceivedCallback cb'
146 cb'' <- mk_UserContentManagerScriptMessageReceivedCallback cb'
147 connectSignalFunPtr obj "script-message-received::jsaddle" cb'' after
147 connectSignalFunPtr obj "script-message-received::jsaddle" cb'' after
148+#if MIN_VERSION_haskell_gi_base(0,23,0)
149+ Nothing
150+#endif
148
151
149addJSaddleHandler :: WebView -> (Results -> IO ()) -> (Results -> IO Batch) -> IO ()
152addJSaddleHandler :: WebView -> (Results -> IO ()) -> (Results -> IO Batch) -> IO ()
150addJSaddleHandler webView processResult syncResults = do
153addJSaddleHandler webView processResult syncResults = do