Drop suppor for older swagger2 versions

Author: maksbotan

.travis.yml

@@ -1,6 +1,6 @@
 # This Travis job script has been generated by a script via
 #
-#   haskell-ci '--config=cabal.haskell-ci' 'cabal.project'
+#   haskell-ci 'cabal.project'
 #
 # To regenerate the script (for example after adjusting tested-with) run
 #
@@ -17,9 +17,6 @@ dist: xenial
 git:
   # whether to recursively clone submodules
   submodules: false
-branches:
-  only:
-    - master
 cache:
   directories:
     - $HOME/.cabal/packages
@@ -104,7 +101,7 @@ install:
     echo "source-repository-package"                            >> cabal.project
     echo "  type:     git"                                      >> cabal.project
     echo "  location: https://github.com/biocad/swagger2/"      >> cabal.project
-    echo "  tag:      dd86d6189adb72df09626c3576f4169e73c21e1e" >> cabal.project
+    echo "  tag:      ff879159c009627e1bc9414763b4834a2c9bfba7" >> cabal.project
   - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-swagger)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
@@ -137,7 +134,7 @@ script:
     echo "source-repository-package"                            >> cabal.project
     echo "  type:     git"                                      >> cabal.project
     echo "  location: https://github.com/biocad/swagger2/"      >> cabal.project
-    echo "  tag:      dd86d6189adb72df09626c3576f4169e73c21e1e" >> cabal.project
+    echo "  tag:      ff879159c009627e1bc9414763b4834a2c9bfba7" >> cabal.project
   - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-swagger)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
@@ -156,16 +153,6 @@ script:
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
-  # Constraint sets
-  - rm -rf cabal.project.local
-  # Constraint set swagger2-2.3
-  - if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='swagger2 ==2.3.*' all ; fi
-  # Constraint set swagger2-2.4
-  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='swagger2 ==2.4.*' all
-  # Constraint set swagger2-2.5
-  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='swagger2 ==2.5.*' all
-  # Constraint set servant-0.17
-  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant == 0.17.*' all
 
-# REGENDATA ("0.10.1",["--config=cabal.haskell-ci","cabal.project"])
+# REGENDATA ("0.10.1",["cabal.project"])
 # EOF

cabal.haskell-ci

@@ -4,4 +4,4 @@ allow-newer: aeson-pretty-0.8.7:base-compat
 source-repository-package
     type: git
     location: https://github.com/biocad/swagger2/
-    tag: dd86d6189adb72df09626c3576f4169e73c21e1e
+    tag: ff879159c009627e1bc9414763b4834a2c9bfba7

cabal.project

@@ -297,11 +297,7 @@ instance (KnownSymbol sym, ToParamSchema a, HasSwagger sub) => HasSwagger (Query
       sch = mempty
         & paramSchema .~ pschema
       pschema = mempty
-#if MIN_VERSION_swagger2(2,4,0)
         & type_ ?~ SwaggerArray
-#else
-        & type_ .~ SwaggerArray
-#endif
         & items ?~ SwaggerItemsObject (Inline $ mempty & paramSchema .~ toParamSchema (Proxy :: Proxy a))
 
 instance (KnownSymbol sym, HasSwagger sub) => HasSwagger (QueryFlag sym :> sub) where

src/Servant/Swagger/Internal.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
@@ -24,11 +23,6 @@ import           Servant.Swagger
 import           Servant.Test.ComprehensiveAPI (comprehensiveAPI)
 import           Test.Hspec       hiding (example)
 
-#if !MIN_VERSION_swagger2(2,4,0)
-import           Data.Aeson.Lens   (key, _Array)
-import qualified Data.Vector as V
-#endif
-
 checkAPI :: HasCallStack => HasSwagger api => Proxy api -> Value -> IO ()
 checkAPI proxy = checkSwagger (toSwagger proxy)
 
@@ -192,7 +186,7 @@ hackageSwaggerWithTags = toSwagger (Proxy :: Proxy HackageAPI)
     packagesOps = subOperations (Proxy :: Proxy HackagePackagesAPI) (Proxy :: Proxy HackageAPI)
 
 hackageAPI :: Value
-hackageAPI = modifyValue [aesonQQ|
+hackageAPI = [aesonQQ|
 {
   "openapi": "3.0.0",
   "servers": [
@@ -356,17 +350,6 @@ hackageAPI = modifyValue [aesonQQ|
   ]
 }
 |]
-  where
-    modifyValue :: Value -> Value
-#if MIN_VERSION_swagger2(2,4,0)
-    modifyValue = id
-#else
-    -- swagger2-2.4 preserves order of tags
-    -- swagger2-2.3 used Set, so they are ordered
-    -- packages comes before users.
-    -- We simply reverse, not properly sort here for simplicity: 2 elements.
-    modifyValue = over (key "tags" . _Array) V.reverse
-#endif
 
 
 -- =======================================================================