From 2ea0dab85f81773b6315a904266b264f083562ad Mon Sep 17 00:00:00 2001
From: Tom Davies <TD5@users.noreply.github.com>
Date: Wed, 15 Jul 2020 18:28:59 +0100
Subject: [PATCH] Upgrade dependencies

This resolves the build errors surrounding conflicting versions of
dependencies
---
 .gitignore   |  3 +-
 package.yaml | 36 +++++++++++--------
 stack.yaml   |  2 +-
 wasm.cabal   | 99 ----------------------------------------------------
 4 files changed, 24 insertions(+), 116 deletions(-)
 delete mode 100644 wasm.cabal

diff --git a/.gitignore b/.gitignore
index a4b6f94..9a610e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ cabal-config-flags
 dist-newstyle/
 doc/
 setup-config
-wasm-*-docs.tar.gz
\ No newline at end of file
+wasm-*-docs.tar.gz
+wasm.cabal
diff --git a/package.yaml b/package.yaml
index 8598f1d..ef7341e 100644
--- a/package.yaml
+++ b/package.yaml
@@ -8,10 +8,10 @@ extra-source-files:
 - src/Language/Wasm/Parser.y
 - src/Language/Wasm/Lexer.x
 build-tools:
-- alex >=3.1.3
-- happy >=1.9.4
+- alex >= 3.1.3
+- happy >= 1.9.4
 dependencies:
-- base >=4.6 && <5.0
+- base >= 4.6
 
 library:
   source-dirs: src
@@ -20,27 +20,33 @@ library:
   - -fwarn-incomplete-patterns
   - -fwarn-unused-imports
   exposed-modules:
+  - Language.Wasm.Script
   - Language.Wasm.Lexer
   - Language.Wasm
   dependencies:
-  - array                >= 0.5  && <0.6
+  - array                >= 0.5
   - text                 >= 1.1
   - bytestring           >= 0.10
-  - mtl                  >= 2.2  && <3.0
-  - transformers         >= 0.4  && <0.6
-  - containers           >= 0.5  && <0.6
+  - mtl                  >= 2.2
+  - transformers         >= 0.4
+  - containers           >= 0.5
   - utf8-string          >= 1.0
+  - ieee754              >= 0.8
+  - deepseq              >= 1.4
+  - cereal               >= 0.5
+  - primitive            >= 0.7
+  - vector               >= 0.12
 
 tests:
   test:
     main: Test.hs
     source-dirs: tests
     dependencies:
-    - wasm == 0.1.0
-    - filepath >=1.3 && <1.5
-    - directory >= 1.3
-    - text >=1.1 && <1.3
-    - bytestring >=0.10 && <0.11
-    - mtl ==2.2.1
-    - tasty >=0.7
-    - tasty-hunit >=0.4.1 && <0.10
+    - wasm               == 0.1.0
+    - filepath           >= 1.3
+    - directory          >= 1.3
+    - text               >= 1.1
+    - bytestring         >= 0.10
+    - mtl                == 2.2.1
+    - tasty              >= 0.7
+    - tasty-hunit        >= 0.4.1
diff --git a/stack.yaml b/stack.yaml
index 1ba8479..9d0d27a 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-12.11
+resolver: lts-16.5
 packages:
 - '.'
 extra-deps: []
diff --git a/wasm.cabal b/wasm.cabal
deleted file mode 100644
index 31ad451..0000000
--- a/wasm.cabal
+++ /dev/null
@@ -1,99 +0,0 @@
-name:           wasm
-version:        1.0.1
-author:         Ilya Rezvov
-maintainer:     Ilya Rezvov <rezvov.ilya@gmail.com>
-license:        MIT
-license-file:   LICENSE
-category:       Compilers/Interpreters
-homepage:       https://github.com/SPY/haskell-wasm/
-bug-reports:    https://github.com/SPY/haskell-wasm/issues
-synopsis:       WebAssembly Language Toolkit and Interpreter
-description:    This package contains fully spec-compatible tooling for WebAssembly.
-                Features include:
-                .
-                * WebAssembly Text Representation Parser
-                .
-                * WebAssembly Binary Representation encoder and decoder
-                .
-                * Spec-compatible Module validator (checked with Spec Core Test Suite)
-                .
-                * Spec-compatible Interpreter (checked with Spec Core Test Suite)
-                .
-                * Extended scipting grammar parser and executor
-                .
-                * WebAssembly Module building eDSL
-build-type:     Simple
-cabal-version:  >= 1.10
-
-extra-source-files:
-    src/Language/Wasm/Lexer.x
-    src/Language/Wasm/Parser.y
-
-library
-  hs-source-dirs:
-      src
-  ghc-options: -Wwarn -fwarn-incomplete-patterns -fwarn-unused-imports
-  build-depends:
-      array >=0.5 && <0.6
-    , base >=4.6 && <5.0
-    , bytestring >=0.10
-    , containers >=0.5 && <0.6
-    , mtl >=2.2 && <3.0
-    , text >=1.1
-    , transformers >=0.4 && <0.6
-    , utf8-string >=1.0
-    , cereal >= 0.5
-    , primitive >= 0.7
-    , vector >= 0.12
-    , ieee754 >= 0.8
-    , deepseq >= 1.4
-  build-tools:
-      alex >=3.1.3
-    , happy >=1.9.4
-  exposed-modules:
-      Language.Wasm.Lexer
-      Language.Wasm.Parser
-      Language.Wasm.Structure
-      Language.Wasm.Binary
-      Language.Wasm.Validate
-      Language.Wasm.Interpreter
-      Language.Wasm.Script
-      Language.Wasm.FloatUtils
-      Language.Wasm.Builder
-      Language.Wasm
-  other-modules:
-      Paths_wasm
-  default-language: Haskell2010
-
-executable wasm-bin
-  main-is: Main.hs
-  hs-source-dirs: exec
-  build-depends:
-      base >=4.6 && <5.0
-    , wasm
-    , optparse-applicative >= 0.14
-    , bytestring >=0.10 && <0.11
-    , base64-bytestring >= 1.0
-  default-language: Haskell2010
-
-test-suite test
-  type: exitcode-stdio-1.0
-  main-is: Test.hs
-  hs-source-dirs:
-      tests
-  build-depends:
-      base >=4.6 && <5.0
-    , bytestring >=0.10 && <0.11
-    , filepath >=1.3 && <1.5
-    , directory >= 1.3
-    , mtl ==2.2.1
-    , tasty >=0.7
-    , tasty-hunit >=0.4.1 && <0.10
-    , text >=1.1 && <1.3
-    , wasm
-  build-tools:
-      alex >=3.1.3
-    , happy >=1.9.4
-  other-modules:
-      Paths_wasm
-  default-language: Haskell2010