diff --git a/.travis.yml b/.travis.yml index 8fb9020..c3771f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,14 @@ matrix: compiler: ": #stack 8.2.1" addons: { apt: { packages: [libgmp-dev] } } + - env: ARGS="--resolver lts-11" + compiler: ": #stack 8.2.2" + addons: { apt: { packages: [libgmp-dev] } } + + - env: ARGS="--resolver lts-12" + compiler: ": #stack 8.4.3" + addons: { apt: { packages: [libgmp-dev] } } + - env: ARGS="--resolver nightly" compiler: ": #stack nightly" addons: { apt: { packages: [libgmp-dev] } } diff --git a/bench/Core.hs b/bench/Core.hs index a19d55f..1fa957f 100644 --- a/bench/Core.hs +++ b/bench/Core.hs @@ -55,8 +55,8 @@ countDownExcMTL = MTL.runStateT go where go = MTL.get >>= (\n -> if n <= (0 :: Int) then MTL.throwError "wat" else MTL.put (n-1) >> go) countDownExcEE :: Int -> Either String (Int,Int) -countDownExcEE start = EE.run $ EE.runExc (EE.runState start go) - where go = EE.get >>= (\n -> if n <= (0 :: Int) then EE.throwExc "wat" else EE.put (n-1) >> go) +countDownExcEE start = EE.run $ EE.runError (EE.runState start go) + where go = EE.get >>= (\n -> if n <= (0 :: Int) then EE.throwError "wat" else EE.put (n-1) >> go) -------------------------------------------------------------------------------- -- Freer: Interpreter -- diff --git a/package.yaml b/package.yaml index b89e9dd..bd63967 100644 --- a/package.yaml +++ b/package.yaml @@ -83,7 +83,7 @@ benchmarks: ghc-options: -O2 dependencies: - criterion - - extensible-effects < 2 + - extensible-effects - free - freer-simple - mtl diff --git a/stack.yaml b/stack.yaml index 1f98618..1af3bf0 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,10 +1,10 @@ -resolver: lts-10.5 +resolver: lts-12.8 packages: - '.' extra-deps: -- extensible-effects-1.11.1.0 +- extensible-effects-3.1.0.0 flags: {} extra-package-dbs: []