f053811 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

Merge pull request #72 from alios/master

allow aeson 1.3.x and exceptions-0.10.x

commitf0538113a1328da750f8002c365336a38f9c769b authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateMon 30 Jul 2018, 20:01 (8 years ago) parent76d969d 3389d0a

2 files changed+3−5

compare with master

unifiedsplit

jsaddle-wkwebview/jsaddle-wkwebview.cabal+1−1 jsaddle/jsaddle.cabal+2−4

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

@@ -35,7 +35,7 @@ library

3535 hs-source-dirs: src-ghcjs

3636 else

3737 build-depends:

38− aeson >=0.8.0.2 && <1.3,

38+ aeson >=0.8.0.2 && <1.4,

3939 bytestring >=0.10.6.0 && <0.11,

4040 directory,

4141 jsaddle >= 0.9.4.0 && <0.10,

jsaddle/jsaddle.cabal+2−4

@@ -107,11 +107,11 @@ library

107107 Language.Javascript.JSaddle.Value

108108 Language.Javascript.JSaddle.Types

109109 build-depends:

110− aeson >=0.8.0.2 && <1.3,

110+ aeson >=0.8.0.2 && <1.4,

111111 base <5,

112112 base64-bytestring >=1.0.0.1 && <1.1,

113113 bytestring >=0.10.6.0 && <0.11,

114− exceptions >=0.8 && <0.9,

114+ exceptions >=0.8 && <0.11,

115115 lens >=3.8.5 && <4.17,

116116 primitive >=0.6.1.0 && <0.7,

117117 text >=1.2.1.3 && <1.3,

@@ -123,5 +123,3 @@ library

123123 cpp-options: -DCHECK_UNCHECKED

124124 if flag(call-stacks) || flag(check-unchecked)

125125 cpp-options: -DJSADDLE_HAS_CALL_STACK

126−

127−