[#429] Move to GHC-8.8.3 (#431)

* [#429] Move to GHC-8.8.3 Resolves #429 * Update stack.yaml Co-Authored-By: Dmitrii Kovanikov <kovanikov@gmail.com> * Remove commas in cabal files Co-authored-by: Dmitrii Kovanikov <kovanikov@gmail.com>
kowainik · Mar 17, 2020 · a12f90f · a12f90f
1 parent b4b190d
commit a12f90f
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 38 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
           - "8.2.2"
           - "8.4.4"
           - "8.6.5"
-          - "8.8.2"
+          - "8.8.3"
 
     steps:
     - uses: actions/checkout@v2
@@ -44,7 +44,7 @@ jobs:
       run: |
         cabal v2-test all --enable-tests
 
-    - if: matrix.ghc == '8.8.2'
+    - if: matrix.ghc == '8.8.3'
       name: Build 'cabal-minimal'
       run: |
         cd "summoner-cli/examples/cabal-minimal/"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,9 +16,10 @@ The changelog is available [on GitHub][2].
   Add `GitHub Actions` button into TUI.
   Add `githubActions` to the TOML configs.
   (by [@patrickt](https://github.com/patrickt), [@vrom911](https://github.com/vrom911))
-* [#401](https://github.com/kowainik/summoner/issues/401):
-  Support GHC-8.8.2 in the project.
-  Make GHC-8.8.2 default for the generated projects.
+* [#401](https://github.com/kowainik/summoner/issues/401)
+  [#429](https://github.com/kowainik/summoner/issues/429):
+  Support GHC-8.8.3 in the project.
+  Make GHC-8.8.3 default for the generated projects.
   (by [@vrom911](https://github.com/vrom911))
 * Upgrade GHC-8.6.5 LTS to `14.27`.
   (by [@vrom911](https://github.com/vrom911))

diff --git a/README.md b/README.md
@@ -372,7 +372,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.8.2`. However, additionally you can specify other versions. For each version `x.y.z` the `stack-x.y.z.yaml` will be created.          |
+| `ghcVersions`    | [GHC]   | `summoner` uses default `GHC-8.8.3`. However, additionally you can specify other versions. For each version `x.y.z` the `stack-x.y.z.yaml` will be created.          |
 | `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-15.0
+resolver: lts-15.4
 
 packages:
   - summoner-cli/

diff --git a/summoner-cli/examples/cabal-full/.github/workflows/ci.yml b/summoner-cli/examples/cabal-full/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
         ghc:
           - "8.4.4"
           - "8.6.5"
-          - "8.8.2"
+          - "8.8.3"
 
     steps:
     - uses: actions/checkout@v2

diff --git a/summoner-cli/examples/cabal-full/.travis.yml b/summoner-cli/examples/cabal-full/.travis.yml
@@ -15,7 +15,7 @@ matrix:
   include:
   - ghc: 8.4.4
   - ghc: 8.6.5
-  - ghc: 8.8.2
+  - ghc: 8.8.3
 
 
 install:

diff --git a/summoner-cli/examples/cabal-full/appveyor.yml b/summoner-cli/examples/cabal-full/appveyor.yml
@@ -16,12 +16,12 @@ environment:
     CABOPTS: --store-dir=C:\\SR
 
   matrix:
-    - GHCVER: 8.8.2
+    - GHCVER: 8.8.3
 
 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.8.2
+  - choco install -y ghc   --version 8.8.3
   - refreshenv
 
 before_build:

diff --git a/summoner-cli/examples/cabal-full/cabal-full.cabal b/summoner-cli/examples/cabal-full/cabal-full.cabal
@@ -16,7 +16,7 @@ extra-doc-files:     README.md
                      CHANGELOG.md
 tested-with:         GHC == 8.4.4
                      GHC == 8.6.5
-                     GHC == 8.8.2
+                     GHC == 8.8.3
 
 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
@@ -10,7 +10,7 @@ copyright:           2020 Kowainik
 build-type:          Simple
 extra-doc-files:     README.md
                      CHANGELOG.md
-tested-with:         GHC == 8.8.2
+tested-with:         GHC == 8.8.3
 
 common common-options
   build-depends:       base ^>= 4.13.0.0

diff --git a/summoner-cli/examples/full-batteries/.github/workflows/ci.yml b/summoner-cli/examples/full-batteries/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
           - "8.2.2"
           - "8.4.4"
           - "8.6.5"
-          - "8.8.2"
+          - "8.8.3"
 
     steps:
     - uses: actions/checkout@v2

diff --git a/summoner-cli/examples/full-batteries/.travis.yml b/summoner-cli/examples/full-batteries/.travis.yml
@@ -18,7 +18,7 @@ matrix:
   - ghc: 8.2.2
   - ghc: 8.4.4
   - ghc: 8.6.5
-  - ghc: 8.8.2
+  - ghc: 8.8.3
 
   - ghc: 8.2.2
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.2.2.yaml"
@@ -29,7 +29,7 @@ matrix:
   - ghc: 8.6.5
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.6.5.yaml"
 
-  - ghc: 8.8.2
+  - ghc: 8.8.3
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
 
 install:

diff --git a/summoner-cli/examples/full-batteries/appveyor.yml b/summoner-cli/examples/full-batteries/appveyor.yml
@@ -16,12 +16,12 @@ environment:
     CABOPTS: --store-dir=C:\\SR
 
   matrix:
-    - GHCVER: 8.8.2
+    - GHCVER: 8.8.3
 
 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.8.2
+  - choco install -y ghc   --version 8.8.3
   - refreshenv
 
 before_build:

diff --git a/summoner-cli/examples/full-batteries/full-batteries.cabal b/summoner-cli/examples/full-batteries/full-batteries.cabal
@@ -18,7 +18,7 @@ tested-with:         GHC == 8.0.2
                      GHC == 8.2.2
                      GHC == 8.4.4
                      GHC == 8.6.5
-                     GHC == 8.8.2
+                     GHC == 8.8.3
 
 source-repository head
   type:                git

diff --git a/summoner-cli/examples/full-batteries/stack.yaml b/summoner-cli/examples/full-batteries/stack.yaml
@@ -1 +1 @@
-resolver: lts-15.0
+resolver: lts-15.4
diff --git a/summoner-cli/examples/stack-full/.travis.yml b/summoner-cli/examples/stack-full/.travis.yml
@@ -22,7 +22,7 @@ matrix:
   - ghc: 8.6.5
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.6.5.yaml"
 
-  - ghc: 8.8.2
+  - ghc: 8.8.3
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
 
 install:

diff --git a/summoner-cli/examples/stack-full/stack-full.cabal b/summoner-cli/examples/stack-full/stack-full.cabal
@@ -16,7 +16,7 @@ extra-doc-files:     README.md
                      CHANGELOG.md
 tested-with:         GHC == 8.4.4
                      GHC == 8.6.5
-                     GHC == 8.8.2
+                     GHC == 8.8.3
 
 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-15.0
+resolver: lts-15.4
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.8.2.
+# List of additional GHC versions to support besides 8.8.3.
 # Run the 'summon show ghc' command to see the list of all supported GHC versions.
 # ghcVersions = ["8.4.4", "8.6.5"]
 

diff --git a/summoner-cli/src/Summoner/GhcVer.hs b/summoner-cli/src/Summoner/GhcVer.hs
@@ -24,8 +24,8 @@ module Summoner.GhcVer
 import Data.List (maximum, minimum)
 import Relude.Extra.Enum (inverseMap, universe)
 
-import qualified Text.Show as Show
 import qualified Data.Text as T
+import qualified Text.Show as Show
 
 
 -- | Represents some selected set of GHC versions.
@@ -35,7 +35,7 @@ data GhcVer
     | Ghc822
     | Ghc844
     | Ghc865
-    | Ghc882
+    | Ghc883
     deriving stock (Eq, Ord, Show, Enum, Bounded)
 
 -- | Converts 'GhcVer' into dot-separated string.
@@ -46,7 +46,7 @@ showGhcVer = \case
     Ghc822  -> "8.2.2"
     Ghc844  -> "8.4.4"
     Ghc865  -> "8.6.5"
-    Ghc882  -> "8.8.2"
+    Ghc883  -> "8.8.3"
 
 -- | These are old GHC versions that are not working with default GHC versions when using Stack.
 oldGhcs :: [GhcVer]
@@ -63,7 +63,7 @@ latestLts = \case
     Ghc822  -> "lts-11.22"
     Ghc844  -> "lts-12.26"
     Ghc865  -> "lts-14.27"
-    Ghc882  -> "lts-15.0"
+    Ghc883  -> "lts-15.4"
 
 -- | Represents PVP versioning (4 numbers).
 data Pvp = Pvp
@@ -85,7 +85,7 @@ baseVerPvp = \case
     Ghc822  -> Pvp 4 10 1 0
     Ghc844  -> Pvp 4 11 1 0
     Ghc865  -> Pvp 4 12 0 0
-    Ghc882  -> Pvp 4 13 0 0
+    Ghc883  -> Pvp 4 13 0 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
@@ -15,11 +15,11 @@ category:            CLI, CLI Tool, Development
 build-type:          Simple
 stability:           stable
 extra-doc-files:     README.md
-                   , CHANGELOG.md
+                     CHANGELOG.md
 tested-with:         GHC == 8.2.2
-                   , GHC == 8.4.4
-                   , GHC == 8.6.5
-                   , GHC == 8.8.2
+                     GHC == 8.4.4
+                     GHC == 8.6.5
+                     GHC == 8.8.3
 extra-source-files:
     examples/summoner-default.toml
 

diff --git a/summoner-cli/test/Test/Show.hs b/summoner-cli/test/Test/Show.hs
@@ -19,5 +19,5 @@ 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.2     base-4.13.0.0   lts-15.0"
+  , "GHC-8.8.3     base-4.13.0.0   lts-15.4"
   ]
diff --git a/summoner-tui/summoner-tui.cabal b/summoner-tui/summoner-tui.cabal
@@ -15,11 +15,11 @@ category:            TUI, TUI Tool, Development
 build-type:          Simple
 stability:           experimental
 extra-doc-files:     README.md
-                   , CHANGELOG.md
+                     CHANGELOG.md
 tested-with:         GHC == 8.2.2
-                   , GHC == 8.4.4
-                   , GHC == 8.6.5
-                   , GHC == 8.8.2
+                     GHC == 8.4.4
+                     GHC == 8.6.5
+                     GHC == 8.8.3
 
 source-repository head
   type:     git
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ jobs: @@
             ghc:
               - "8.4.4"
               - "8.6.5"
-              - "8.8.2"
+              - "8.8.3"
         steps:
         - uses: actions/checkout@v2
@@ Expand Down @@