Merge branch 'master' into travis-windows

diff --git a/.travis.yml b/.travis.yml
index 07dc18b060dbf82d137ab15c67a4eadc103c8faf..4d0f05264fbd0b8d9202688f2bd46320ed3ac0f9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,28 +2,42 @@ language: c
 
 sudo: false
 
+os:
+- windows
+- linux
+- osx
+
+dist: xenial
+
 cache:
   directories:
     - .stack-work
     - $HOME/.stack
     - $HOME/haskell-ide-engine/.stack-work
+    - C:/Users/travis/AppData/Local/Programs/stack
+    - C:/sr
   timeout: 1000
 
 addons:
   apt:
     packages:
       - npm
+  homebrew:
+    packages:
+      - haskell-stack
+      - npm
 
 before_install:
   - mkdir -p ~/.local/bin
   - export PATH=$HOME/.local/bin:$PATH
-  - travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
+  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install haskell-stack nodejs 7zip; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -sSL https://get.haskellstack.org/ | sh; fi
   - mkdir -p haskell-ide-engine
   - cd $HOME/haskell-ide-engine
   - git init
   - git remote add origin https://github.com/haskell/haskell-ide-engine.git
   - git pull origin master
-  - git checkout 890ca3f2f3bd3bfe74e1f38a426b383a847763bb
+  - git checkout 1a5640f4790bde364dcd0a61617c5ca5b85b145a
   - git submodule init
   - git submodule sync
   - git submodule update --init

diff --git a/lsp-test.cabal b/lsp-test.cabal
index 4eff6cf3a37427f3a8a7898e3f0e37753a598548..ce2753de3616118171297a8819d4287da79806a7 100644 (file)
--- a/lsp-test.cabal
+++ b/lsp-test.cabal
@@ -8,13 +8,13 @@ description:
   down to the wire, and @Language.Haskell.LSP.Test@ can replay captured sessions from
   <haskell-lsp-test https://hackage.haskell.org/package/haskell-lsp>.
   It's currently used for testing in <https://github.com/haskell/haskell-ide-engine haskell-ide-engine>.
-homepage:            https://github.com/Bubba/haskell-lsp-test#readme
+homepage:            https://github.com/bubba/haskell-lsp-test#readme
 license:             BSD3
 license-file:        LICENSE
 author:              Luke Lau
 maintainer:          luke_lau@icloud.com
 stability:           experimental
-bug-reports:         https://github.com/Bubba/haskell-lsp-test/issues
+bug-reports:         https://github.com/bubba/haskell-lsp-test/issues
 copyright:           2018 Luke Lau
 category:            Testing
 build-type:          Simple
@@ -25,7 +25,7 @@ tested-with:         GHC == 8.2.2 , GHC == 8.4.2 , GHC == 8.4.3
 
 source-repository head
   type:     git
-  location: https://github.com/Bubba/haskell-lsp-test/
+  location: https://github.com/bubba/haskell-lsp-test/
 
 library
   hs-source-dirs:      src