Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Update hie-plugin-api to use unliftio-core 0.2.0.1 #1698

Merged
merged 2 commits into from
Mar 12, 2020
Merged

Update hie-plugin-api to use unliftio-core 0.2.0.1 #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
510a7b9
Update hie-plugin-api to use unliftio-core 0.2.0.1
fendor Mar 12, 2020
d752e4d
Bump minimum version of resourcet for stack files
fendor Mar 12, 2020
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
2 changes: 0 additions & 2 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions cabal.project-8.8.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 0 additions & 10 deletions hie-plugin-api/Haskell/Ide/Engine/PluginsIdeMonads.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,23 +585,13 @@ 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 ->
withRunInIO $ \run ->
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 ->
Expand Down
1 change: 1 addition & 0 deletions hie-plugin-api/hie-plugin-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ library
, haskell-lsp == 0.20.*
, hslogger
, unliftio
, unliftio-core ^>= 0.2.0.1
, monad-control
, mtl
, process
Expand Down
4 changes: 3 additions & 1 deletion stack-8.4.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,15 @@ 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
- 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
Expand Down
4 changes: 3 additions & 1 deletion stack-8.4.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -74,7 +75,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
Expand Down
4 changes: 3 additions & 1 deletion stack-8.4.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@ 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
- 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
Expand Down
4 changes: 3 additions & 1 deletion stack-8.6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ 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
- 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
Expand Down
3 changes: 3 additions & 0 deletions stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@ 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
- unliftio-0.2.12.1
- unliftio-core-0.2.0.1

flags:
haskell-ide-engine:
Expand Down
3 changes: 3 additions & 0 deletions stack-8.8.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ 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
- unliftio-core-0.2.0.1

flags:
haskell-ide-engine:
Expand Down
3 changes: 3 additions & 0 deletions stack-8.8.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ 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
- unliftio-core-0.2.0.1

flags:
haskell-ide-engine:
Expand Down
3 changes: 3 additions & 0 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ 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
- unliftio-core-0.2.0.1

flags:
haskell-ide-engine:
Expand Down