From 510a7b9b5fa3ebb69e5d394d12ac8c15072579f7 Mon Sep 17 00:00:00 2001 From: fendor Date: Thu, 12 Mar 2020 13:47:15 +0100 Subject: [PATCH 1/2] Update hie-plugin-api to use unliftio-core 0.2.0.1 --- cabal.project | 2 -- cabal.project-8.8.2 | 2 -- hie-plugin-api/Haskell/Ide/Engine/PluginsIdeMonads.hs | 10 ---------- hie-plugin-api/hie-plugin-api.cabal | 1 + stack-8.4.2.yaml | 3 ++- stack-8.4.3.yaml | 3 ++- stack-8.4.4.yaml | 3 ++- stack-8.6.4.yaml | 3 ++- stack-8.6.5.yaml | 2 ++ stack-8.8.1.yaml | 2 ++ stack-8.8.2.yaml | 2 ++ stack.yaml | 2 ++ 12 files changed, 17 insertions(+), 18 deletions(-) diff --git a/cabal.project b/cabal.project index 5cda0668c..5d9fd6002 100644 --- a/cabal.project +++ b/cabal.project @@ -16,8 +16,6 @@ package haskell-ide-engine -- Match the flag settings we use in stac builds constraints: - -- to avoid temporary a breaking change: https://github.com/haskell/haskell-ide-engine/issues/1680 - unliftio-core < 0.2.0.0, haskell-ide-engine +pedantic, hie-plugin-api +pedantic diff --git a/cabal.project-8.8.2 b/cabal.project-8.8.2 index 4b061f363..b374ee657 100644 --- a/cabal.project-8.8.2 +++ b/cabal.project-8.8.2 @@ -24,8 +24,6 @@ package haskell-ide-engine -- Match the flag settings we use in stac builds constraints: - -- to avoid temporary a breaking change: https://github.com/haskell/haskell-ide-engine/issues/1680 - unliftio-core < 0.2.0.0, haskell-ide-engine +pedantic, hie-plugin-api +pedantic diff --git a/hie-plugin-api/Haskell/Ide/Engine/PluginsIdeMonads.hs b/hie-plugin-api/Haskell/Ide/Engine/PluginsIdeMonads.hs index 78b33c42e..e43bb37fb 100644 --- a/hie-plugin-api/Haskell/Ide/Engine/PluginsIdeMonads.hs +++ b/hie-plugin-api/Haskell/Ide/Engine/PluginsIdeMonads.hs @@ -585,11 +585,6 @@ instance MonadTrans GhcT where instance MonadUnliftIO Ghc where - {-# INLINE askUnliftIO #-} - askUnliftIO = Ghc $ \s -> - withUnliftIO $ \u -> - return (UnliftIO (unliftIO u . flip unGhc s)) - {-# INLINE withRunInIO #-} withRunInIO inner = Ghc $ \s -> @@ -597,11 +592,6 @@ instance MonadUnliftIO Ghc where inner (run . flip unGhc s) instance MonadUnliftIO (GhcT IdeM) where - {-# INLINE askUnliftIO #-} - askUnliftIO = GhcT $ \s -> - withUnliftIO $ \u -> - return (UnliftIO (unliftIO u . flip unGhcT s)) - {-# INLINE withRunInIO #-} withRunInIO inner = GhcT $ \s -> diff --git a/hie-plugin-api/hie-plugin-api.cabal b/hie-plugin-api/hie-plugin-api.cabal index 2c2608e38..ded2caf83 100644 --- a/hie-plugin-api/hie-plugin-api.cabal +++ b/hie-plugin-api/hie-plugin-api.cabal @@ -57,6 +57,7 @@ library , haskell-lsp == 0.20.* , hslogger , unliftio + , unliftio-core ^>= 0.2.0.1 , monad-control , mtl , process diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 12e17be77..400196cd0 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -55,7 +55,8 @@ extra-deps: - syz-0.2.0.0 - type-equality-1 - unix-compat-0.5.2 -- unliftio-0.2.12 +- unliftio-0.2.12.1 +- unliftio-core-0.2.0.1 - unordered-containers-0.2.10.0 - yaml-0.11.2.0 - th-abstraction-0.3.1.0 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 081d19ca8..94cb3f808 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -74,7 +74,8 @@ extra-deps: - topograph-1 - type-equality-1 - unix-compat-0.5.2 -- unliftio-0.2.12 +- unliftio-0.2.12.1 +- unliftio-core-0.2.0.1 - unordered-containers-0.2.10.0 - vector-0.12.1.2 - yaml-0.11.2.0 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 61dcfbe4f..21a501e7c 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -54,7 +54,8 @@ extra-deps: - socks-0.6.1 # for network and network-bsd - syz-0.2.0.0 - unix-compat-0.5.2 -- unliftio-0.2.12 +- unliftio-0.2.12.1 +- unliftio-core-0.2.0.1 - unordered-containers-0.2.10.0 - yaml-0.11.2.0 - th-abstraction-0.3.1.0 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index fac8d7fe9..f285f5d79 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -40,7 +40,8 @@ extra-deps: - temporary-1.2.1.1 - time-compat-1.9.2.2 - unix-compat-0.5.2 -- unliftio-0.2.12 +- unliftio-0.2.12.1 +- unliftio-core-0.2.0.1 - unordered-containers-0.2.10.0 - yaml-0.11.2.0 # To make build work in windows 7 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 4167d2893..eddcd6528 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -42,6 +42,8 @@ extra-deps: - semialign-1.1 - temporary-1.2.1.1 - topograph-1 +- unliftio-0.2.12.1 +- unliftio-core-0.2.0.1 flags: haskell-ide-engine: diff --git a/stack-8.8.1.yaml b/stack-8.8.1.yaml index 66fb02a95..6fe0ac0fc 100644 --- a/stack-8.8.1.yaml +++ b/stack-8.8.1.yaml @@ -32,6 +32,8 @@ extra-deps: - ormolu-0.0.3.1 - semigroups-0.18.5 - temporary-1.2.1.1 +- unliftio-0.2.12.1 +- unliftio-core-0.2.0.1 flags: haskell-ide-engine: diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index bfb79f143..69e034580 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -37,6 +37,8 @@ extra-deps: - ormolu-0.0.3.1 - semigroups-0.18.5 - temporary-1.2.1.1 +- unliftio-0.2.12.1 +- unliftio-core-0.2.0.1 flags: haskell-ide-engine: diff --git a/stack.yaml b/stack.yaml index 9d5aca435..dce98d9f4 100644 --- a/stack.yaml +++ b/stack.yaml @@ -35,6 +35,8 @@ extra-deps: - ormolu-0.0.3.1 - semigroups-0.18.5 - temporary-1.2.1.1 +- unliftio-0.2.12.1 +- unliftio-core-0.2.0.1 flags: haskell-ide-engine: From d752e4d1a4361c8aeefc2dc60071a20e8b52db74 Mon Sep 17 00:00:00 2001 From: fendor Date: Thu, 12 Mar 2020 17:18:41 +0100 Subject: [PATCH 2/2] Bump minimum version of resourcet for stack files --- stack-8.4.2.yaml | 1 + stack-8.4.3.yaml | 1 + stack-8.4.4.yaml | 1 + stack-8.6.4.yaml | 1 + stack-8.6.5.yaml | 1 + stack-8.8.1.yaml | 1 + stack-8.8.2.yaml | 1 + stack.yaml | 1 + 8 files changed, 8 insertions(+) diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 400196cd0..77a3c6b00 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -49,6 +49,7 @@ extra-deps: - parser-combinators-1.2.1 - profunctors-5.5.1 - pretty-show-1.8.2 +- resourcet-1.2.3 # forced by unliftio-core >= 0.2 - rope-utf16-splay-0.3.1.0 - simple-sendfile-0.2.30 # for network and network-bsd - socks-0.6.1 # for network and network-bsd diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 94cb3f808..e95b4c6ce 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -61,6 +61,7 @@ extra-deps: - parser-combinators-1.2.1 - profunctors-5.5.1 - quickcheck-instances-0.3.22 +- resourcet-1.2.3 # forced by unliftio-core >= 0.2 - rope-utf16-splay-0.3.1.0 - semialign-1.1 - semigroupoids-5.3.4 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 21a501e7c..49f451cef 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -49,6 +49,7 @@ extra-deps: - parser-combinators-1.2.1 - pretty-show-1.9.5 - profunctors-5.5.1 +- resourcet-1.2.3 # forced by unliftio-core >= 0.2 - rope-utf16-splay-0.3.1.0 - simple-sendfile-0.2.30 # for network and network-bsd - socks-0.6.1 # for network and network-bsd diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index f285f5d79..7ee969612 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -35,6 +35,7 @@ extra-deps: - multistate-0.8.0.1 - ormolu-0.0.3.1 - parser-combinators-1.2.1 +- resourcet-1.2.3 # forced by unliftio-core >= 0.2 - rope-utf16-splay-0.3.1.0 - syz-0.2.0.0 - temporary-1.2.1.1 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index eddcd6528..598a810d1 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -39,6 +39,7 @@ extra-deps: - optparse-applicative-0.15.1.0 - ormolu-0.0.3.1 - parser-combinators-1.2.1 +- resourcet-1.2.3 # forced by unliftio-core >= 0.2 - semialign-1.1 - temporary-1.2.1.1 - topograph-1 diff --git a/stack-8.8.1.yaml b/stack-8.8.1.yaml index 6fe0ac0fc..8d1bb6c89 100644 --- a/stack-8.8.1.yaml +++ b/stack-8.8.1.yaml @@ -30,6 +30,7 @@ extra-deps: - ilist-0.3.1.0 - monad-dijkstra-0.1.1.2 - ormolu-0.0.3.1 +- resourcet-1.2.3 # forced by unliftio-core >= 0.2 - semigroups-0.18.5 - temporary-1.2.1.1 - unliftio-0.2.12.1 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 69e034580..ab1f55293 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -35,6 +35,7 @@ extra-deps: - ilist-0.3.1.0 - monad-dijkstra-0.1.1.2 - ormolu-0.0.3.1 +- resourcet-1.2.3 # forced by unliftio-core >= 0.2 - semigroups-0.18.5 - temporary-1.2.1.1 - unliftio-0.2.12.1 diff --git a/stack.yaml b/stack.yaml index dce98d9f4..85421ce64 100644 --- a/stack.yaml +++ b/stack.yaml @@ -33,6 +33,7 @@ extra-deps: - ilist-0.3.1.0 - monad-dijkstra-0.1.1.2 - ormolu-0.0.3.1 +- resourcet-1.2.3 # forced by unliftio-core >= 0.2 - semigroups-0.18.5 - temporary-1.2.1.1 - unliftio-0.2.12.1