Merge pull request #1 from phadej/updat-2016-01-09

Update wai warp
haskell-servant · Jan 9, 2016 · bec6492 · bec6492
2 parents 8971cce + 10ee24f
commit bec6492
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/.travis.meta.yml b/.travis.meta.yml
@@ -5,7 +5,7 @@ env:
   - GHCVER=7.10.2 CABALVER=1.22 STACK_SOLVER=YES
   - GHCVER=7.8.4 STACK_YAML=stack-lts-2.yaml
   - GHCVER=7.10.2 STACK_YAML=stack-lts-3.yaml
-  - GHCVER=7.10.3 STACK_YAML=stack-lts-3.yaml
+  - GHCVER=7.10.3 STACK_YAML=stack-lts-4.yaml
   - GHCVER=head CABALVER=1.22 STACK_SOLVER=YES
 
 matrix:

diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,8 @@ install:
   package-db to build-cache"; cp -a .stack-work $HOME/.stack-work-cache; cp -a installplan.txt
   $HOME/.stack-work-cache/installplan.txt; fi;
 script:
-- stack --no-terminal --skip-ghc-check build --test
+- if [ "$PEDANTIC" = "YES" ]; then export STACKOPTS=--pedantic; fi
+- stack --no-terminal --skip-ghc-check build --test $STACKOPTS
 - stack --no-terminal --skip-ghc-check sdist
 matrix:
   fast_finish: true
@@ -67,15 +68,15 @@ matrix:
         - ghc-7.10.2
         - libgmp-dev
     compiler: ! ': # ghc-7.10.2 stack-lts-3.yaml'
-  - env: GHCVER=7.10.3 STACK_YAML=stack-lts-3.yaml
+  - env: GHCVER=7.10.3 STACK_YAML=stack-lts-4.yaml
     addons:
       apt:
         sources:
         - hvr-ghc
         packages:
         - ghc-7.10.3
         - libgmp-dev
-    compiler: ! ': # ghc-7.10.3 stack-lts-3.yaml'
+    compiler: ! ': # ghc-7.10.3 stack-lts-4.yaml'
   - env: GHCVER=head CABALVER=1.22 STACK_SOLVER=YES
     addons:
       apt:

diff --git a/servant-yaml.cabal b/servant-yaml.cabal
@@ -54,6 +54,6 @@ test-suite example
     , servant-server >=0.4.4.5  && <0.5
     , base-compat    >=0.6.0    && <0.9
     , aeson          >=0.8.0.2  && <0.11
-    , wai            >=3.0.3.0  && <3.1
-    , warp           >=3.0.13.1 && <3.2
+    , wai            >=3.0.3.0  && <3.3
+    , warp           >=3.0.13.1 && <3.3
   default-language: Haskell2010
diff --git a/stack-lts-2.yaml b/stack-lts-2.yaml
@@ -2,6 +2,6 @@ resolver: lts-2.22
 packages:
 - '.'
 extra-deps:
-- servant-0.4.4.5
-- servant-server-0.4.4.5
+- servant-0.4.4.6
+- servant-server-0.4.4.6
 flags: {}
diff --git a/stack-lts-3.yaml b/stack-lts-3.yaml
@@ -1,4 +1,4 @@
-resolver: lts-3.11
+resolver: lts-3.21
 packages:
 - '.'
 extra-deps: []

diff --git a/stack-lts-4.yaml b/stack-lts-4.yaml
@@ -0,0 +1,5 @@
+resolver: lts-4.0
+packages:
+- '.'
+extra-deps: []
+flags: {}