Merge pull request #26 from fendor/cabal-helper-helper

Use cabal-helper 1.0

Author: fendor

.circleci/config.yml

@@ -26,9 +26,9 @@ defaults: &defaults
  - stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
  - stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
 
- # - run:
- #  name: Stack upgrade
- #  command: stack upgrade
+ - run:
+ name: Stack upgrade
+ command: stack upgrade
 
  - run:
  name: Stack setup

.gitmodules

@@ -12,22 +12,16 @@
 
 [submodule "submodules/HaRe"]
 path = submodules/HaRe
-# url = https://github.com/bubba/HaRe.git
 url = https://github.com/wz1000/HaRe.git
 
 [submodule "submodules/cabal-helper"]
 path = submodules/cabal-helper
-# url = https://github.com/arbor/cabal-helper.git
-url = https://github.com/alanz/cabal-helper.git
-# url = https://github.com/DanielG/cabal-helper.git
+url = https://github.com/DanielG/cabal-helper.git
 
 [submodule "submodules/ghc-mod"]
 path = submodules/ghc-mod
-# url = https://github.com/arbor/ghc-mod.git
-url = https://github.com/alanz/ghc-mod.git
- #url = https://github.com/mpickering/ghc-mod.git
+url = https://github.com/fendor/ghc-mod.git
 
 [submodule "hie-bios"]
 path = hie-bios
 url = https://github.com/mpickering/hie-bios.git
-branch = multi-cradle

app/MainHie.hs

@@ -28,7 +28,6 @@ import System.IO
 import Haskell.Ide.Engine.Plugin.ApplyRefact
 import Haskell.Ide.Engine.Plugin.Base
 import Haskell.Ide.Engine.Plugin.Brittany
-import Haskell.Ide.Engine.Plugin.Build
 import Haskell.Ide.Engine.Plugin.Example2
 import Haskell.Ide.Engine.Plugin.Bios
 import Haskell.Ide.Engine.Plugin.HaRe
@@ -55,7 +54,6 @@ plugins includeExamples = pluginDescToIdePlugins allPlugins
  [ applyRefactDescriptor "applyrefact"
  , baseDescriptor "base"
  , brittanyDescriptor "brittany"
- , buildPluginDescriptor "build"
  , haddockDescriptor "haddock"
  , hareDescriptor "hare"
  , hoogleDescriptor "hoogle"

haskell-ide-engine.cabal

@@ -27,7 +27,6 @@ library
  Haskell.Ide.Engine.Options
  Haskell.Ide.Engine.Plugin.ApplyRefact
  Haskell.Ide.Engine.Plugin.Brittany
- Haskell.Ide.Engine.Plugin.Build
  Haskell.Ide.Engine.Plugin.Example2
  Haskell.Ide.Engine.Plugin.Floskell
  Haskell.Ide.Engine.Plugin.Bios
@@ -58,7 +57,7 @@ library
  , brittany
  , bytestring
  , Cabal
- , cabal-helper >= 0.8.0.4
+ , cabal-helper >= 1.0 && < 1.1
  , containers
  , data-default
  , directory