Skip to content

Change packages metadata and rename tactics subfolder #1234

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

Merged
merged 3 commits into from
Jan 20, 2021
Merged
Show file tree
Hide file tree
Changes from 2 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
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ packages:
./shake-bench
./ghcide
./hls-plugin-api
./plugins/tactics
./plugins/hls-tactics-plugin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I also wanted to change this. Thank you for the update!

./plugins/hls-class-plugin
./plugins/hls-eval-plugin
./plugins/hls-explicit-imports-plugin
Expand Down
7 changes: 4 additions & 3 deletions haskell-language-server.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ description:

homepage: https://github.com/haskell/haskell-language-server#readme
bug-reports: https://github.com/haskell/haskell-language-server/issues
author: Alan Zimmerman
author: The Haskell IDE Team
maintainer: [email protected]
copyright: Alan Zimmerman
copyright: The Haskell IDE Team
license: Apache-2.0
license-file: LICENSE
category: Development
build-type: Simple
tested-with: GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.1 || == 8.10.2 || == 8.10.3
extra-source-files:
Expand Down Expand Up @@ -413,7 +414,7 @@ test-suite func-test
, tasty-rerun
, ghcide

hs-source-dirs: test/functional plugins/tactics/src plugins/hls-eval-plugin/test plugins/hls-splice-plugin/src
hs-source-dirs: test/functional plugins/hls-tactics-plugin/src plugins/hls-eval-plugin/test plugins/hls-splice-plugin/src

main-is: Main.hs
other-modules:
Expand Down
8 changes: 4 additions & 4 deletions hls-plugin-api/hls-plugin-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ homepage: https://github.com/haskell/haskell-language-server/hls-plugin-api
bug-reports: https://github.com/haskell/haskell-language-server/issues
license: Apache-2.0
license-file: LICENSE
author: Many,TBD when we release
maintainer: [email protected] (for now)
copyright: Alan Zimmerman
category: Web
author: The Haskell IDE Team
maintainer: [email protected]
copyright: The Haskell IDE Team
category: Development
build-type: Simple

flag pedantic
Expand Down
2 changes: 1 addition & 1 deletion nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ let
hls-hlint-plugin = gitignoreSource ../plugins/hls-hlint-plugin;
hls-retrie-plugin = gitignoreSource ../plugins/hls-retrie-plugin;
hls-splice-plugin = gitignoreSource ../plugins/hls-splice-plugin;
hls-tactics-plugin = gitignoreSource ../plugins/tactics;
hls-tactics-plugin = gitignoreSource ../plugins/hls-tactics-plugin;
});
in
{
Expand Down
8 changes: 4 additions & 4 deletions plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ synopsis: Hlint integration plugin with Haskell Language Server
description: Please see Haskell Language Server Readme (https://github.com/haskell/haskell-language-server#readme)
license: Apache-2.0
license-file: LICENSE
author: https://github.com/haskell/haskell-language-server/contributors
maintainer: https://github.com/haskell/haskell-language-server/contributors
copyright: Alan Zimmerman
category: Web
author: The Haskell IDE Team
maintainer: alan.zimm@gmail.com
copyright: The Haskell IDE Team
category: Development
build-type: Simple

flag pedantic
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion stack-8.10.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
- ./plugins/hls-hlint-plugin
- ./plugins/hls-retrie-plugin
- ./plugins/hls-splice-plugin
- ./plugins/tactics
- ./plugins/hls-tactics-plugin

ghc-options:
"$everything": -haddock
Expand Down
2 changes: 1 addition & 1 deletion stack-8.10.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
- ./plugins/hls-hlint-plugin
- ./plugins/hls-retrie-plugin
- ./plugins/hls-splice-plugin
- ./plugins/tactics
- ./plugins/hls-tactics-plugin

ghc-options:
"$everything": -haddock
Expand Down
2 changes: 1 addition & 1 deletion stack-8.10.3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
- ./plugins/hls-hlint-plugin
- ./plugins/hls-retrie-plugin
- ./plugins/hls-splice-plugin
- ./plugins/tactics
- ./plugins/hls-tactics-plugin

ghc-options:
"$everything": -haddock
Expand Down
2 changes: 1 addition & 1 deletion stack-8.6.4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ packages:
- ./plugins/hls-hlint-plugin
- ./plugins/hls-retrie-plugin
- ./plugins/hls-splice-plugin
- ./plugins/tactics
- ./plugins/hls-tactics-plugin

ghc-options:
"$everything": -haddock
Expand Down
2 changes: 1 addition & 1 deletion stack-8.6.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
- ./plugins/hls-hlint-plugin
- ./plugins/hls-retrie-plugin
- ./plugins/hls-splice-plugin
- ./plugins/tactics
- ./plugins/hls-tactics-plugin

ghc-options:
"$everything": -haddock
Expand Down
2 changes: 1 addition & 1 deletion stack-8.8.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
- ./plugins/hls-hlint-plugin
- ./plugins/hls-retrie-plugin
- ./plugins/hls-splice-plugin
- ./plugins/tactics
- ./plugins/hls-tactics-plugin

ghc-options:
"$everything": -haddock
Expand Down
2 changes: 1 addition & 1 deletion stack-8.8.3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
- ./plugins/hls-hlint-plugin
- ./plugins/hls-retrie-plugin
- ./plugins/hls-splice-plugin
- ./plugins/tactics
- ./plugins/hls-tactics-plugin

ghc-options:
"$everything": -haddock
Expand Down
2 changes: 1 addition & 1 deletion stack-8.8.4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
- ./plugins/hls-hlint-plugin
- ./plugins/hls-retrie-plugin
- ./plugins/hls-splice-plugin
- ./plugins/tactics
- ./plugins/hls-tactics-plugin

ghc-options:
"$everything": -haddock
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
- ./plugins/hls-hlint-plugin
- ./plugins/hls-retrie-plugin
- ./plugins/hls-splice-plugin
- ./plugins/tactics
- ./plugins/hls-tactics-plugins

ghc-options:
"$everything": -haddock
Expand Down