diff --git a/.circleci/config.yml b/.circleci/config.yml index 87b1ecac0..5076a0f4b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,9 +70,7 @@ defaults: &defaults - ~/build/submodules/brittany/.stack-work - ~/build/submodules/ghc-mod/core/.stack-work - ~/build/submodules/ghc-mod/.stack-work - - ~/build/submodules/haskell-lsp/.stack-work - ~/build/submodules/cabal-helper/.stack-work - - ~/build/submodules/floskell/.stack-work - run: name: Test diff --git a/.gitmodules b/.gitmodules index cc7ff5467..4e873c34d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,8 +31,3 @@ # url = https://github.com/bubba/ghc-mod.git url = https://github.com/alanz/ghc-mod.git - -[submodule "submodules/floskell"] - path = submodules/floskell - url = https://github.com/ennocramer/floskell - # url = https://github.com/alanz/floskell \ No newline at end of file diff --git a/cabal.project b/cabal.project index 0c2906b77..7bfc804ba 100644 --- a/cabal.project +++ b/cabal.project @@ -5,7 +5,6 @@ packages: ./submodules/HaRe ./submodules/brittany ./submodules/cabal-helper/ - ./submodules/floskell ./submodules/ghc-mod/ ./submodules/ghc-mod/core/ diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index a439e77e5..04a36b14b 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -61,7 +61,7 @@ library , data-default , directory , filepath - , floskell + , floskell == 0.10.* , fold-debounce , ghc >= 8.0.1 , ghc-exactprint diff --git a/stack-8.2.1.yaml b/stack-8.2.1.yaml index da9efb9b1..b697717ec 100644 --- a/stack-8.2.1.yaml +++ b/stack-8.2.1.yaml @@ -7,7 +7,6 @@ extra-deps: - ./submodules/HaRe - ./submodules/brittany - ./submodules/cabal-helper -- ./submodules/floskell - ./submodules/ghc-mod - ./submodules/ghc-mod/core @@ -16,6 +15,7 @@ extra-deps: - cabal-plan-0.3.0.0 - constrained-dynamic-0.1.0.0 - czipwith-1.0.1.0 +- floskell-0.10.0 - ghc-exactprint-0.5.8.2 - haddock-api-2.18.1 - haddock-library-1.4.4 diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml index e4816a72b..420885f84 100644 --- a/stack-8.2.2.yaml +++ b/stack-8.2.2.yaml @@ -7,7 +7,6 @@ extra-deps: - ./submodules/HaRe - ./submodules/brittany - ./submodules/cabal-helper -- ./submodules/floskell - ./submodules/ghc-mod - ./submodules/ghc-mod/core @@ -17,6 +16,7 @@ extra-deps: - conduit-parse-0.2.1.0 - constrained-dynamic-0.1.0.0 - czipwith-1.0.1.0 +- floskell-0.10.0 - ghc-exactprint-0.5.8.2 - haddock-api-2.18.1 - haddock-library-1.4.4 diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index b6f221167..d85fc2a3f 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -7,7 +7,6 @@ extra-deps: - ./submodules/HaRe - ./submodules/brittany - ./submodules/cabal-helper -- ./submodules/floskell - ./submodules/ghc-mod - ./submodules/ghc-mod/core @@ -15,6 +14,7 @@ extra-deps: - base-compat-0.9.3 - cabal-plan-0.3.0.0 - constrained-dynamic-0.1.0.0 +- floskell-0.10.0 - ghc-exactprint-0.5.8.2 - haddock-api-2.20.0 - haddock-library-1.6.0 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index c7a13b24a..7885314e2 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -7,13 +7,13 @@ extra-deps: - ./submodules/HaRe - ./submodules/brittany - ./submodules/cabal-helper -- ./submodules/floskell - ./submodules/ghc-mod - ./submodules/ghc-mod/core - base-compat-0.9.3 - cabal-plan-0.3.0.0 - constrained-dynamic-0.1.0.0 +- floskell-0.10.0 - ghc-exactprint-0.5.8.2 - haddock-api-2.20.0 - haddock-library-1.6.0 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 0f49dc09a..e680b0909 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -7,13 +7,13 @@ extra-deps: - ./submodules/HaRe - ./submodules/brittany - ./submodules/cabal-helper -- ./submodules/floskell - ./submodules/ghc-mod - ./submodules/ghc-mod/core # - brittany-0.11.0.0 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 +- floskell-0.10.0 - ghc-exactprint-0.5.8.2 - haddock-api-2.20.0 - haddock-library-1.6.0 diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml index 7c2fab2d3..dc8cf6ffd 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -7,7 +7,6 @@ extra-deps: - ./submodules/HaRe - ./submodules/brittany - ./submodules/cabal-helper -- ./submodules/floskell - ./submodules/ghc-mod - ./submodules/ghc-mod/core @@ -18,6 +17,7 @@ extra-deps: - constrained-dynamic-0.1.0.0 - czipwith-1.0.1.1 - data-tree-print-0.1.0.2 +- floskell-0.10.0 - haddock-api-2.21.0 - haskell-lsp-0.11.0.0 - haskell-lsp-types-0.11.0.0 diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml index c5f3f20a2..965c56771 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -7,13 +7,13 @@ extra-deps: - ./submodules/HaRe - ./submodules/brittany - ./submodules/cabal-helper -- ./submodules/floskell - ./submodules/ghc-mod - ./submodules/ghc-mod/core - butcher-1.3.2.1 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 +- floskell-0.10.0 - haddock-api-2.21.0 - haskell-lsp-0.11.0.0 - haskell-lsp-types-0.11.0.0 diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml index 78e7ca848..2c37d1d64 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -7,13 +7,13 @@ extra-deps: - ./submodules/HaRe - ./submodules/brittany - ./submodules/cabal-helper -- ./submodules/floskell - ./submodules/ghc-mod - ./submodules/ghc-mod/core - butcher-1.3.2.1 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 +- floskell-0.10.0 - haddock-api-2.21.0 - haskell-lsp-0.11.0.0 - haskell-lsp-types-0.11.0.0 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index b5a43add9..ccf6ca688 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -7,13 +7,13 @@ extra-deps: - ./submodules/HaRe - ./submodules/brittany - ./submodules/cabal-helper -- ./submodules/floskell - ./submodules/ghc-mod - ./submodules/ghc-mod/core - butcher-1.3.2.1 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 +- floskell-0.10.0 - haddock-api-2.22.0 - haskell-lsp-0.11.0.0 - haskell-lsp-types-0.11.0.0 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 25601fa42..acbbb602a 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -7,7 +7,6 @@ extra-deps: - ./submodules/HaRe - ./submodules/brittany - ./submodules/cabal-helper -- ./submodules/floskell - ./submodules/ghc-mod - ./submodules/ghc-mod/core @@ -16,6 +15,7 @@ extra-deps: - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 - deque-0.2.7 +- floskell-0.10.0 - ghc-exactprint-0.5.8.2 - haddock-api-2.22.0 - haskell-lsp-0.11.0.0 diff --git a/stack.yaml b/stack.yaml index 25601fa42..acbbb602a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -7,7 +7,6 @@ extra-deps: - ./submodules/HaRe - ./submodules/brittany - ./submodules/cabal-helper -- ./submodules/floskell - ./submodules/ghc-mod - ./submodules/ghc-mod/core @@ -16,6 +15,7 @@ extra-deps: - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 - deque-0.2.7 +- floskell-0.10.0 - ghc-exactprint-0.5.8.2 - haddock-api-2.22.0 - haskell-lsp-0.11.0.0 diff --git a/submodules/floskell b/submodules/floskell deleted file mode 160000 index 13af3d9b1..000000000 --- a/submodules/floskell +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 13af3d9b1967a244c2661e31f0b8f8cb1e3a0f79