Upgrade GHC version with which Summoner creates projects

kowainik · Oct 20, 2024 · b56c795 · b56c795
1 parent 9dc5f2c
commit b56c795
Show file tree

Hide file tree

Showing 25 changed files with 116 additions and 25 deletions.
diff --git a/summoner-cli/examples/cabal-full/.github/workflows/ci.yml b/summoner-cli/examples/cabal-full/.github/workflows/ci.yml
@@ -26,7 +26,10 @@ jobs:
           - "9.2.8"
           - "9.4.8"
           - "9.6.6"
+          - "9.8.2"
         exclude:
+          - os: macOS-latest
+            ghc: 9.6.6
           - os: macOS-latest
             ghc: 9.4.8
           - os: macOS-latest
@@ -41,6 +44,8 @@ jobs:
             ghc: 8.6.5
           - os: macOS-latest
             ghc: 8.4.4
+          - os: windows-latest
+            ghc: 9.6.6
           - os: windows-latest
             ghc: 9.4.8
           - os: windows-latest

diff --git a/summoner-cli/examples/cabal-full/.travis.yml b/summoner-cli/examples/cabal-full/.travis.yml
@@ -19,6 +19,7 @@ jobs:
   - ghc: 9.2.8
   - ghc: 9.4.8
   - ghc: 9.6.6
+  - ghc: 9.8.2
 
 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: 9.6.6
+    - GHCVER: 9.8.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 9.6.6
+  - choco install -y ghc   --version 9.8.2
   - refreshenv
 
 before_build:

diff --git a/summoner-cli/examples/cabal-full/cabal-full.cabal b/summoner-cli/examples/cabal-full/cabal-full.cabal
@@ -24,13 +24,14 @@ tested-with:         GHC == 8.4.4
                      GHC == 9.2.8
                      GHC == 9.4.8
                      GHC == 9.6.6
+                     GHC == 9.8.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.19
+  build-depends:       base >= 4.11.1.0 && < 4.20
                      , relude
 
   mixins:              base hiding (Prelude)
@@ -54,6 +55,18 @@ common common-options
                        -hiedir=.hie
   if impl(ghc >= 8.10)
     ghc-options:       -Wunused-packages
+  if impl(ghc >= 9.0)
+    ghc-options:       -Winvalid-haddock
+  if impl(ghc >= 9.2)
+    ghc-options:       -Wredundant-bang-patterns
+                       -Woperator-whitespace
+  if impl(ghc >= 9.4  && < 9.10)
+    ghc-options:       -Wforall-identifier
+  if impl(ghc >= 9.4)
+    ghc-options:       -Wredundant-strictness-flags
+  if impl(ghc >= 9.8)
+    ghc-options:       -Wterm-variable-capture
+                       -Winconsistent-flags
 
   default-language:    Haskell2010
   default-extensions:  DeriveGeneric

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:           2022 Kowainik
 build-type:          Simple
 extra-doc-files:     README.md
                      CHANGELOG.md
-tested-with:         GHC == 9.6.6
+tested-with:         GHC == 9.8.2
 
 common common-options
-  build-depends:       base ^>= 4.18.2.1
+  build-depends:       base ^>= 4.19.1.0
 
   ghc-options:         -Wall
                        -Wcompat
@@ -35,6 +35,18 @@ common common-options
                        -hiedir=.hie
   if impl(ghc >= 8.10)
     ghc-options:       -Wunused-packages
+  if impl(ghc >= 9.0)
+    ghc-options:       -Winvalid-haddock
+  if impl(ghc >= 9.2)
+    ghc-options:       -Wredundant-bang-patterns
+                       -Woperator-whitespace
+  if impl(ghc >= 9.4  && < 9.10)
+    ghc-options:       -Wforall-identifier
+  if impl(ghc >= 9.4)
+    ghc-options:       -Wredundant-strictness-flags
+  if impl(ghc >= 9.8)
+    ghc-options:       -Wterm-variable-capture
+                       -Winconsistent-flags
 
   default-language:    Haskell2010
 

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.18.2.1
+  , base ^>= 4.19.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
@@ -28,7 +28,10 @@ jobs:
           - "9.2.8"
           - "9.4.8"
           - "9.6.6"
+          - "9.8.2"
         exclude:
+          - os: macOS-latest
+            ghc: 9.6.6
           - os: macOS-latest
             ghc: 9.4.8
           - os: macOS-latest
@@ -47,6 +50,8 @@ jobs:
             ghc: 8.2.2
           - os: macOS-latest
             ghc: 8.0.2
+          - os: windows-latest
+            ghc: 9.6.6
           - os: windows-latest
             ghc: 9.4.8
           - os: windows-latest
@@ -124,6 +129,7 @@ jobs:
           - "9.2.8"
           - "9.4.8"
           - "9.6.6"
+          - "9.8.2"
 
     steps:
     - uses: actions/checkout@v2

diff --git a/summoner-cli/examples/full-batteries/.travis.yml b/summoner-cli/examples/full-batteries/.travis.yml
@@ -23,6 +23,7 @@ jobs:
   - ghc: 9.2.8
   - ghc: 9.4.8
   - ghc: 9.6.6
+  - ghc: 9.8.2
 
   - ghc: 8.0.2
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.0.2.yaml"
@@ -52,6 +53,9 @@ jobs:
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-9.4.8.yaml"
 
   - ghc: 9.6.6
+    env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-9.6.6.yaml"
+
+  - ghc: 9.8.2
     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: 9.6.6
+    - GHCVER: 9.8.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 9.6.6
+  - choco install -y ghc   --version 9.8.2
   - refreshenv
 
 before_build:

diff --git a/summoner-cli/examples/full-batteries/full-batteries.cabal b/summoner-cli/examples/full-batteries/full-batteries.cabal
@@ -26,13 +26,14 @@ tested-with:         GHC == 8.0.2
                      GHC == 9.2.8
                      GHC == 9.4.8
                      GHC == 9.6.6
+                     GHC == 9.8.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.19
+  build-depends:       base >= 4.9.1.0 && < 4.20
                      , relude
 
   mixins:              base hiding (Prelude)

diff --git a/summoner-cli/examples/full-batteries/stack-9.6.6.yaml b/summoner-cli/examples/full-batteries/stack-9.6.6.yaml
@@ -0,0 +1 @@
+resolver: lts-22.38
diff --git a/summoner-cli/examples/full-batteries/stack.yaml b/summoner-cli/examples/full-batteries/stack.yaml
@@ -1 +1 @@
-resolver: lts-22.34
+resolver: nightly-2024-10-11
diff --git a/summoner-cli/examples/stack-full/.github/workflows/ci.yml b/summoner-cli/examples/stack-full/.github/workflows/ci.yml
@@ -25,6 +25,7 @@ jobs:
           - "9.2.8"
           - "9.4.8"
           - "9.6.6"
+          - "9.8.2"
 
     steps:
     - uses: actions/checkout@v2

diff --git a/summoner-cli/examples/stack-full/.travis.yml b/summoner-cli/examples/stack-full/.travis.yml
@@ -35,6 +35,9 @@ jobs:
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-9.4.8.yaml"
 
   - ghc: 9.6.6
+    env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-9.6.6.yaml"
+
+  - ghc: 9.8.2
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
 
   allow_failures:

diff --git a/summoner-cli/examples/stack-full/stack-9.6.6.yaml b/summoner-cli/examples/stack-full/stack-9.6.6.yaml
@@ -0,0 +1 @@
+resolver: lts-22.38
diff --git a/summoner-cli/examples/stack-full/stack-full.cabal b/summoner-cli/examples/stack-full/stack-full.cabal
@@ -24,13 +24,14 @@ tested-with:         GHC == 8.4.4
                      GHC == 9.2.8
                      GHC == 9.4.8
                      GHC == 9.6.6
+                     GHC == 9.8.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.19
+  build-depends:       base >= 4.11.1.0 && < 4.20
                      , relude
 
   mixins:              base hiding (Prelude)
@@ -54,6 +55,18 @@ common common-options
                        -hiedir=.hie
   if impl(ghc >= 8.10)
     ghc-options:       -Wunused-packages
+  if impl(ghc >= 9.0)
+    ghc-options:       -Winvalid-haddock
+  if impl(ghc >= 9.2)
+    ghc-options:       -Wredundant-bang-patterns
+                       -Woperator-whitespace
+  if impl(ghc >= 9.4  && < 9.10)
+    ghc-options:       -Wforall-identifier
+  if impl(ghc >= 9.4)
+    ghc-options:       -Wredundant-strictness-flags
+  if impl(ghc >= 9.8)
+    ghc-options:       -Wterm-variable-capture
+                       -Winconsistent-flags
 
   default-language:    Haskell2010
   default-extensions:  DeriveGeneric

diff --git a/summoner-cli/examples/stack-full/stack.yaml b/summoner-cli/examples/stack-full/stack.yaml
@@ -1 +1 @@
-resolver: lts-22.34
+resolver: nightly-2024-10-11
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-22.34
+  --resolver nightly-2024-10-11
   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 9.6.6.
+# List of additional GHC versions to support besides 9.8.2.
 # Run the 'summon show ghc' command to see the list of all supported GHC versions.
-# ghcVersions = ["9.2.8", "9.4.8"]
+# ghcVersions = ["9.4.8", "9.6.6"]
 
 # List of default-extensions in the .cabal file
 # extensions = [ "ConstraintKinds"

diff --git a/summoner-cli/src/Summoner/GhcVer.hs b/summoner-cli/src/Summoner/GhcVer.hs
@@ -1,6 +1,6 @@
 {- |
 Module                  : Summoner.GhcVer
-Copyright               : (c) 2017-2022 Kowainik
+Copyright               : (c) 2017-2024 Kowainik
 SPDX-License-Identifier : MPL-2.0
 Maintainer              : Kowainik <[email protected]>
 Stability               : Stable
@@ -38,8 +38,9 @@ data GhcVer
     | Ghc8107
     | Ghc902
     | Ghc928
-    | Ghc945
+    | Ghc948
     | Ghc966
+    | Ghc982
     deriving stock (Eq, Ord, Show, Enum, Bounded)
 
 -- | Converts 'GhcVer' into dot-separated string.
@@ -53,8 +54,9 @@ showGhcVer = \case
     Ghc8107 -> "8.10.7"
     Ghc902  -> "9.0.2"
     Ghc928  -> "9.2.8"
-    Ghc945  -> "9.4.8"
+    Ghc948  -> "9.4.8"
     Ghc966  -> "9.6.6"
+    Ghc982  -> "9.8.2"
 
 {- | These are old GHC versions that are not working with default GHC versions
 when using Stack.
@@ -76,8 +78,9 @@ latestLts = \case
     Ghc8107 -> "lts-18.28"
     Ghc902  -> "lts-19.33"
     Ghc928  -> "lts-20.26"
-    Ghc945  -> "lts-21.25"
-    Ghc966  -> "lts-22.34"
+    Ghc948  -> "lts-21.25"
+    Ghc966  -> "lts-22.38"
+    Ghc982  -> "nightly-2024-10-11"
 
 -- | Represents PVP versioning (4 numbers).
 data Pvp = Pvp
@@ -102,8 +105,9 @@ baseVerPvp = \case
     Ghc8107 -> Pvp 4 14 3 0
     Ghc902  -> Pvp 4 15 1 0
     Ghc928  -> Pvp 4 16 4 0
-    Ghc945  -> Pvp 4 17 0 0
+    Ghc948  -> Pvp 4 17 2 1
     Ghc966  -> Pvp 4 18 2 1
+    Ghc982  -> Pvp 4 19 1 0
 
 -- | Returns corresponding @base@ version of the given GHC version.
 baseVer :: GhcVer -> Text

diff --git a/summoner-cli/src/Summoner/Template/Cabal.hs b/summoner-cli/src/Summoner/Template/Cabal.hs
@@ -144,6 +144,18 @@ cabalFile Settings{..} = File (toString settingsRepo ++ ".cabal") cabalFileConte
         , "                       -hiedir=.hie"
         , "  if impl(ghc >= 8.10)"
         , "    ghc-options:       -Wunused-packages"
+        , "  if impl(ghc >= 9.0)"
+        , "    ghc-options:       -Winvalid-haddock"
+        , "  if impl(ghc >= 9.2)"
+        , "    ghc-options:       -Wredundant-bang-patterns"
+        , "                       -Woperator-whitespace"
+        , "  if impl(ghc >= 9.4  && < 9.10)"
+        , "    ghc-options:       -Wforall-identifier"
+        , "  if impl(ghc >= 9.4)"
+        , "    ghc-options:       -Wredundant-strictness-flags"
+        , "  if impl(ghc >= 9.8)"
+        , "    ghc-options:       -Wterm-variable-capture"
+        , "                       -Winconsistent-flags"
         ]
 
     libraryStanza :: Text

diff --git a/summoner-cli/test/Test/Show.hs b/summoner-cli/test/Test/Show.hs
@@ -22,6 +22,7 @@ goldenGhcTable =
     , "GHC-8.10.7    base-4.14.3.0   lts-18.28"
     , "GHC-9.0.2     base-4.15.1.0   lts-19.33"
     , "GHC-9.2.8     base-4.16.4.0   lts-20.26"
-    , "GHC-9.4.8     base-4.17.0.0   lts-21.25"
-    , "GHC-9.6.6     base-4.18.2.1   lts-22.34"
+    , "GHC-9.4.8     base-4.17.2.1   lts-21.25"
+    , "GHC-9.6.6     base-4.18.2.1   lts-22.38"
+    , "GHC-9.8.2     base-4.19.1.0   nightly-2024-10-11"
     ]
diff --git a/summoner-tui/src/Summoner/Tui.hs b/summoner-tui/src/Summoner/Tui.hs
@@ -53,6 +53,8 @@ import Summoner.Tui.Widget (borderLabel, listInBorder)
 
 import qualified Brick (on)
 import qualified Graphics.Vty as V
+import qualified Graphics.Vty.Config as VConfig
+import qualified Graphics.Vty.CrossPlatform as VC
 import qualified Paths_summoner_tui as Meta (version)
 
 
@@ -352,7 +354,7 @@ runApp app s = do
   where
     buildVty :: IO V.Vty
     buildVty = do
-        v <- V.mkVty =<< V.standardIOConfig
+        v <- VC.mkVty VConfig.defaultConfig
         V.setMode (V.outputIface v) V.Mouse True
         pure v
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ jobs: @@
               - "9.2.8"
               - "9.4.8"
               - "9.6.6"
+              - "9.8.2"
         steps:
         - uses: actions/checkout@v2
@@ Expand Down @@