diff --git a/.github/workflows/Build release.yml b/.github/workflows/Build release.yml index a5e4f6156..3ca174359 100644 --- a/.github/workflows/Build release.yml +++ b/.github/workflows/Build release.yml @@ -39,17 +39,17 @@ jobs: name: Setup Haskell id: setup-haskell with: - ghc-version: 8.8.4 + ghc-version: 8.10.3 - name: Workaround for https://github.com/actions/setup-haskell/issues/36 if: runner.os == 'macOS' run: | ghcup list - ghcup set ghc 8.8.4 + ghcup set ghc 8.10.3 - name: Verify Haskell version run: | cabal --version ghc --version - [[ $(ghc --numeric-version) == 8.8.4 ]] + [[ $(ghc --numeric-version) == 8.10.3 ]] - uses: actions/cache@v2 name: Cache cabal-release-v1-${{ runner.os }}-${{ hashFiles('cabal.project.freeze') }} with: diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1d77c31f8..6b5ab28f8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -31,7 +31,7 @@ jobs: name: Setup Haskell id: setup-haskell with: - ghc-version: 8.8.4 + ghc-version: 8.10.3 - uses: actions/cache@v2 name: Cache cabal-v2-${{ runner.os }}-${{ hashFiles('cabal.project.freeze') }} with: diff --git a/.travis.yml b/.travis.yml index 8f7cd2277..0f8e2f3ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false language: haskell cabal: "3.2" -ghc: "8.8.4" +ghc: "8.10.3" cache: diff --git a/Dockerfile b/Dockerfile index f0c478562..9b3e12f97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:latest as build -ENV GHC_VERSION 8.8.4 +ENV GHC_VERSION 8.10.3 ENV LANG C.UTF-8 diff --git a/README.md b/README.md index fae827478..4d27cee81 100644 --- a/README.md +++ b/README.md @@ -304,8 +304,8 @@ git clone https://github.com/avh4/elm-format.git cd elm-format # initial setup -ghcup install ghc 8.8.4 -ghcup set ghc 8.8.4 +ghcup install ghc 8.10.3 +ghcup set ghc 8.10.3 # build ./build.sh -- build diff --git a/Shakefiles/Haskell.hs b/Shakefiles/Haskell.hs index a25fd594f..9d8fce598 100644 --- a/Shakefiles/Haskell.hs +++ b/Shakefiles/Haskell.hs @@ -73,7 +73,7 @@ cabalBinPath projectName opt = "elm-format" -> "0.8.4" _ -> "0.0.0" in - "dist-newstyle/build" Shakefiles.Platform.cabalInstallOs "ghc-8.8.4" projectName ++ "-" ++ version "x" projectName opt "build" projectName projectName <.> exe + "dist-newstyle/build" Shakefiles.Platform.cabalInstallOs "ghc-8.10.3" projectName ++ "-" ++ version "x" projectName opt "build" projectName projectName <.> exe executable :: FilePath -> String -> String -> Rules () diff --git a/cabal.project b/cabal.project index a4c994653..98d67c408 100644 --- a/cabal.project +++ b/cabal.project @@ -4,4 +4,4 @@ packages: ./elm-format-lib, ./elm-format-test-lib, ./ -with-compiler: ghc-8.8.4 +with-compiler: ghc-8.10.3 diff --git a/cabal.project.freeze b/cabal.project.freeze index 8e1e85823..b351f7cdd 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -1,6 +1,6 @@ constraints: any.Glob ==0.10.1, - any.HUnit ==1.6.0.0, - any.QuickCheck ==2.14.1, + any.HUnit ==1.6.2.0, + any.QuickCheck ==2.14.2, QuickCheck -old-random +templatehaskell, any.ansi-terminal ==0.10.3, ansi-terminal -example, @@ -9,12 +9,12 @@ constraints: any.Glob ==0.10.1, any.array ==0.5.4.0, any.async ==2.2.2, async -bench, - any.base ==4.13.0.0, + any.base ==4.14.1.0, any.bimap ==0.3.3, - any.binary ==0.8.7.0, - any.bytestring ==0.10.10.1, - any.call-stack ==0.2.0, - any.clock ==0.8, + any.binary ==0.8.8.0, + any.bytestring ==0.10.12.0, + any.call-stack ==0.3.0, + any.clock ==0.8.2, clock -llvm, any.cmark ==0.6, cmark -pkgconfig, @@ -26,18 +26,17 @@ constraints: any.Glob ==0.10.1, any.dlist ==1.0, dlist -werror, any.exceptions ==0.10.4, - exceptions +transformers-0-4, any.filepath ==1.4.2.1, - any.ghc-boot-th ==8.8.4, - any.ghc-prim ==0.5.3, + any.ghc-boot-th ==8.10.3, + any.ghc-prim ==0.6.1, any.hashable ==1.3.0.0, hashable -examples +integer-gmp +sse2 -sse41, - any.hspec ==2.7.4, - any.hspec-core ==2.7.4, - any.hspec-discover ==2.7.4, + any.hspec ==2.7.8, + any.hspec-core ==2.7.8, + any.hspec-discover ==2.7.8, any.hspec-expectations ==0.8.2, any.indents ==0.3.3, - any.integer-gmp ==1.0.2.0, + any.integer-gmp ==1.0.3.0, any.json ==0.10, json +generic -mapdict +parsec +pretty +split-base, any.logict ==0.7.0.3, @@ -52,36 +51,36 @@ constraints: any.Glob ==0.10.1, any.relude ==0.7.0.0, any.rts ==1.0, any.setenv ==0.1.1.3, - any.smallcheck ==1.2.0, + any.smallcheck ==1.2.1, any.split ==0.2.3.4, - any.splitmix ==0.1.0.1, + any.splitmix ==0.1.0.3, splitmix -optimised-mixer, any.stm ==2.5.0.0, - any.syb ==0.7.1, - any.tagged ==0.8.6, + any.syb ==0.7.2.1, + any.tagged ==0.8.6.1, tagged +deepseq +transformers, - any.tasty ==1.3.1, - tasty +clock, - any.tasty-discover ==4.2.1, + any.tasty ==1.4.0.3, + tasty +clock +unix, + any.tasty-discover ==4.2.2, any.tasty-golden ==2.3.4, tasty-golden -build-example, - any.tasty-hspec ==1.1.5.1, - any.tasty-hunit ==0.10.0.2, - any.tasty-quickcheck ==0.10.1.1, - any.tasty-smallcheck ==0.8.1, - any.template-haskell ==2.15.0.0, + any.tasty-hspec ==1.1.6, + any.tasty-hunit ==0.10.0.3, + any.tasty-quickcheck ==0.10.1.2, + any.tasty-smallcheck ==0.8.2, + any.template-haskell ==2.16.0.0, any.temporary ==1.3, - any.text ==1.2.4.0, + any.text ==1.2.4.1, any.tf-random ==0.5, any.time ==1.9.3, any.transformers ==0.5.6.2, - any.transformers-compat ==0.6.5, + any.transformers-compat ==0.6.6, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, - any.unbounded-delays ==0.1.1.0, + any.unbounded-delays ==0.1.1.1, any.unix ==2.7.2.2, - any.unix-compat ==0.5.2, + any.unix-compat ==0.5.3, unix-compat -old-time, - any.unordered-containers ==0.2.12.0, + any.unordered-containers ==0.2.13.0, unordered-containers -debug, any.wcwidth ==0.0.2, wcwidth -cli +split-base