Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#296] Support ghc-9.10 #297

Merged
merged 6 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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
=======

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
3 changes: 3 additions & 0 deletions src/Universum/Container/Class.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
resolver: lts-22.4
resolver: lts-22.38
11 changes: 7 additions & 4 deletions universum.cabal
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Loading