Merge pull request #297 from serokell/gromak/support-ghc-9.10

[#296] Support ghc-9.10
serokell · Oct 16, 2024 · 0b4a903 · 0b4a903
2 parents bea921e + aad5e5e
commit 0b4a903
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,32 +31,37 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        cabal: ["3.10"]
+        cabal: ["3.12"]
         # If you update this list of supported compiler versions,
         # make sure to update the `tested-with` section of `universum.cabal`.
         ghc:
           - "8.10.7"
           - "9.0.2"
           - "9.2.8"
-          - "9.4.5"
-          - "9.6.3"
-          - "9.8.1"
+          - "9.4.8"
+          - "9.6.6"
+          - "9.8.2"
+          - "9.10.1"
         # Use only the "main" (usually latest) compiler version on non-Linux
         exclude:
           - os: macOS-latest
-            ghc: 9.8.1
+            ghc: 9.10.1
           - os: macOS-latest
-            ghc: 9.4.5
+            ghc: 9.8.2
+          - os: macOS-latest
+            ghc: 9.4.8
           - os: macOS-latest
             ghc: 9.2.8
           - os: macOS-latest
             ghc: 9.0.2
           - os: macOS-latest
             ghc: 8.10.7
           - os: windows-latest
-            ghc: 9.8.1
+            ghc: 9.10.1
+          - os: windows-latest
+            ghc: 9.8.2
           - os: windows-latest
-            ghc: 9.4.5
+            ghc: 9.4.8
           - os: windows-latest
             ghc: 9.2.8
           - os: windows-latest
@@ -100,8 +105,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        stack: ["2.13.1"]
-        ghc: ["9.6.3"]
+        stack: ["3.1.1"]
+        ghc: ["9.6.6"]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+1.8.2.2
+=======
+
+* [#297](https://github.com/serokell/universum/pull/297)
+  * Add support for GHC-9.10 without any user-visible changes.
+
 1.8.2.1
 =======
 

diff --git a/README.md b/README.md
@@ -54,8 +54,7 @@ to replace default `Prelude` with an alternative. All we had to do is to impleme
 new basic set of defaults. There already were plenty of [preludes](https://guide.aelve.com/haskell/alternative-preludes-zr69k1hc),
 so we didn't plan to implement everything from scratch.
 After some long, hot discussions, our team decided to base our custom prelude on
-[`protolude`](https://github.com/sdiehl/protolude). If you're not familiar with it,
-you can read [a tutorial about `protolude`](http://www.stephendiehl.com/posts/protolude.html).
+[`protolude`](https://github.com/protolude/protolude).
 
 The next section explains why we've made this choice and what we are willing to do.
 This tutorial doesn't cover the differences from `protolude`. Instead, it explains how Universum is different from regular `Prelude`.

diff --git a/src/Universum/Container/Class.hs b/src/Universum/Container/Class.hs
@@ -48,6 +48,9 @@ module Universum.Container.Class
 import Data.Coerce (Coercible, coerce)
 import Data.Kind (Type)
 import Prelude hiding (all, and, any, concatMap, elem, foldMap, foldl, foldr, mapM_, notElem, null,
+#if __GLASGOW_HASKELL__ >= 910
+                foldl',
+#endif
                 or, print, product, sequence_, sum)
 
 import Universum.Applicative (Alternative (..), Const, ZipList (..), pass)

diff --git a/stack.yaml b/stack.yaml
@@ -1 +1 @@
-resolver: lts-22.4
+resolver: lts-22.38
diff --git a/universum.cabal b/universum.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                universum
-version:             1.8.2.1
+version:             1.8.2.2
 synopsis:            Custom prelude used in Serokell
 description:         See README.md file for more details.
 homepage:            https://github.com/serokell/universum
@@ -16,9 +16,10 @@ bug-reports:         https://github.com/serokell/universum/issues
 tested-with:         GHC == 8.10.7
                    , GHC == 9.0.2
                    , GHC == 9.2.8
-                   , GHC == 9.4.5
-                   , GHC == 9.6.3
-                   , GHC == 9.8.1
+                   , GHC == 9.4.8
+                   , GHC == 9.6.6
+                   , GHC == 9.8.2
+                   , GHC == 9.10.1
 extra-doc-files:     CHANGES.md
                    , CONTRIBUTING.md
                    , README.md
@@ -178,6 +179,8 @@ benchmark universum-benchmark
   ghc-options:         -Wno-missing-safe-haskell-mode
   if impl(ghc >= 9.8.0)
     ghc-options:         -Wno-x-partial
+  -- TODO (#298): migrate from gauge to something
+  buildable: False
 
   default-extensions:  NoImplicitPrelude
                        ScopedTypeVariables