1112638 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Merge branch 'develop' into develop

commit1112638f23260e6b4f06b844d09d840d20be3e7a authorElliot Cameron <3noch@users.noreply.github.com> dateFri 8 May 2020, 12:18 (6 years ago) parent6dc01cd c6a5d2f

2 files changed+14−14

compare with develop

unifiedsplit

reflex-dom-core/reflex-dom-core.cabal+3−3 reflex-dom/reflex-dom.cabal+11−11

reflex-dom-core/reflex-dom-core.cabal+3−3

@@ -51,7 +51,7 @@ library

5151 base >= 4.7 && < 4.14,

5252 bifunctors >= 4.2 && < 6,

5353 bimap >= 0.3 && < 0.4,

54− blaze-builder,

54+ blaze-builder >= 0.4.1 && < 0.5,

5555 bytestring == 0.10.*,

5656 case-insensitive < 1.3,

5757 containers >= 0.6 && < 0.7,

@@ -71,7 +71,7 @@ library

7171 monad-control >= 1.0.1 && < 1.1,

7272 mtl >= 2.1 && < 2.3,

7373 primitive >= 0.5 && < 0.8,

74− random,

74+ random >= 1.1 && < 1.2,

7575 ref-tf == 0.4.*,

7676 reflex >= 0.6.2 && < 0.8,

7777 semigroups >= 0.16 && < 0.20,

@@ -149,7 +149,7 @@ library

149149 build-depends:

150150 dependent-sum >= 0.6,

151151 dependent-sum-template >= 0.1 && < 0.2,

152− template-haskell

152+ template-haskell >= 2.12.0 && < 2.15

153153 other-extensions: TemplateHaskell

154154 cpp-options: -DUSE_TEMPLATE_HASKELL

155155 other-modules:

reflex-dom/reflex-dom.cabal+11−11

@@ -47,17 +47,17 @@ library

4747 hs-source-dirs: src-android

4848 other-modules: Reflex.Dom.Android.MainWidget

4949 build-depends:

50− aeson,

50+ aeson >= 1.4 && < 1.5,

5151 android-activity == 0.1.*,

5252 data-default == 0.7.*,

53− jsaddle

53+ jsaddle >= 0.9.6 && < 0.10

5454 c-sources: cbits/MainWidget.c

5555 include-dirs: cbits/include

5656 install-includes: MainWidget.h

5757 cpp-options: -DANDROID

5858 build-tools: hsc2hs

5959 build-depends:

60− base >= 4.7 && < 4.13,

60+ base >= 4.7 && < 4.14,

6161 bytestring == 0.10.*,

6262 reflex >= 0.6.2 && < 0.8,

6363 reflex-dom-core >=0.5.2 && < 0.6,

@@ -65,27 +65,27 @@ library

6565 if !impl(ghcjs)

6666 if flag(use-warp) && (os(linux) || os(osx))

6767 build-depends:

68− jsaddle,

69− jsaddle-warp

68+ jsaddle >= 0.9.6 && < 0.10,

69+ jsaddle-warp >= 0.9.6 && < 0.10

7070 else

7171 if os(osx) || os(ios)

7272 build-depends:

7373 data-default == 0.7.*,

74− jsaddle,

75− jsaddle-wkwebview

74+ jsaddle >= 0.9.6 && < 0.10,

75+ jsaddle-wkwebview >= 0.9.6 && < 0.10

7676 else

7777 if arch(wasm32)

7878 build-depends:

79− jsaddle,

80− jsaddle-wasm

79+ jsaddle >= 0.9.6 && < 0.10,

80+ jsaddle-wasm >= 0.1 && < 0.2

8181 else

8282 if flag(webkit2gtk)

8383 build-depends:

84− jsaddle-webkit2gtk

84+ jsaddle-webkit2gtk >= 0.9.6 && < 0.10

8585 else

8686 if !os(android)

8787 build-depends:

88− jsaddle-webkit2gtk

88+ jsaddle-webkit2gtk >= 0.9.6 && < 0.10

8989

9090 exposed-modules:

9191 Reflex.Dom