diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6683e55..3a6f2cb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -52,6 +52,7 @@ jobs: - lts-15.0 # ghc-8.8 - lts-17.0 # ghc-8.10 - lts-19.0 # ghc-9.0 + - lts-20.0 # ghc-9.2 steps: - uses: actions/checkout@v3 @@ -95,7 +96,7 @@ jobs: if [[ "$RESOLVER" == "lts-9.0" ]]; then export PATH=$HOME/.local/bin:$PATH fi - stack --no-terminal build --ghc-options="-Werror -Wno-unused-imports" + stack --no-terminal build --ghc-options="-Werror -Wno-unused-imports -Wno-incomplete-uni-patterns" - name: Test env: RESOLVER: ${{ matrix.resolver }} diff --git a/concurrency/Control/Concurrent/Classy/Async.hs b/concurrency/Control/Concurrent/Classy/Async.hs index b94c3d8..3db84c1 100644 --- a/concurrency/Control/Concurrent/Classy/Async.hs +++ b/concurrency/Control/Concurrent/Classy/Async.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE RankNTypes #-} -- | @@ -174,7 +175,11 @@ instance (MonadConc m, Semigroup a) => Semigroup (Concurrently m a) where -- | @since 1.1.2.0 instance (MonadConc m, Monoid a) => Monoid (Concurrently m a) where mempty = pure mempty +#if MIN_VERSION_base(4,11,0) + mappend = (<>) +#else mappend = liftA2 mappend +#endif ------------------------------------------------------------------------------- -- Spawning diff --git a/doc/ghc.rst b/doc/ghc.rst index 809e172..50363f2 100644 --- a/doc/ghc.rst +++ b/doc/ghc.rst @@ -8,7 +8,7 @@ currently supported versions are: .. csv-table:: :header: "GHC", "Stackage", "base" - "9.2", "", "4.16.0.0" + "9.2", "LTS 20.0", "4.16.0.0" "9.0", "LTS 19.0", "4.15.0.0" "8.10", "LTS 17.0", "4.14.1.0" "8.8", "LTS 15.0", "4.13.0.0" diff --git a/stack.yaml b/stack.yaml index 5b23a92..b5384d7 100755 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2022-07-01 +resolver: lts-20.0 packages: - concurrency