From 9cff291761395ca9f817116f31059851aef01491 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Thu, 27 Sep 2018 14:11:10 +1000 Subject: [PATCH] Make the course work on GHC 8.6 --- .travis.yml | 14 +++++++++----- applied-fp-course.cabal | 25 +++++++++++++------------ 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index c400613..898e1e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,22 +32,26 @@ matrix: - env: BUILD=cabal compiler: "ghc-7.10.3" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}} - env: BUILD=cabal compiler: "ghc-8.0.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}} - env: BUILD=cabal compiler: "ghc-8.2.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}} - env: BUILD=cabal - compiler: "ghc-8.4.1" + compiler: "ghc-8.4.3" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}} + - env: BUILD=cabal + compiler: "ghc-8.6.1" + # env: TEST=--disable-tests BENCH=--disable-benchmarks + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}} # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS # variable, such as using --stack-yaml to point to a different file. diff --git a/applied-fp-course.cabal b/applied-fp-course.cabal index f1e5e11..cb7cb04 100644 --- a/applied-fp-course.cabal +++ b/applied-fp-course.cabal @@ -44,7 +44,8 @@ extra-source-files: changelog.md -- Constraint on the version of Cabal needed to build this package. cabal-version: >=1.10 -tested-with: GHC==8.4.1 +tested-with: GHC==8.6.1 + , GHC==8.4.3 , GHC==8.2.2 , GHC==8.0.2 , GHC==7.10.3 @@ -110,7 +111,7 @@ library -ferror-spans -- Other library packages from which modules are imported. - build-depends: base >=4.8 && <4.12 + build-depends: base >=4.8 && <4.13 , wai == 3.2.* , warp == 3.2.* , http-types >= 0.9 && < 0.13 @@ -144,7 +145,7 @@ test-suite app-fp-tests , Level06Tests , Level07Tests - build-depends: base >= 4.8 && <4.12 + build-depends: base >= 4.8 && <4.13 , applied-fp-course , wai == 3.2.* , wai-extra == 3.0.* @@ -167,12 +168,12 @@ test-suite doctests ghc-options: -threaded main-is: doctests.hs hs-source-dirs: tests - build-depends: base >= 4.8 && <4.12 + build-depends: base >= 4.8 && <4.13 , applied-fp-course , mtl == 2.2.* , hspec >= 2.2 && < 3.0 , hspec-wai >= 0.6 && < 0.10 - , doctest >= 0.11 && < 0.16 + , doctest >= 0.11 && < 0.17 -- Level Executables executable level01-exe @@ -181,7 +182,7 @@ executable level01-exe -- Directories containing source files. hs-source-dirs: exe -- Other library packages from which modules are imported. - build-depends: base >=4.8 && <4.12 + build-depends: base >=4.8 && <4.13 , applied-fp-course -- Base language which the package is written in. default-language: Haskell2010 @@ -192,7 +193,7 @@ executable level02-exe -- Directories containing source files. hs-source-dirs: exe -- Other library packages from which modules are imported. - build-depends: base >=4.8 && <4.12 + build-depends: base >=4.8 && <4.13 , applied-fp-course -- Base language which the package is written in. default-language: Haskell2010 @@ -203,7 +204,7 @@ executable level03-exe -- Directories containing source files. hs-source-dirs: exe -- Other library packages from which modules are imported. - build-depends: base >=4.8 && <4.12 + build-depends: base >=4.8 && <4.13 , applied-fp-course -- Base language which the package is written in. default-language: Haskell2010 @@ -214,7 +215,7 @@ executable level04-exe -- Directories containing source files. hs-source-dirs: exe -- Other library packages from which modules are imported. - build-depends: base >=4.8 && <4.12 + build-depends: base >=4.8 && <4.13 , applied-fp-course -- Base language which the package is written in. default-language: Haskell2010 @@ -225,7 +226,7 @@ executable level05-exe -- Directories containing source files. hs-source-dirs: exe -- Other library packages from which modules are imported. - build-depends: base >=4.8 && <4.12 + build-depends: base >=4.8 && <4.13 , applied-fp-course -- Base language which the package is written in. default-language: Haskell2010 @@ -236,7 +237,7 @@ executable level06-exe -- Directories containing source files. hs-source-dirs: exe -- Other library packages from which modules are imported. - build-depends: base >=4.8 && <4.12 + build-depends: base >=4.8 && <4.13 , applied-fp-course -- Base language which the package is written in. default-language: Haskell2010 @@ -247,7 +248,7 @@ executable level07-exe -- Directories containing source files. hs-source-dirs: exe -- Other library packages from which modules are imported. - build-depends: base >=4.8 && <4.12 + build-depends: base >=4.8 && <4.13 , applied-fp-course -- Base language which the package is written in. default-language: Haskell2010