diff --git a/ChangeLog.md b/ChangeLog.md index edd0acd..d1699e2 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,5 @@ # Changelog for subfix -## Unreleased changes +## 0.1.0.1 + +- Updated to current LTS diff --git a/package.yaml b/package.yaml index 4a64daa..9b5947f 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: subfix -version: 0.1.0 +version: 0.1.0.1 license: GPL-3 author: "Jonathan Lamothe" maintainer: "jonathan@jlamothe.net" @@ -51,4 +51,4 @@ tests: - -with-rtsopts=-N dependencies: - subfix - - hspec >=2.7.4 && <2.8 + - hspec >=2.9.7 && <2.10 diff --git a/stack.yaml b/stack.yaml index 3b4d68f..d131823 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,8 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/20.yaml +resolver: lts-20.13 # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/stack.yaml.lock b/stack.yaml.lock index eb90701..6621044 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,8 +6,7 @@ packages: [] snapshots: - completed: - size: 532177 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/20.yaml - sha256: 0e14ba5603f01e8496e8984fd84b545a012ca723f51a098c6c9d3694e404dc6d - original: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/20.yaml + sha256: b37c0abab16c7de352c45b85f8ecc8530b084209a2c42987a96c92b4a5e3cd65 + size: 648924 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/13.yaml + original: lts-20.13 diff --git a/subfix.cabal b/subfix.cabal index e09e805..567ae1e 100644 --- a/subfix.cabal +++ b/subfix.cabal @@ -1,13 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.35.1. -- -- see: https://github.com/sol/hpack --- --- hash: d27dd9ccaaf539b7d1e0fc8be1df5576122d1476e8235b5a3dee69a33e391c9f name: subfix -version: 0.1.0 +version: 0.1.0.1 synopsis: Fixes .srt files description: Please see the README on GitHub at category: Utilities @@ -66,6 +64,6 @@ test-suite subfix-test ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N build-depends: base >=4.7 && <5 - , hspec >=2.7.4 && <2.8 + , hspec >=2.9.7 && <2.10 , subfix default-language: Haskell2010 diff --git a/test/SubFix/DecodeSpec.hs b/test/SubFix/DecodeSpec.hs index 87c922c..b2ee2b3 100644 --- a/test/SubFix/DecodeSpec.hs +++ b/test/SubFix/DecodeSpec.hs @@ -20,6 +20,7 @@ along with this program. If not, see . module SubFix.DecodeSpec (spec) where +import Data.Either (fromRight, fromLeft) import Test.Hspec (Spec, context, describe, it, shouldBe) import SubFix (Caption (..), decode) @@ -30,7 +31,7 @@ spec = describe "decode" $ do context "valid inputs" $ mapM_ ( \(label, input, expected) -> context label $ do - let Right results = decode input + let results = fromRight (error "Left") $ decode input context "number of results" $ let rlen = length results @@ -57,7 +58,7 @@ spec = describe "decode" $ do context "invalid inputs" $ mapM_ ( \(label, input, expected) -> context label $ let - Left result = decode input + result = fromLeft (error "Right") $ decode input in it ("should be: " ++ expected) $ result `shouldBe` expected )