jammittools 0.4.1 → 0.4.1.1

raw patch · 3 files changed

+15/−6 lines, 3 filesdep ~filepathdep ~jammittoolsPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: filepath, jammittools

API changes (from Hackage documentation)

Files

• Main.hs +5/−1
• jammittools.cabal +4/−4
• src/Sound/Jammit/Base.hs +6/−1

@@ -1,6 +1,10 @@+{-# LANGUAGE CPP #-} module Main (main) where -import Control.Applicative ((<$>), (<|>))+#if !MIN_VERSION_base(4,8,0)+import Control.Applicative ((<$>))+#endif+import Control.Applicative ((<|>)) import Control.Monad ((>=>), forM_, unless) import Data.Char (toLower) import Data.List (sort, nub, partition)

@@ -1,5 +1,5 @@ Name:               jammittools-Version:            0.4.1+Version:            0.4.1.1 Synopsis:           Export sheet music and audio from Windows/Mac app Jammit Description: @@ -35,7 +35,7 @@     base            >= 4.6.0.1 && < 5     , property-list >= 0.1.0.4 && < 0.2     , directory     >= 1.2.0.1 && < 1.3-    , filepath      >= 1.3.0.1 && < 1.4+    , filepath      >= 1.3.0.1 && < 1.5     , containers    >= 0.5.0.0 && < 0.6     , process       >= 1.1.0.2 && < 1.3     , temporary     >= 1.1.2.5 && < 1.3@@ -57,9 +57,9 @@   build-depends:     base            >= 4.6.0.1 && < 5     , directory     >= 1.2.0.1 && < 1.3-    , filepath      >= 1.3.0.1 && < 1.4+    , filepath      >= 1.3.0.1 && < 1.5     , boxes         >= 0.1.3   && < 0.2-    , jammittools   == 0.4.1+    , jammittools   == 0.4.1.1   ghc-options:      -Wall -O2  source-repository head

@@ -1,6 +1,7 @@ {- | Basic types and functions for dealing with Jammit song packages. -}+{-# LANGUAGE CPP #-} module Sound.Jammit.Base ( Instrument(..) , Part(..)@@ -18,7 +19,10 @@ , songSubdirs ) where -import Control.Applicative ((<$>), (<*>), liftA2)+#if !MIN_VERSION_base(4,8,0)+import Control.Applicative ((<$>), (<*>))+#endif+import Control.Applicative (liftA2) import Control.Arrow ((***)) import Control.Exception (evaluate) import Control.Monad (filterM, guard)@@ -179,6 +183,7 @@   (Nothing, Nothing) -> Nothing   (Just i , _      ) -> Just $ Left i   (_      , Just d ) -> let+    getSkill :: (String, PL.PropertyList) -> Maybe (Instrument, Integer)     getSkill (x, y) = liftA2 (,) (readMaybe $ capitalize x) (PL.fromPlInt y)     capitalize ""     = ""     capitalize (c:cs) = toUpper c : map toLower cs