jsaddle 0.1.1.7 → 0.2.0.0

raw patch · 3 files changed

+16/−22 lines, 3 filesdep ~basedep ~glibdep ~gtk

Dependency ranges changed: base, glib, gtk, gtk3, jmacro, jsaddle, lens, text, transformers, webkit, webkit-javascriptcore, webkitgtk3, webkitgtk3-javascriptcore

Files

• jsaddle.cabal +13/−18
• src/Language/Javascript/JSaddle/String.hs +2/−2
• src/Language/Javascript/JSaddle/Value.hs +1/−2

@@ -1,5 +1,5 @@ name: jsaddle-version: 0.1.1.7+version: 0.2.0.0 cabal-version: >=1.10 license: MIT license-file: LICENSE@@ -20,7 +20,7 @@ flag ghcjs     description: Tell cabal we are using ghcjs (work around until hackage supports impl(ghcjs))     default: True-  + flag gtk3     Description: Use GTK3 rather than GTK2     Default: True@@ -51,17 +51,17 @@     if !flag(ghcjs) || flag(webkit)         cpp-options: -DUSE_WEBKIT         if flag(gtk3)-            build-depends: webkitgtk3 >=0.12.5 && <0.13,-                           webkitgtk3-javascriptcore >=0.12.5 && <0.13+            build-depends: webkitgtk3 >=0.13.0.0 && <0.14,+                           webkitgtk3-javascriptcore >=0.13.0.0 && <0.14         else-            build-depends: webkit >=0.12.5 && <0.13,-                           webkit-javascriptcore >=0.12.5 && <0.13+            build-depends: webkit >=0.13.0.0 && <0.14,+                           webkit-javascriptcore >=0.13.0.0 && <0.14      if flag(jmacro)         exposed-modules: Language.Javascript.JSaddle.JMacro         build-depends: jmacro >=0.6.3 && <0.8 -    build-depends: template-haskell -any, base <5, lens >=3.8.5 && <4.3,+    build-depends: template-haskell -any, base <5, lens >=3.8.5 && <4.4,                    text >=0.11.2.3 && <1.2, transformers >=0.3.0.0 && <0.5      exposed-modules: Language.Javascript.JSaddle@@ -89,22 +89,17 @@ --    if !impl(ghcjs) || flag(webkit)     if !flag(ghcjs) || flag(webkit)         cpp-options: -DUSE_WEBKIT-        build-depends: glib >=0.12.3.1 && <0.13+        build-depends: glib         if flag(gtk3)-            build-depends: gtk3 >= 0.12.4.1 && <0.13,-                           webkitgtk3 >=0.12.5 && <0.13,-                           webkitgtk3-javascriptcore >=0.12.5 && <0.13+            build-depends: gtk3, webkitgtk3, webkitgtk3-javascriptcore         else-            build-depends: gtk >= 0.12.4.1 && <0.13,-                           webkit >=0.12.5 && <0.13,-                           webkit-javascriptcore >=0.12.5 && <0.13+            build-depends: gtk, webkit, webkit-javascriptcore      if flag(jmacro)-        build-depends: jmacro >=0.6.3 && <0.8+        build-depends: jmacro -    build-depends: template-haskell -any, base <5, lens >=3.8.5 && <4.3,-                   text >=0.11.2.3 && <1.2, transformers >=0.3.0.0 && <0.5,-                   hslogger -any, jsaddle ==0.1.1.7+    build-depends: template-haskell, base, lens, text,+                   transformers, hslogger, jsaddle     type: exitcode-stdio-1.0     main-is: TestJSaddle.hs     default-language: Haskell2010

@@ -23,7 +23,7 @@ ) where  import Data.Text (Text)-import qualified Data.Text as T (pack)+import qualified Data.Text as T (unpack, pack) import Control.Monad.IO.Class (MonadIO(..)) import Language.Javascript.JSaddle.Types (JSStringRef) #if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)@@ -31,7 +31,7 @@ #else import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSStringRef        (jsstringcreatewithcharacters, jsstringgetcharactersptr,-        jsstringgetlength)+        jsstringgetlength, jsstringcreatewithutf8cstring) #endif import qualified Data.Text.Foreign as T (fromPtr) import Foreign (castPtr)

@@ -77,8 +77,7 @@         jsvaluemakeundefined, jsvaluemakenull, jsvaluetoobject,         jsvaluetostringcopy, jsvaluetonumber, jsvaluetoboolean) import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSStringRef-       (jsstringcreatewithcharacters, jsstringgetcharactersptr,-        jsstringgetlength)+       (jsstringgetcharactersptr, jsstringgetlength) #endif import Language.Javascript.JSaddle.Monad (JSM, catchval) import Language.Javascript.JSaddle.Exception (rethrow)