updated to most recent LTS

.travis.yml

@@ -1,40 +0,0 @@
-# This is the simple Travis configuration, which is intended for use
-# on applications which do not require cross-platform and
-# multiple-GHC-version support. For more information and other
-# options, see:
-#
-# https://docs.haskellstack.org/en/stable/travis_ci/
-#
-# Copy these contents into the root directory of your Github project in a file
-# named .travis.yml
-
-# Choose a build environment
-dist: xenial
-
-# Do not choose a language; we provide our own build tools.
-language: generic
-
-# Caching so the next build will be fast too.
-cache:
-  directories:
-  - $HOME/.stack
-
-# Ensure necessary system libraries are present
-addons:
-  apt:
-    packages:
-      - libgmp-dev
-
-before_install:
-# Download and unpack the stack executable
-- mkdir -p ~/.local/bin
-- export PATH=$HOME/.local/bin:$PATH
-- travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
-
-install:
-# Build dependencies
-- stack --no-terminal --install-ghc test --only-dependencies
-
-script:
-# Build the package, its tests, and its docs and run the tests
-- stack --no-terminal test --haddock --no-haddock-deps

ChangeLog.md

@@ -1,3 +1,5 @@
 # Changelog for subfix
 
-## Unreleased changes
+## 0.1.0.1
+
+- Updated to current LTS

package.yaml

@@ -1,10 +1,10 @@
 name:                subfix
-version:             0.1.0
+version:             0.1.0.1
-github:              "jlamothe/subfix"
 license:             GPL-3
 author:              "Jonathan Lamothe"
 maintainer:          "jonathan@jlamothe.net"
 copyright:           "Jonathan Lamothe"
+homepage:            "https://git.fingerprintsoftware.ca/jlamothe/subfix"
 
 extra-source-files:
 - README.md
@@ -51,4 +51,4 @@ tests:
     - -with-rtsopts=-N
     dependencies:
     - subfix
-    - hspec >=2.7.4 && <2.8
+    - hspec >=2.9.7 && <2.10

stack.yaml

@@ -17,8 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver:
+resolver: lts-20.13
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/20.yaml
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.

stack.yaml.lock

@@ -6,8 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 532177
+    sha256: b37c0abab16c7de352c45b85f8ecc8530b084209a2c42987a96c92b4a5e3cd65
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/20.yaml
+    size: 648924
-    sha256: 0e14ba5603f01e8496e8984fd84b545a012ca723f51a098c6c9d3694e404dc6d
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/13.yaml
-  original:
+  original: lts-20.13
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/20.yaml

subfix.cabal

@@ -1,18 +1,15 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.33.0.
+-- This file has been generated from package.yaml by hpack version 0.35.1.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: b41ddefa80def277ca2c1c6b04f8b656de59824a18abac5d5385b1f25f2a643e
 
 name:           subfix
-version:        0.1.0
+version:        0.1.0.1
 synopsis:       Fixes .srt files
 description:    Please see the README on GitHub at <https://github.com/jlamothe/subfix#readme>
 category:       Utilities
-homepage:       https://github.com/jlamothe/subfix#readme
+homepage:       https://git.fingerprintsoftware.ca/jlamothe/subfix
-bug-reports:    https://github.com/jlamothe/subfix/issues
 author:         Jonathan Lamothe
 maintainer:     jonathan@jlamothe.net
 copyright:      Jonathan Lamothe
@@ -23,10 +20,6 @@ extra-source-files:
     README.md
     ChangeLog.md
 
-source-repository head
-  type: git
-  location: https://github.com/jlamothe/subfix
-
 library
   exposed-modules:
       SubFix
@@ -71,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

test/SubFix/DecodeSpec.hs

@@ -20,6 +20,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 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
     )