Update aeson and zebra

icicle-lang · Mar 6, 2017 · e8fdcc4 · e8fdcc4
1 parent 9a2d92a
commit e8fdcc4
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 14 deletions.
diff --git a/icicle-compiler/icicle.cabal b/icicle-compiler/icicle.cabal
@@ -28,7 +28,7 @@ library
                      , icicle-core
                      , icicle-data
                      , icicle-source
-                     , aeson                           >= 0.8        && < 0.12
+                     , aeson                           >= 0.8        && < 1.2
                      , annotated-wl-pprint             == 0.7.*
                      , ansi-terminal                   == 0.6.*
                      , bifunctors                      >= 4.2        && < 5.4
@@ -227,7 +227,6 @@ test-suite test
                      , icicle-source
                      , icicle-core
                      , icicle
-                     , ambiata-disorder-aeson
                      , ambiata-disorder-core
                      , ambiata-disorder-corpus
                      , ambiata-disorder-jack

diff --git a/icicle-compiler/icicle.lock-7.10.2 b/icicle-compiler/icicle.lock-7.10.2
@@ -2,7 +2,7 @@
 abstract-deque == 0.3
 abstract-par == 0.3.3
 adjunctions == 4.3
-aeson == 0.11.2.1
+aeson == 1.1.0.0
 annotated-wl-pprint == 0.7.0
 ansi-terminal == 0.6.2.3
 ansi-wl-pprint == 0.6.7.3

diff --git a/icicle-compiler/icicle.lock-8.0.1 b/icicle-compiler/icicle.lock-8.0.1
@@ -2,7 +2,7 @@
 abstract-deque == 0.3
 abstract-par == 0.3.3
 adjunctions == 4.3
-aeson == 0.11.2.1
+aeson == 1.1.0.0
 annotated-wl-pprint == 0.7.0
 ansi-terminal == 0.6.2.3
 ansi-wl-pprint == 0.6.7.3

diff --git a/icicle-core/icicle-core.lock-7.10.2 b/icicle-core/icicle-core.lock-7.10.2
@@ -1,6 +1,6 @@
 # mafia-lock-file-version: 0
 adjunctions == 4.3
-aeson == 0.11.2.1
+aeson == 1.1.0.0
 annotated-wl-pprint == 0.7.0
 ansi-terminal == 0.6.2.3
 attoparsec == 0.13.1.0

diff --git a/icicle-core/icicle-core.lock-8.0.1 b/icicle-core/icicle-core.lock-8.0.1
@@ -1,6 +1,6 @@
 # mafia-lock-file-version: 0
 adjunctions == 4.3
-aeson == 0.11.2.1
+aeson == 1.1.0.0
 annotated-wl-pprint == 0.7.0
 ansi-terminal == 0.6.2.3
 attoparsec == 0.13.1.0

diff --git a/icicle-data/icicle-data.lock-7.10.2 b/icicle-data/icicle-data.lock-7.10.2
@@ -1,6 +1,6 @@
 # mafia-lock-file-version: 0
 adjunctions == 4.3
-aeson == 0.11.2.1
+aeson == 1.1.0.0
 annotated-wl-pprint == 0.7.0
 ansi-terminal == 0.6.2.3
 attoparsec == 0.13.1.0

diff --git a/icicle-data/icicle-data.lock-8.0.1 b/icicle-data/icicle-data.lock-8.0.1
@@ -1,6 +1,6 @@
 # mafia-lock-file-version: 0
 adjunctions == 4.3
-aeson == 0.11.2.1
+aeson == 1.1.0.0
 annotated-wl-pprint == 0.7.0
 ansi-terminal == 0.6.2.3
 attoparsec == 0.13.1.0

diff --git a/icicle-repl/icicle-repl.lock-7.10.2 b/icicle-repl/icicle-repl.lock-7.10.2
@@ -1,6 +1,6 @@
 # mafia-lock-file-version: 0
 adjunctions == 4.3
-aeson == 0.11.2.1
+aeson == 1.1.0.0
 annotated-wl-pprint == 0.7.0
 ansi-terminal == 0.6.2.3
 ansi-wl-pprint == 0.6.7.3

diff --git a/icicle-repl/icicle-repl.lock-8.0.1 b/icicle-repl/icicle-repl.lock-8.0.1
@@ -1,6 +1,6 @@
 # mafia-lock-file-version: 0
 adjunctions == 4.3
-aeson == 0.11.2.1
+aeson == 1.1.0.0
 annotated-wl-pprint == 0.7.0
 ansi-terminal == 0.6.2.3
 ansi-wl-pprint == 0.6.7.3

diff --git a/icicle-source/icicle-source.cabal b/icicle-source/icicle-source.cabal
@@ -18,7 +18,7 @@ library
                      , ambiata-p
                      , ambiata-x-eithert
                      , ambiata-x-show
-                     , aeson                           >= 0.8        && < 0.12
+                     , aeson                           >= 0.8        && < 1.2
                      , ansi-terminal                   == 0.6.*
                      , bifunctors                      >= 4.2        && < 5.4
                      , bytestring                      == 0.10.*

diff --git a/icicle-source/icicle-source.lock-7.10.2 b/icicle-source/icicle-source.lock-7.10.2
@@ -1,6 +1,5 @@
 # mafia-lock-file-version: 0
 adjunctions == 4.3
-aeson == 0.11.2.1
 annotated-wl-pprint == 0.7.0
 ansi-terminal == 0.6.2.3
 attoparsec == 0.13.1.0

diff --git a/icicle-source/icicle-source.lock-8.0.1 b/icicle-source/icicle-source.lock-8.0.1
@@ -1,6 +1,6 @@
 # mafia-lock-file-version: 0
 adjunctions == 4.3
-aeson == 0.11.2.1
+aeson == 1.1.0.0
 annotated-wl-pprint == 0.7.0
 ansi-terminal == 0.6.2.3
 attoparsec == 0.13.1.0

diff --git a/lib/zebra b/lib/zebra