Use new cabal-helper

.gitmodules

@@ -12,8 +12,8 @@
 
 [submodule "submodules/HaRe"]
 	path = submodules/HaRe
-	# url = https://github.com/bubba/HaRe.git
-	url = https://github.com/alanz/HaRe.git
+	url = https://github.com/bubba/HaRe.git
+	# url = https://github.com/alanz/HaRe.git
 
 [submodule "submodules/brittany"]
 	path = submodules/brittany
@@ -22,12 +22,13 @@
 [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/alanz/cabal-helper.git
 	# url = https://github.com/DanielG/cabal-helper.git
+	url = https://github.com/bubba/cabal-helper.git
 
 [submodule "submodules/ghc-mod"]
 	path = submodules/ghc-mod
 	# url = https://github.com/arbor/ghc-mod.git
-	# url = https://github.com/bubba/ghc-mod.git
-	url = https://github.com/alanz/ghc-mod.git
+	url = https://github.com/bubba/ghc-mod.git
+	# url = https://github.com/alanz/ghc-mod.git
 

app/MainHie.hs

@@ -24,7 +24,6 @@ import qualified System.Log.Logger                     as L
 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.GhcMod
 import           Haskell.Ide.Engine.Plugin.HaRe
@@ -50,7 +49,6 @@ plugins includeExamples = pluginDescToIdePlugins allPlugins
       [ applyRefactDescriptor "applyrefact"
       , baseDescriptor        "base"
       , brittanyDescriptor    "brittany"
-      , buildPluginDescriptor "build"
       , ghcmodDescriptor      "ghcmod"
       , haddockDescriptor     "haddock"
       , hareDescriptor        "hare"

cabal.project

@@ -9,4 +9,4 @@ packages:
          ./submodules/ghc-mod/core/
          ./submodules/ghc-mod/ghc-project-types
 
-tests: true
+tests: true

haskell-ide-engine.cabal

@@ -26,7 +26,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.GhcMod
@@ -56,7 +55,7 @@ library
                      , brittany
                      , bytestring
                      , Cabal
-                     , cabal-helper >= 0.8.0.4
+                     , cabal-helper == 1.0.*
                      , containers
                      , data-default
                      , directory
@@ -179,8 +178,7 @@ test-suite unit-test
                        HooglePluginSpec
                        JsonSpec
                        Spec
-  -- Technically cabal-helper should be a 'run-tool-depends', but that doesn't exist yet
-  build-tool-depends:  cabal-helper:cabal-helper-main, hspec-discover:hspec-discover
+  build-tool-depends:  hspec-discover:hspec-discover
   build-depends:       QuickCheck
                      , aeson
                      , base
@@ -293,7 +291,6 @@ test-suite func-test
   default-language:    Haskell2010
   build-tool-depends:  hspec-discover:hspec-discover
                      , haskell-ide-engine:hie
-                     , cabal-helper:cabal-helper-main
 
 test-suite wrapper-test
   type:                exitcode-stdio-1.0