Merge branch 'master' into master

GetShopTV · Jun 22, 2018 · 21c97d2 · 21c97d2
2 parents 75327a6 + bbffa06
commit 21c97d2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,24 +32,25 @@ before_cache:
 
 matrix:
   include:
-    - compiler: "ghc-7.8.4"
+    - compiler: "ghc-8.4.3"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      env: HADDOCK=false
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
-    - compiler: "ghc-7.10.3"
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.2.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
       env: HADDOCK=false
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
     - compiler: "ghc-8.0.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
       env: HADDOCK=false
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
-    - compiler: "ghc-8.2.2"
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
+    - compiler: "ghc-7.10.3"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
-    - compiler: "ghc-8.4.1"
+      env: HADDOCK=false
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
+    - compiler: "ghc-7.8.4"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
+      env: HADDOCK=false
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
 
 before_install:
   - HC=${CC}

diff --git a/swagger2.cabal b/swagger2.cabal
@@ -1,6 +1,7 @@
 cabal-version:       >=1.10
 name:                swagger2
 version:             2.2.2
+x-revision:          2
 
 synopsis:            Swagger 2.0 data model
 description:
@@ -23,7 +24,7 @@ extra-source-files:
   , CHANGELOG.md
   , examples/*.hs
   , include/overlapping-compat.h
-tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
+tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
 custom-setup
   setup-depends:
@@ -67,13 +68,13 @@ library
   -- other dependencies
   build-depends:
       base-compat-batteries     >=0.10.1   && <0.11
-    , aeson                     >=1.0.0.0  && <1.4
+    , aeson                     >=1.0.0.0  && <1.5
     , generics-sop              >=0.3.2.0  && <0.4
     , hashable                  >=1.2.7.0  && <1.3
     , http-media                >=0.7.1.2  && <0.8
     , insert-ordered-containers >=0.1.0.0  && <0.3
     , lens                      >=4.16.1   && <4.17
-    , network                   >=2.6.3.5  && <2.7
+    , network                   >=2.6.3.5  && <2.8
     , scientific                >=0.3.5.3  && <0.4
     , transformers-compat       >=0.3      && <0.7
     , unordered-containers      >=0.2.9.0  && <0.3