[#547] Support GHC 8.10.7 (#548)

* [#547] Support GHC 8.10.7 Resolves #547 * Update summoner-cli/src/Summoner/GhcVer.hs Co-authored-by: Dmitrii Kovanikov <kovanikov@gmail.com> * Fix Co-authored-by: Dmitrii Kovanikov <kovanikov@gmail.com>
kowainik · Sep 18, 2021 · 3f66f31 · 3f66f31
1 parent a1770b3
commit 3f66f31
Show file tree

Hide file tree

Showing 26 changed files with 46 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,11 +22,11 @@ jobs:
           - "8.4.4"
           - "8.6.5"
           - "8.8.4"
-          - "8.10.4"
+          - "8.10.7"
           - "9.0.1"
         exclude:
           - os: macOS-latest
-            ghc: 8.10.4
+            ghc: 8.10.7
           - os: macOS-latest
             ghc: 8.8.4
           - os: macOS-latest
@@ -35,7 +35,7 @@ jobs:
             ghc: 8.4.4
 
           - os: windows-latest
-            ghc: 8.10.4
+            ghc: 8.10.7
           - os: windows-latest
             ghc: 8.8.4
           - os: windows-latest
@@ -79,7 +79,7 @@ jobs:
       run: |
         cabal test all --enable-tests --test-show-details=direct
 
-    - if: matrix.ghc == '8.10.4'
+    - if: matrix.ghc == '8.10.7'
       name: Build 'cabal-minimal'
       run: |
         cd "summoner-cli/examples/cabal-minimal/"
@@ -113,7 +113,7 @@ jobs:
     strategy:
       matrix:
         stack: ["2.5"]
-        ghc: ["8.10.4"]
+        ghc: ["8.10.7"]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,11 +13,13 @@ The changelog is available [on GitHub][2].
   Switch from `aeson` to `microaeson`.
 * [#466](https://github.com/kowainik/summoner/issues/466):
   Add ` --test-show-details=direct` to `cabal test` on CI.
-* [#444](https://github.com/kowainik/summoner/issues/444):
+* [#444](https://github.com/kowainik/summoner/issues/444)
+  [#547](https://github.com/kowainik/summoner/issues/547):
   Support GHC-8.10.1 in the generated projects.
   Use GHC-8.10.1 by default in the generated projects.
   Use `nightly-2020-06-29` for stack resolver.
   UPD: Use GHC-8.10.3 and `lts-17.0` instead.
+  UPD: Use GHC-8.10.7 and `lts-18.10` instead.
 * [#445](https://github.com/kowainik/summoner/issues/445):
   Add `-Wunused-packages` for GHC-8.10.
 * [#477](https://github.com/kowainik/summoner/issues/477):

diff --git a/README.md b/README.md
@@ -470,7 +470,7 @@ Here is the list of the options that can be configured to suit your needs. If op
 | `fullName`       | Text    | Full name.                                                                                                                                                           |
 | `email`          | Text    | E-mail address.                                                                                                                                                      |
 | `license`        | License | One of: `MIT`, `BSD2`, `BSD3`, `GPL-2`, `GPL-3`, `LGPL-2.1`, `LGPL-3`, `AGPL-3`, `Apache-2.0`, `MPL-2.0`, `None`.                                                    |
-| `ghcVersions`    | [GHC]   | `summoner` uses default `GHC-8.10.1`. However, additionally you can specify other versions. For each version `x.y.z` the `stack-x.y.z.yaml` will be created. Use `summon show ghc` to see all supported GHC versions. |
+| `ghcVersions`    | [GHC]   | `summoner` uses default `GHC-8.10.7`. However, additionally you can specify other versions. For each version `x.y.z` the `stack-x.y.z.yaml` will be created. Use `summon show ghc` to see all supported GHC versions. |
 | `github`         | Bool    | Turn on `GitHub` integration by default?                                                                                                                             |
 | `gitignore`      | [Text]  | List of files you want added to the default `.gitignore`. (Ignored if `github = false`)                                                                              |
 | `noUpload`       | Bool    | Do not upload to GitHub, but create all GitHub related files if specified (Ignored if `github = false`)                                                              |

diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.9
+resolver: lts-18.10
 
 packages:
   - summoner-cli/
@@ -12,4 +12,3 @@ extra-deps:
   - optparse-applicative-0.16.0.0
   - relude-1.0.0.1
   - tomland-1.3.3.0
-  - vty-5.31
diff --git a/summoner-cli/examples/cabal-full/.github/workflows/ci.yml b/summoner-cli/examples/cabal-full/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
           - "8.4.4"
           - "8.6.5"
           - "8.8.4"
-          - "8.10.3"
+          - "8.10.7"
         exclude:
           - os: macOS-latest
             ghc: 8.8.4

diff --git a/summoner-cli/examples/cabal-full/.travis.yml b/summoner-cli/examples/cabal-full/.travis.yml
@@ -14,7 +14,7 @@ jobs:
   - ghc: 8.4.4
   - ghc: 8.6.5
   - ghc: 8.8.4
-  - ghc: 8.10.3
+  - ghc: 8.10.7
 
 install:
   # HLint check

diff --git a/summoner-cli/examples/cabal-full/appveyor.yml b/summoner-cli/examples/cabal-full/appveyor.yml
@@ -21,12 +21,12 @@ environment:
     CABOPTS: --store-dir=C:\\SR
 
   matrix:
-    - GHCVER: 8.10.3
+    - GHCVER: 8.10.7
 
 install:
   - choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
   - choco install -y cabal --version 2.4.1.0
-  - choco install -y ghc   --version 8.10.3
+  - choco install -y ghc   --version 8.10.7
   - refreshenv
 
 before_build:

diff --git a/summoner-cli/examples/cabal-full/cabal-full.cabal b/summoner-cli/examples/cabal-full/cabal-full.cabal
@@ -19,7 +19,7 @@ extra-doc-files:     README.md
 tested-with:         GHC == 8.4.4
                      GHC == 8.6.5
                      GHC == 8.8.4
-                     GHC == 8.10.3
+                     GHC == 8.10.7
 
 source-repository head
   type:                git

diff --git a/summoner-cli/examples/cabal-minimal/cabal-minimal.cabal b/summoner-cli/examples/cabal-minimal/cabal-minimal.cabal
@@ -12,10 +12,10 @@ copyright:           2020 Kowainik
 build-type:          Simple
 extra-doc-files:     README.md
                      CHANGELOG.md
-tested-with:         GHC == 8.10.3
+tested-with:         GHC == 8.10.7
 
 common common-options
-  build-depends:       base ^>= 4.14.1.0
+  build-depends:       base ^>= 4.14.3.0
 
   ghc-options:         -Wall
                        -Wcompat

diff --git a/summoner-cli/examples/full-batteries/.github/workflows/ci.yml b/summoner-cli/examples/full-batteries/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
           - "8.4.4"
           - "8.6.5"
           - "8.8.4"
-          - "8.10.3"
+          - "8.10.7"
         exclude:
           - os: macOS-latest
             ghc: 8.8.4
@@ -85,7 +85,7 @@ jobs:
           - "8.4.4"
           - "8.6.5"
           - "8.8.4"
-          - "8.10.3"
+          - "8.10.7"
 
     steps:
     - uses: actions/checkout@v2.3.3

diff --git a/summoner-cli/examples/full-batteries/.travis.yml b/summoner-cli/examples/full-batteries/.travis.yml
@@ -18,7 +18,7 @@ jobs:
   - ghc: 8.4.4
   - ghc: 8.6.5
   - ghc: 8.8.4
-  - ghc: 8.10.3
+  - ghc: 8.10.7
 
   - ghc: 8.0.2
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.0.2.yaml"
@@ -35,7 +35,7 @@ jobs:
   - ghc: 8.8.4
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.8.4.yaml"
 
-  - ghc: 8.10.3
+  - ghc: 8.10.7
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
 
   allow_failures:

diff --git a/summoner-cli/examples/full-batteries/appveyor.yml b/summoner-cli/examples/full-batteries/appveyor.yml
@@ -21,12 +21,12 @@ environment:
     CABOPTS: --store-dir=C:\\SR
 
   matrix:
-    - GHCVER: 8.10.3
+    - GHCVER: 8.10.7
 
 install:
   - choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
   - choco install -y cabal --version 2.4.1.0
-  - choco install -y ghc   --version 8.10.3
+  - choco install -y ghc   --version 8.10.7
   - refreshenv
 
 before_build:

diff --git a/summoner-cli/examples/full-batteries/full-batteries.cabal b/summoner-cli/examples/full-batteries/full-batteries.cabal
@@ -21,7 +21,7 @@ tested-with:         GHC == 8.0.2
                      GHC == 8.4.4
                      GHC == 8.6.5
                      GHC == 8.8.4
-                     GHC == 8.10.3
+                     GHC == 8.10.7
 
 source-repository head
   type:                git

diff --git a/summoner-cli/examples/full-batteries/stack-8.8.4.yaml b/summoner-cli/examples/full-batteries/stack-8.8.4.yaml
@@ -1 +1 @@
-resolver: lts-16.17
+resolver: lts-16.31
diff --git a/summoner-cli/examples/full-batteries/stack.yaml b/summoner-cli/examples/full-batteries/stack.yaml
@@ -1 +1 @@
-resolver: lts-17.0
+resolver: lts-18.10
diff --git a/summoner-cli/examples/stack-full/.github/workflows/ci.yml b/summoner-cli/examples/stack-full/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
           - "8.4.4"
           - "8.6.5"
           - "8.8.4"
-          - "8.10.3"
+          - "8.10.7"
 
     steps:
     - uses: actions/checkout@v2.3.3

diff --git a/summoner-cli/examples/stack-full/.travis.yml b/summoner-cli/examples/stack-full/.travis.yml
@@ -22,7 +22,7 @@ jobs:
   - ghc: 8.8.4
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.8.4.yaml"
 
-  - ghc: 8.10.3
+  - ghc: 8.10.7
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
 
   allow_failures:

diff --git a/summoner-cli/examples/stack-full/stack-8.8.4.yaml b/summoner-cli/examples/stack-full/stack-8.8.4.yaml
@@ -1 +1 @@
-resolver: lts-16.17
+resolver: lts-16.31
diff --git a/summoner-cli/examples/stack-full/stack-full.cabal b/summoner-cli/examples/stack-full/stack-full.cabal
@@ -19,7 +19,7 @@ extra-doc-files:     README.md
 tested-with:         GHC == 8.4.4
                      GHC == 8.6.5
                      GHC == 8.8.4
-                     GHC == 8.10.3
+                     GHC == 8.10.7
 
 source-repository head
   type:                git

diff --git a/summoner-cli/examples/stack-full/stack.yaml b/summoner-cli/examples/stack-full/stack.yaml
@@ -1 +1 @@
-resolver: lts-17.0
+resolver: lts-18.10
diff --git a/summoner-cli/examples/summoner-default.toml b/summoner-cli/examples/summoner-default.toml
@@ -48,7 +48,7 @@ license = "MIT"
 # travis = true         # Travis CI
 # appveyor = true       # AppVeyor CI
 
-# List of additional GHC versions to support besides 8.10.3.
+# List of additional GHC versions to support besides 8.10.7.
 # Run the 'summon show ghc' command to see the list of all supported GHC versions.
 # ghcVersions = ["8.6.5", "8.8.4"]
 

diff --git a/summoner-cli/src/Summoner/GhcVer.hs b/summoner-cli/src/Summoner/GhcVer.hs
@@ -35,7 +35,7 @@ data GhcVer
     | Ghc844
     | Ghc865
     | Ghc884
-    | Ghc8103
+    | Ghc8107
     deriving stock (Eq, Ord, Show, Enum, Bounded)
 
 -- | Converts 'GhcVer' into dot-separated string.
@@ -46,7 +46,7 @@ showGhcVer = \case
     Ghc844  -> "8.4.4"
     Ghc865  -> "8.6.5"
     Ghc884  -> "8.8.4"
-    Ghc8103 -> "8.10.3"
+    Ghc8107 -> "8.10.7"
 
 {- | These are old GHC versions that are not working with default GHC versions
 when using Stack.
@@ -64,8 +64,8 @@ latestLts = \case
     Ghc822  -> "lts-11.22"
     Ghc844  -> "lts-12.26"
     Ghc865  -> "lts-14.27"
-    Ghc884  -> "lts-16.17"
-    Ghc8103 -> "lts-17.0"
+    Ghc884  -> "lts-16.31"
+    Ghc8107 -> "lts-18.10"
 
 -- | Represents PVP versioning (4 numbers).
 data Pvp = Pvp
@@ -87,7 +87,7 @@ baseVerPvp = \case
     Ghc844  -> Pvp 4 11 1 0
     Ghc865  -> Pvp 4 12 0 0
     Ghc884  -> Pvp 4 13 0 0
-    Ghc8103 -> Pvp 4 14 1 0
+    Ghc8107 -> Pvp 4 14 3 0
 
 -- | Returns corresponding @base@ version of the given GHC version.
 baseVer :: GhcVer -> Text

diff --git a/summoner-cli/summoner.cabal b/summoner-cli/summoner.cabal
@@ -19,7 +19,7 @@ extra-doc-files:     README.md
 tested-with:         GHC == 8.4.4
                      GHC == 8.6.5
                      GHC == 8.8.4
-                     GHC == 8.10.3
+                     GHC == 8.10.7
                      GHC == 9.0.1
 extra-source-files:
     examples/summoner-default.toml
@@ -182,7 +182,7 @@ test-suite summoner-test
                      , hspec >= 2.4.8
                      , hspec-hedgehog ^>= 0.0.1.1
                      , tomland
-                     , tree-diff >= 0.0.2 && < 0.2
+                     , tree-diff >= 0.0.2 && < 0.3
                      , summoner
                      , validation-selective
 

diff --git a/summoner-cli/test/Test/Script.hs b/summoner-cli/test/Test/Script.hs
@@ -22,7 +22,7 @@ cabalScript = unlines
     [ "#!/usr/bin/env cabal"
     , "{- cabal:"
     , "build-depends:"
-    , "  , base ^>= 4.14.1.0"
+    , "  , base ^>= 4.14.3.0"
     , "-}"
     , ""
     , "main :: IO ()"
@@ -33,7 +33,7 @@ stackScript :: Text
 stackScript = unlines
     [ "#!/usr/bin/env stack"
     , "{- stack"
-    , "  --resolver lts-17.0"
+    , "  --resolver lts-18.10"
     , "  script"
     , "  --package base"
     , "-}"

diff --git a/summoner-cli/test/Test/Show.hs b/summoner-cli/test/Test/Show.hs
@@ -18,6 +18,6 @@ goldenGhcTable =
     , "GHC-8.2.2     base-4.10.1.0   lts-11.22"
     , "GHC-8.4.4     base-4.11.1.0   lts-12.26"
     , "GHC-8.6.5     base-4.12.0.0   lts-14.27"
-    , "GHC-8.8.4     base-4.13.0.0   lts-16.17"
-    , "GHC-8.10.3    base-4.14.1.0   lts-17.0"
+    , "GHC-8.8.4     base-4.13.0.0   lts-16.31"
+    , "GHC-8.10.7    base-4.14.3.0   lts-18.10"
     ]
diff --git a/summoner-tui/summoner-tui.cabal b/summoner-tui/summoner-tui.cabal
@@ -19,7 +19,7 @@ extra-doc-files:     README.md
 tested-with:         GHC == 8.4.4
                      GHC == 8.6.5
                      GHC == 8.8.4
-                     GHC == 8.10.3
+                     GHC == 8.10.7
                      GHC == 9.0.1
 
 source-repository head
@@ -80,14 +80,14 @@ library
   autogen-modules:     Paths_summoner_tui
   other-modules:       Paths_summoner_tui
 
-  build-depends:       brick >= 0.56 && < 0.61
+  build-depends:       brick >= 0.56 && < 0.65
                      , colourista ^>= 0.1
                      , directory ^>= 1.3.0.2
                      , microlens ^>= 0.4
                      , microlens-th ^>= 0.4
                      , summoner ^>= 2.0.0.0
                      , validation-selective >= 0.0.0.0 && < 0.2
-                     , vty >= 5.25 && < 5.32
+                     , vty >= 5.25 && < 5.34
 
 executable summon-tui
   import:              common-options
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ jobs: @@
               - "8.4.4"
               - "8.6.5"
               - "8.8.4"
-              - "8.10.3"
+              - "8.10.7"
         steps:
         - uses: actions/checkout@v2.3.3
@@ Expand Down @@