Merge pull request #1019 from alanz/bump-resolvers-2018-12-31

Bump resolvers

Author: alanz

.gitignore

@@ -44,14 +44,15 @@
 /test/testdata/HaReMoveDef.refactored.hs
 /test/testdata/HaReRename.hs.keep
 /test/testdata/HaReRename.refactored.hs
-/test/testdata/gototest/stack.yaml
-/test/testdata/stack.yaml
 /test/testdata/addPackageTest/**/stack.yaml
 /test/testdata/addPackageTest/**/stack.yaml
 /test/testdata/addPackageTest/hpack/*.cabal
-/test/testdata/redundantImportTest/stack.yaml
+/test/testdata/badProjects/cabal/stack.yaml
 /test/testdata/completion/stack.yaml
 /test/testdata/definition/stack.yaml
+/test/testdata/gototest/stack.yaml
+/test/testdata/redundantImportTest/stack.yaml
+/test/testdata/stack.yaml
 /test/testdata/wErrorTest/stack.yaml
 TAGS
 cabal-dev/

stack-8.4.4.yaml

@@ -1,4 +1,4 @@
-resolver: lts-12.20 # LTS 12.15 is first to support GHC 8.4.4
+resolver: lts-12.26 # LTS 12.15 is first to support GHC 8.4.4
 packages:
 - .
 - hie-plugin-api
@@ -20,7 +20,8 @@ extra-deps:
 - haskell-lsp-types-0.8.0.1
 - hsimport-0.8.6
 - lsp-test-0.5.0.2
-- pretty-show-1.8.2
+- optparse-simple-0.1.0
+- pretty-show-1.9.5
 - syz-0.2.0.0
 - temporary-1.2.1.1
 

stack-8.6.1.yaml

@@ -15,14 +15,11 @@ extra-deps:
 - cabal-install-2.4.0.0
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
-- cryptohash-sha256-0.11.101.0
 - czipwith-1.0.1.1
 - data-tree-print-0.1.0.2
-- ed25519-0.0.5.0
-- ekg-core-0.1.1.4
+- ekg-core-0.1.1.6
 - ekg-json-0.1.0.6
 - ekg-wai-0.1.0.3
-- hackage-security-0.5.3.0
 - haddock-api-2.21.0
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
@@ -38,24 +35,11 @@ extra-deps:
 - yaml-0.8.32
 
 
-
 flags:
   haskell-ide-engine:
     pedantic: true
   hie-plugin-api:
     pedantic: true
-  # ekg-core:
-  #   allow-newer: true
-  # ekg-json:
-  #   allow-newer: true
-  # ekg-wai:
-  #   allow-newer: true
-  # base:
-  #   allow-newer: true
-  # process:
-  #   allow-newer: true
-
-allow-newer: true
 
 nix:
   packages: [ icu libcxx zlib ]

stack-8.6.2.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2018-11-30 # GHC 8.6.2
+resolver: nightly-2018-12-17 # Last GHC 8.6.2
 packages:
 - .
 - hie-plugin-api
@@ -10,7 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 
-- apply-refact-0.6.0.0
 - butcher-1.3.2.1
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
@@ -21,31 +20,15 @@ extra-deps:
 - lsp-test-0.5.0.2
 - monad-memo-0.4.1
 - multistate-0.8.0.1
-- resolv-0.1.1.2
 - syz-0.2.0.0
 - temporary-1.2.1.1
 - yaml-0.8.32
 
-
-
-
 flags:
   haskell-ide-engine:
     pedantic: true
   hie-plugin-api:
     pedantic: true
-  # ekg-core:
-  #   allow-newer: true
-  # ekg-json:
-  #   allow-newer: true
-  # ekg-wai:
-  #   allow-newer: true
-  # base:
-  #   allow-newer: true
-  # process:
-  #   allow-newer: true
-
-# allow-newer: true
 
 nix:
   packages: [ icu libcxx zlib ]

stack-8.6.3.yaml

@@ -17,17 +17,13 @@ extra-deps:
 - ekg-wai-0.1.0.3
 - haddock-api-2.21.0
 - hsimport-0.8.6
-# # - lsp-test-0.5.0.2
 - monad-memo-0.4.1
 - multistate-0.8.0.1
-# # - resolv-0.1.1.2
 - syz-0.2.0.0
 - temporary-1.2.1.1
 - yaml-0.8.32
 
 
-
-
 flags:
   haskell-ide-engine:
     pedantic: true

stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2018-12-27 # GHC 8.6.3
+resolver: nightly-2018-12-31 # GHC 8.6.3
 packages:
 - .
 - hie-plugin-api
@@ -24,7 +24,6 @@ extra-deps:
 - temporary-1.2.1.1
 - yaml-0.8.32
 
-
 flags:
   haskell-ide-engine:
     pedantic: true