From 06e524ea1eeac785d0805da20e2aae2f3eadcfa3 Mon Sep 17 00:00:00 2001 From: John Watson Date: Fri, 11 Mar 2022 19:24:21 +0000 Subject: [PATCH] Upgrade to ps 0.14.7 and string-parsers 7.0.0 Due to breaking changes introduced in string-parsers 7.0.0. Not possible yet to build with spago because this version of string-parsers does not yet live in the package-sets. --- CHANGELOG.md | 5 +++++ bower.json | 12 ++++++++---- package.json | 3 ++- packages.dhall | 3 ++- spago.dhall | 10 +++++++++- src/Data/Midi/Parser.purs | 6 +++--- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76288f9..1dd0337 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +### Version 2.5.0 (2022-03-11) + +* PS Compiler 0.14.7 +* Enforced upgrade because of breaking changes in string-parsers 7.0.0 + ### Version 2.4.0 (2021-03-02) * PS Compiler 0.14.0 diff --git a/bower.json b/bower.json index 7096d5f..6090cd7 100644 --- a/bower.json +++ b/bower.json @@ -17,10 +17,14 @@ "url": "https://github.com/newlandsvalley/purescript-midi.git" }, "dependencies": { - "purescript-prelude": "^5.0.0", - "purescript-lists": "^6.0.0", - "purescript-string-parsers": "^6.0.0", + "purescript-prelude": "^5.0.1", + "purescript-lists": "^6.1.0", + "purescript-string-parsers": "^7.0.0", "purescript-integers": "^5.0.0", - "purescript-signal": "^12.0.1" + "purescript-signal": "^12.0.1", + "purescript-quickcheck": "^7.1.0", + "purescript-test-unit": "^16.0.0", + "purescript-node-buffer": "^7.0.1", + "purescript-node-fs-aff": "^7.0.0" } } diff --git a/package.json b/package.json index 95a0eb1..c510e56 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,9 @@ }, "devDependencies": { "pulp": "^15.0.0", - "purescript": "^0.14.0", + "purescript": "^0.14.7", "purescript-psa": "^0.6.0", + "spago": "^0.20.7", "webpack": "^3.6.0" } } diff --git a/packages.dhall b/packages.dhall index d24232f..eb0db8c 100644 --- a/packages.dhall +++ b/packages.dhall @@ -105,6 +105,7 @@ in upstream ------------------------------- -} let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.14.0/packages.dhall sha256:710b53c085a18aa1263474659daa0ae15b7a4f453158c4f60ab448a6b3ed494e + https://github.com/purescript/package-sets/releases/download/psc-0.14.7-20220303/packages.dhall + sha256:d7cbc15ea16768e4a4f99baa58a54559dd2648c6c1362de2469d9e41c23b28c3 in upstream diff --git a/spago.dhall b/spago.dhall index c77c7cd..248ccb7 100644 --- a/spago.dhall +++ b/spago.dhall @@ -4,13 +4,21 @@ You can edit this file as you like. -} { name = "midi" , dependencies = - [ + [ "arrays" + , "control" , "effect" + , "either" + , "foldable-traversable" , "integers" , "lists" + , "maybe" + , "ordered-collections" , "prelude" , "signal" , "string-parsers" + , "strings" + , "tuples" + , "unfoldable" ] , packages = ./packages.dhall , sources = [ "src/**/*.purs" ] diff --git a/src/Data/Midi/Parser.purs b/src/Data/Midi/Parser.purs index 15490b6..fa4af07 100644 --- a/src/Data/Midi/Parser.purs +++ b/src/Data/Midi/Parser.purs @@ -22,10 +22,10 @@ import Data.String.CodeUnits (fromCharArray, toCharArray) import Data.Tuple (Tuple(..)) import Data.Unfoldable (replicateA) import Prelude (Unit, unit, ($), (<$>), (<$), (<*>), (*>), (+), (-), (>), (<), (==), (>=), (<=), (&&), (>>=), (>>>), (<<<), (<>), map, pure, show, void) -import Text.Parsing.StringParser (Parser, runParser, try, fail) -import Text.Parsing.StringParser.Combinators (choice, many, many1Till, ()) +import StringParser (Parser, runParser, try, fail) +import StringParser.Combinators (choice, many, many1Till, ()) -- import Text.Parsing.StringParser.String (anyChar, satisfy, string, char, noneOf) -import Text.Parsing.StringParser.CodePoints (anyChar, satisfy, string, char, noneOf) +import StringParser.CodePoints (anyChar, satisfy, string, char, noneOf) {- debugging utilities