[#539] Support GHC 9.0 in generated projects (#556)

* [#539] Support GHC 9.0 in generated projects Resolves #539 * Update CHANGELOG * Fix ci setup for 9.0.2 * Apply suggestions from code review Co-authored-by: Dmitrii Kovanikov <[email protected]> * Update lts version for 8.10 * Fix * Fix stack build Co-authored-by: Dmitrii Kovanikov <[email protected]>
kowainik · Jan 11, 2022 · 0c03dd0 · 0c03dd0
1 parent 31b10b9
commit 0c03dd0
Show file tree

Hide file tree

Showing 62 changed files with 111 additions and 85 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
           - "8.6.5"
           - "8.8.4"
           - "8.10.7"
-          - "9.0.1"
+          - "9.0.2"
         exclude:
           - os: macOS-latest
             ghc: 8.10.7
@@ -78,29 +78,26 @@ jobs:
       run: |
         cabal test all
 
-    - if: matrix.ghc == '8.10.7'
+    - if: matrix.ghc == '9.0.2'
       name: Build 'cabal-minimal'
       run: |
         cd "summoner-cli/examples/cabal-minimal/"
         echo "packages: ." > cabal.project
         cabal build all
 
-    - if: matrix.ghc != '9.0.1'
-      name: Build 'cabal-full'
+    - name: Build 'cabal-full'
       run: |
         cd "summoner-cli/examples/cabal-full/"
         echo "packages: ." > cabal.project
         cabal build all
 
-    - if: matrix.ghc != '9.0.1'
-      name: Build 'stack-full'
+    - name: Build 'stack-full'
       run: |
         cd "summoner-cli/examples/stack-full/"
         echo "packages: ." > cabal.project
         cabal build all
 
-    - if: matrix.ghc != '9.0.1'
-      name: Build 'full-batteries'
+    - name: Build 'full-batteries'
       run: |
         cd "summoner-cli/examples/full-batteries/"
         echo "packages: ." > cabal.project
@@ -112,7 +109,7 @@ jobs:
     strategy:
       matrix:
         stack: ["2.7.3"]
-        ghc: ["8.10.7"]
+        ghc: ["9.0.2"]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ The changelog is available [on GitHub][2].
 
 ## Unreleased
 
+* [#539](https://github.com/kowainik/summoner/issues/539):
+  Use GHC-9.0 as default version for generated projects.
 * [#540](https://github.com/kowainik/summoner/issues/540):
   Build Summoner with GHC-9.0.
 * [#520](https://github.com/kowainik/summoner/issues/520):

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.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. |
+| `ghcVersions`    | [GHC]   | `summoner` uses default `GHC-9.0.2`. 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,14 +1,11 @@
-resolver: lts-18.10
+resolver: nightly-2022-01-10
 
 packages:
   - summoner-cli/
   - summoner-tui/
 
 extra-deps:
   - colourista-0.1.0.1
-  - generic-data-0.8.0.0
-  - hashable-1.3.1.0
+  - megaparsec-9.0.1
   - microaeson-0.1.0.0
-  - optparse-applicative-0.16.0.0
-  - relude-1.0.0.1
   - tomland-1.3.3.0
diff --git a/summoner-cli/examples/cabal-full/.github/workflows/ci.yml b/summoner-cli/examples/cabal-full/.github/workflows/ci.yml
@@ -22,13 +22,18 @@ jobs:
           - "8.6.5"
           - "8.8.4"
           - "8.10.7"
+          - "9.0.2"
         exclude:
+          - os: macOS-latest
+            ghc: 8.10.7
           - os: macOS-latest
             ghc: 8.8.4
           - os: macOS-latest
             ghc: 8.6.5
           - os: macOS-latest
             ghc: 8.4.4
+          - os: windows-latest
+            ghc: 8.10.7
           - os: windows-latest
             ghc: 8.8.4
           - os: windows-latest

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

diff --git a/summoner-cli/examples/cabal-full/LICENSE b/summoner-cli/examples/cabal-full/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2021, Kowainik
+Copyright (c) 2022, Kowainik
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

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.7
+    - GHCVER: 9.0.2
 
 install:
   - choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
   - choco install -y cabal --version 3.6.2.0
-  - choco install -y ghc   --version 8.10.7
+  - choco install -y ghc   --version 9.0.2
   - refreshenv
 
 before_build:

diff --git a/summoner-cli/examples/cabal-full/cabal-full.cabal b/summoner-cli/examples/cabal-full/cabal-full.cabal
@@ -11,7 +11,7 @@ license:             BSD-3-Clause
 license-file:        LICENSE
 author:              Kowainik
 maintainer:          Kowainik <[email protected]>
-copyright:           2021 Kowainik
+copyright:           2022 Kowainik
 category:            Testing
 build-type:          Simple
 extra-doc-files:     README.md
@@ -20,13 +20,14 @@ tested-with:         GHC == 8.4.4
                      GHC == 8.6.5
                      GHC == 8.8.4
                      GHC == 8.10.7
+                     GHC == 9.0.2
 
 source-repository head
   type:                git
   location:            https://github.com/kowainik/cabal-full.git
 
 common common-options
-  build-depends:       base >= 4.11.1.0 && < 4.15
+  build-depends:       base >= 4.11.1.0 && < 4.16
                      , relude
 
   mixins:              base hiding (Prelude)

diff --git a/summoner-cli/examples/cabal-full/src/CabalFull.hs b/summoner-cli/examples/cabal-full/src/CabalFull.hs
@@ -1,5 +1,5 @@
 {- |
-Copyright: (c) 2021 Kowainik
+Copyright: (c) 2022 Kowainik
 SPDX-License-Identifier: BSD-3-Clause
 Maintainer: Kowainik <[email protected]>
 

diff --git a/summoner-cli/examples/cabal-minimal/cabal-minimal.cabal b/summoner-cli/examples/cabal-minimal/cabal-minimal.cabal
@@ -8,14 +8,14 @@ description:
 license:             NONE
 author:              Kowainik
 maintainer:          Kowainik <[email protected]>
-copyright:           2021 Kowainik
+copyright:           2022 Kowainik
 build-type:          Simple
 extra-doc-files:     README.md
                      CHANGELOG.md
-tested-with:         GHC == 8.10.7
+tested-with:         GHC == 9.0.2
 
 common common-options
-  build-depends:       base ^>= 4.14.3.0
+  build-depends:       base ^>= 4.15.1.0
 
   ghc-options:         -Wall
                        -Wcompat

diff --git a/summoner-cli/examples/cabalScript.hs b/summoner-cli/examples/cabalScript.hs
@@ -1,7 +1,7 @@
 #!/usr/bin/env cabal
 {- cabal:
 build-depends:
-  , base ^>= 4.14.3.0
+  , base ^>= 4.15.1.0
 -}
 
 main :: IO ()

diff --git a/summoner-cli/examples/full-batteries/.github/workflows/ci.yml b/summoner-cli/examples/full-batteries/.github/workflows/ci.yml
@@ -24,7 +24,10 @@ jobs:
           - "8.6.5"
           - "8.8.4"
           - "8.10.7"
+          - "9.0.2"
         exclude:
+          - os: macOS-latest
+            ghc: 8.10.7
           - os: macOS-latest
             ghc: 8.8.4
           - os: macOS-latest
@@ -35,6 +38,8 @@ jobs:
             ghc: 8.2.2
           - os: macOS-latest
             ghc: 8.0.2
+          - os: windows-latest
+            ghc: 8.10.7
           - os: windows-latest
             ghc: 8.8.4
           - os: windows-latest
@@ -100,6 +105,7 @@ jobs:
           - "8.6.5"
           - "8.8.4"
           - "8.10.7"
+          - "9.0.2"
 
     steps:
     - uses: actions/checkout@v2

diff --git a/summoner-cli/examples/full-batteries/.travis.yml b/summoner-cli/examples/full-batteries/.travis.yml
@@ -19,6 +19,7 @@ jobs:
   - ghc: 8.6.5
   - ghc: 8.8.4
   - ghc: 8.10.7
+  - ghc: 9.0.2
 
   - ghc: 8.0.2
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.0.2.yaml"
@@ -36,6 +37,9 @@ jobs:
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.8.4.yaml"
 
   - ghc: 8.10.7
+    env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.10.7.yaml"
+
+  - ghc: 9.0.2
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
 
   allow_failures:

diff --git a/summoner-cli/examples/full-batteries/LICENSE b/summoner-cli/examples/full-batteries/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Kowainik
+Copyright (c) 2022 Kowainik
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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.7
+    - GHCVER: 9.0.2
 
 install:
   - choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
   - choco install -y cabal --version 3.6.2.0
-  - choco install -y ghc   --version 8.10.7
+  - choco install -y ghc   --version 9.0.2
   - refreshenv
 
 before_build:

diff --git a/summoner-cli/examples/full-batteries/full-batteries.cabal b/summoner-cli/examples/full-batteries/full-batteries.cabal
@@ -11,7 +11,7 @@ license:             MIT
 license-file:        LICENSE
 author:              Kowainik
 maintainer:          Kowainik <[email protected]>
-copyright:           2021 Kowainik
+copyright:           2022 Kowainik
 category:            Testing
 build-type:          Simple
 extra-doc-files:     README.md
@@ -22,13 +22,14 @@ tested-with:         GHC == 8.0.2
                      GHC == 8.6.5
                      GHC == 8.8.4
                      GHC == 8.10.7
+                     GHC == 9.0.2
 
 source-repository head
   type:                git
   location:            https://github.com/kowainik/full-batteries.git
 
 common common-options
-  build-depends:       base >= 4.9.1.0 && < 4.15
+  build-depends:       base >= 4.9.1.0 && < 4.16
                      , relude
 
   mixins:              base hiding (Prelude)

diff --git a/summoner-cli/examples/full-batteries/src/FullBatteries.hs b/summoner-cli/examples/full-batteries/src/FullBatteries.hs
@@ -1,5 +1,5 @@
 {- |
-Copyright: (c) 2021 Kowainik
+Copyright: (c) 2022 Kowainik
 SPDX-License-Identifier: MIT
 Maintainer: Kowainik <[email protected]>
 

diff --git a/summoner-cli/examples/full-batteries/stack-8.10.7.yaml b/summoner-cli/examples/full-batteries/stack-8.10.7.yaml
@@ -0,0 +1 @@
+resolver: lts-18.21
diff --git a/summoner-cli/examples/full-batteries/stack.yaml b/summoner-cli/examples/full-batteries/stack.yaml
@@ -1 +1 @@
-resolver: lts-18.10
+resolver: nightly-2022-01-10
diff --git a/summoner-cli/examples/stack-full/.github/workflows/ci.yml b/summoner-cli/examples/stack-full/.github/workflows/ci.yml
@@ -21,6 +21,7 @@ jobs:
           - "8.6.5"
           - "8.8.4"
           - "8.10.7"
+          - "9.0.2"
 
     steps:
     - uses: actions/checkout@v2

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

diff --git a/summoner-cli/examples/stack-full/LICENSE b/summoner-cli/examples/stack-full/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2021, Kowainik
+Copyright (c) 2022, Kowainik
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/summoner-cli/examples/stack-full/src/StackFull.hs b/summoner-cli/examples/stack-full/src/StackFull.hs
@@ -1,5 +1,5 @@
 {- |
-Copyright: (c) 2021 Kowainik
+Copyright: (c) 2022 Kowainik
 SPDX-License-Identifier: BSD-3-Clause
 Maintainer: Kowainik <[email protected]>
 

diff --git a/summoner-cli/examples/stack-full/stack-8.10.7.yaml b/summoner-cli/examples/stack-full/stack-8.10.7.yaml
@@ -0,0 +1 @@
+resolver: lts-18.21
diff --git a/summoner-cli/examples/stack-full/stack-full.cabal b/summoner-cli/examples/stack-full/stack-full.cabal
@@ -11,7 +11,7 @@ license:             BSD-3-Clause
 license-file:        LICENSE
 author:              Kowainik
 maintainer:          Kowainik <[email protected]>
-copyright:           2021 Kowainik
+copyright:           2022 Kowainik
 category:            Testing
 build-type:          Simple
 extra-doc-files:     README.md
@@ -20,13 +20,14 @@ tested-with:         GHC == 8.4.4
                      GHC == 8.6.5
                      GHC == 8.8.4
                      GHC == 8.10.7
+                     GHC == 9.0.2
 
 source-repository head
   type:                git
   location:            https://github.com/kowainik/stack-full.git
 
 common common-options
-  build-depends:       base >= 4.11.1.0 && < 4.15
+  build-depends:       base >= 4.11.1.0 && < 4.16
                      , relude
 
   mixins:              base hiding (Prelude)

diff --git a/summoner-cli/examples/stack-full/stack.yaml b/summoner-cli/examples/stack-full/stack.yaml
@@ -1 +1 @@
-resolver: lts-18.10
+resolver: nightly-2022-01-10
diff --git a/summoner-cli/examples/stackScript.hs b/summoner-cli/examples/stackScript.hs
@@ -1,6 +1,6 @@
 #!/usr/bin/env stack
 {- stack
-  --resolver lts-18.10
+  --resolver nightly-2022-01-10
   script
   --package base
 -}

diff --git a/summoner-cli/examples/summoner-default.toml b/summoner-cli/examples/summoner-default.toml
@@ -48,9 +48,9 @@ license = "MIT"
 # travis = true         # Travis CI
 # appveyor = true       # AppVeyor CI
 
-# List of additional GHC versions to support besides 8.10.7.
+# List of additional GHC versions to support besides 9.0.2.
 # Run the 'summon show ghc' command to see the list of all supported GHC versions.
-# ghcVersions = ["8.6.5", "8.8.4"]
+# ghcVersions = ["8.8.4", "8.10.7"]
 
 # List of default-extensions in the .cabal file
 # extensions = [ "ConstraintKinds"

diff --git a/summoner-cli/src/Summoner.hs b/summoner-cli/src/Summoner.hs
@@ -1,6 +1,6 @@
 {- |
 Module                  : Summoner
-Copyright               : (c) 2017-2021 Kowainik
+Copyright               : (c) 2017-2022 Kowainik
 SPDX-License-Identifier : MPL-2.0
 Maintainer              : Kowainik <[email protected]>
 Stability               : Stable