Merge pull request serokell#252 from serokell/gromak/support-ghc-9.2

Support GHC-9.2.2

Author: gromakovsky

.github/workflows/ci.yml

@@ -35,24 +35,25 @@ jobs:
         # If you update this list of supported compiler versions,
         # make sure to update the `tested-with` section of `universum.cabal`.
         ghc:
-          - "8.4.4"
           - "8.6.5"
           - "8.8.4"
           - "8.10.7"
           - "9.0.1"
+          - "9.2.2"
+        # Use only the latest compiler on non-Linux
         exclude:
+          - os: macOS-latest
+            ghc: 9.0.1
           - 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: 9.0.1
           - os: windows-latest
             ghc: 8.8.4
           - os: windows-latest
             ghc: 8.6.5
-          - os: windows-latest
-            ghc: 8.4.4
 
     steps:
     - uses: actions/checkout@v2
@@ -91,7 +92,7 @@ jobs:
     strategy:
       matrix:
         stack: ["2.7"]
-        ghc: ["8.10.7"]
+        ghc: ["9.0.2"]
 
     steps:
     - uses: actions/checkout@v2

CHANGES.md

@@ -1,6 +1,9 @@
 Unreleased
 =====
 
+* [#252](https://github.com/serokell/universum/pull/252):
+  Remove `Option` re-export. Use `Maybe` instead.
+
 * [#176](https://github.com/serokell/universum/issues/176):
   Deprecate `note`.
 

src/Universum/Monoid.hs

@@ -10,8 +10,8 @@ module Universum.Monoid
 
 import Data.Monoid (All (..), Alt (..), Any (..), Dual (..), Endo (..), First (..), Last (..),
                     Monoid (..), Product (..), Sum (..))
-import Data.Semigroup (Option (..), Semigroup (sconcat, stimes, (<>)), WrappedMonoid, cycle1,
-                       mtimesDefault, stimesIdempotent, stimesIdempotentMonoid, stimesMonoid)
+import Data.Semigroup (Semigroup (sconcat, stimes, (<>)), WrappedMonoid, cycle1, mtimesDefault,
+                       stimesIdempotent, stimesIdempotentMonoid, stimesMonoid)
 
 import Universum.Monad.Reexport (Maybe, fromMaybe)
 

src/Universum/VarArg.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE FlexibleContexts       #-}
 {-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE MultiParamTypeClasses  #-}

stack.yaml

@@ -1 +1 @@
-resolver: lts-18.17
+resolver: lts-19.0

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 586292
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/17.yaml
-    sha256: e66e70a7f998036025e8f40abc89b8eeb79c88f57727020cba1b54f375aa7ca0
-  original: lts-18.17
+    size: 616897
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/0.yaml
+    sha256: bbf2be02f17940bac1f87cb462d4fb0c3355de6dcfc53d84f4f9ad3ee2164f65
+  original: lts-19.0

universum.cabal

@@ -13,11 +13,11 @@ category:            Prelude
 stability:           stable
 build-type:          Simple
 bug-reports:         https://github.com/serokell/universum/issues
-tested-with:         GHC == 8.4.4
-                   , GHC == 8.6.5
+tested-with:         GHC == 8.6.5
                    , GHC == 8.8.4
                    , GHC == 8.10.7
                    , GHC == 9.0.1
+                   , GHC == 9.2.2
 extra-doc-files:     CHANGES.md
                    , CONTRIBUTING.md
                    , README.md
@@ -43,6 +43,8 @@ common common-options
   if impl(ghc >= 8.10.1)
     ghc-options:       -Wno-prepositive-qualified-module
                        -Wno-inferred-safe-imports
+  if impl(ghc >= 9.2.0)
+    ghc-options:         -Wno-missing-kind-signatures
 
   default-language:    Haskell2010
 
@@ -147,6 +149,10 @@ test-suite universum-doctest
 
   if impl(ghc >= 8.10.1)
     ghc-options:         -Wno-missing-safe-haskell-mode
+  -- https://github.com/sol/doctest/issues/327
+  -- TODO: re-enable when the issue is resolved
+  if impl(ghc >= 9.0.0)
+    buildable: False
 
   ghc-options:         -threaded