Skip to content

Commit

Permalink
Merge pull request #895 from phadej/lower-bounds
Browse files Browse the repository at this point in the history
Bump lower bounds
  • Loading branch information
phadej authored Jan 25, 2018
2 parents bf289cc + f9963d3 commit 030cbbc
Show file tree
Hide file tree
Showing 10 changed files with 346 additions and 218 deletions.
85 changes: 49 additions & 36 deletions doc/tutorial/tutorial.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -22,47 +22,60 @@ extra-source-files:
static/ui.js

library
default-language: Haskell2010
ghc-options: -Wall -pgmL markdown-unlit
exposed-modules: ApiType
, Authentication
, Client
, Docs
, Javascript
, Server
build-depends: base == 4.*
, base-compat
, text
, aeson
, aeson-compat
, blaze-html
, directory
, blaze-markup
, containers
, servant == 0.12.*
, servant-server == 0.12.*
, servant-client == 0.12.*
, servant-docs >= 0.11.1 && <0.12
, servant-js >= 0.9 && <0.10
, warp
, http-api-data
, http-media
, lucid
, time
, string-conversions
, bytestring
, attoparsec
, mtl >=2.1 && <2.3
, mtl-compat
, random
, js-jquery
, wai
, http-types
, transformers
, markdown-unlit >= 0.4
, http-client
, cookie
default-language: Haskell2010
ghc-options: -Wall -pgmL markdown-unlit
build-tool-depends: markdown-unlit:markdown-unlit

-- Packages `servant` depends on.
-- We don't need to specify bounds here as this package is never released.
build-depends:
base >= 4.7 && <4.11
, aeson
, aeson-compat
, attoparsec
, base-compat
, bytestring
, containers
, directory
, http-api-data
, http-client
, http-media
, http-types
, mtl
, string-conversions
, text
, transformers
, wai
, warp

-- Servant dependencies
build-depends:
servant
, servant-server
, servant-client
, servant-docs

-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
blaze-html >= 0.9.0.1 && < 0.10
, blaze-markup >= 0.8.0.0 && < 0.9
, cookie >= 0.4.3 && < 0.5
, js-jquery >= 3.2.1 && < 3.3
, lucid >= 2.9.9 && < 2.10
, mtl-compat >= 0.2.1 && < 0.3
, random >= 1.1 && < 1.2
, servant-js >= 0.9 && < 0.10
, time >= 1.4.2 && < 1.9

-- For legacy tools, we need to specify build-depends too
build-depends: markdown-unlit >= 0.4.1 && <0.5
build-tool-depends: markdown-unlit:markdown-unlit >= 0.4.1 && <0.5

test-suite spec
type: exitcode-stdio-1.0
Expand All @@ -73,7 +86,7 @@ test-suite spec
other-modules: JavascriptSpec
build-tool-depends:
hspec-discover:hspec-discover
build-depends: base == 4.*
build-depends: base
, tutorial
, hspec
, hspec-wai
Expand Down
60 changes: 40 additions & 20 deletions servant-client-core/servant-client-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,39 @@ library
Servant.Client.Core.Internal.HasClient
Servant.Client.Core.Internal.Request
Servant.Client.Core.Internal.RunClient

-- Bundled with GHC: Lower bound to not force re-installs
-- text and mtl are bundled starting with GHC-8.4
--
-- note: mtl lower bound is so low because of GHC-7.8
build-depends:
base >= 4.7 && < 4.11
, base-compat >= 0.9.1 && < 0.10
, base64-bytestring >= 1.0.0.1 && < 1.1
, bytestring >= 0.10 && < 0.11
, containers >= 0.5 && < 0.6
, exceptions >= 0.8 && < 0.9
, generics-sop >= 0.1.0.0 && < 0.4
, http-api-data >= 0.3.6 && < 0.4
, http-media >= 0.6.2 && < 0.8
, http-types >= 0.8.6 && < 0.12
, bytestring >= 0.10.4.0 && < 0.11
, containers >= 0.5.5.1 && < 0.6
, mtl >= 2.1 && < 2.3
, network-uri >= 2.6 && < 2.7
, safe >= 0.3.9 && < 0.4
, servant == 0.12.*
, text >= 1.2 && < 1.3
, text >= 1.2.3.0 && < 1.3

if !impl(ghc >= 8.0)
build-depends:
semigroups >=0.16.2.2 && <0.19
semigroups >=0.18.3 && <0.19

-- Servant dependencies
build-depends:
servant == 0.12.*

-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
base-compat >= 0.9.3 && < 0.10
, base64-bytestring >= 1.0.0.1 && < 1.1
, exceptions >= 0.8.3 && < 0.9
, generics-sop >= 0.3.1.0 && < 0.4
, http-api-data >= 0.3.7.1 && < 0.4
, http-media >= 0.7.1.1 && < 0.8
, http-types >= 0.9.1 && < 0.12
, network-uri >= 2.6.1.0 && < 2.7
, safe >= 0.3.15 && < 0.4

hs-source-dirs: src
default-language: Haskell2010
ghc-options: -Wall
Expand All @@ -69,14 +83,20 @@ test-suite spec
default-language: Haskell2010
hs-source-dirs: test
main-is: Spec.hs
other-modules:
Servant.Client.Core.Internal.BaseUrlSpec

-- Dependencies inherited from the library. No need to specify bounds.
build-depends:
base
, base-compat
, deepseq
, servant-client-core
, hspec == 2.*
, QuickCheck >= 2.7 && < 2.11

-- Additonal dependencies
build-depends:
deepseq >= 1.3.0.2 && <1.5
, hspec >= 2.4.4 && <2.5
, QuickCheck >= 2.10.1 && < 2.12

build-tool-depends:
hspec-discover:hspec-discover
other-modules:
Servant.Client.Core.Internal.BaseUrlSpec
hspec-discover:hspec-discover >= 2.4.4 && <2.5
73 changes: 46 additions & 27 deletions servant-client/servant-client.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,39 @@ library
exposed-modules:
Servant.Client
Servant.Client.Internal.HttpClient

-- Bundled with GHC: Lower bound to not force re-installs
-- text and mtl are bundled starting with GHC-8.4
--
-- note: mtl lower bound is so low because of GHC-7.8
build-depends:
base >= 4.7 && < 4.11
, base-compat >= 0.9.1 && < 0.10
, bytestring >= 0.10 && < 0.11
, aeson >= 0.7 && < 1.3
, attoparsec >= 0.12 && < 0.14
, containers >= 0.5 && < 0.6
, http-client >= 0.4.30 && < 0.6
, http-client-tls >= 0.2.2 && < 0.4
, http-media >= 0.6.2 && < 0.8
, http-types >= 0.8.6 && < 0.12
, exceptions >= 0.8 && < 0.9
, monad-control >= 1.0.0.4 && < 1.1
, bytestring >= 0.10.4.0 && < 0.11
, containers >= 0.5.5.1 && < 0.6
, mtl >= 2.1 && < 2.3
, semigroupoids >= 4.3 && < 5.3
, servant-client-core == 0.12.*
, text >= 1.2 && < 1.3
, transformers >= 0.3 && < 0.6
, text >= 1.2.3.0 && < 1.3
, transformers >= 0.3.0.0 && < 0.6

-- Servant dependencies
build-depends:
servant-client-core == 0.12.*

-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
aeson >= 1.2.3.0 && < 1.3
, base-compat >= 0.9.3 && < 0.10
, attoparsec >= 0.13.2.0 && < 0.14
, http-client >= 0.5.7.1 && < 0.6
, http-client-tls >= 0.3.5.1 && < 0.4
, http-media >= 0.7.1.1 && < 0.8
, http-types >= 0.9.1 && < 0.12
, exceptions >= 0.8.3 && < 0.9
, monad-control >= 1.0.0.4 && < 1.1
, semigroupoids >= 5.2.1 && < 5.3
, transformers-base >= 0.4.4 && < 0.5
, transformers-compat >= 0.4 && < 0.6
, transformers-compat >= 0.5.1 && < 0.6

hs-source-dirs: src
default-language: Haskell2010
ghc-options: -Wall
Expand All @@ -68,34 +81,40 @@ test-suite spec
default-language: Haskell2010
hs-source-dirs: test
main-is: Spec.hs
build-tool-depends:
hspec-discover:hspec-discover
other-modules:
Servant.ClientSpec
Servant.StreamSpec

-- Dependencies inherited from the library. No need to specify bounds.
build-depends:
base == 4.*
base
, aeson
, base-compat
, bytestring
, containers
, deepseq
, hspec == 2.*
, http-api-data
, http-client
, http-media
, http-types
, HUnit
, mtl
, network >= 2.6
, QuickCheck >= 2.7
, servant
, servant-client
, servant-client-core
, servant-server == 0.12.*
, text
, transformers
, transformers-compat
, wai
, warp
, generics-sop

-- Additonal dependencies
build-depends:
deepseq >= 1.3.0.2 && < 1.5
, generics-sop >= 0.3.1.0 && < 0.4
, hspec >= 2.4.4 && < 2.5
, HUnit >= 1.6 && < 1.7
, network >= 2.6.3.2 && < 2.7
, QuickCheck >= 2.10.1 && < 2.12
, servant == 0.12.*
, servant-server == 0.12.*

build-tool-depends:
hspec-discover:hspec-discover >= 2.4.4 && < 2.5
60 changes: 40 additions & 20 deletions servant-docs/servant-docs.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,39 @@ library
Servant.Docs
, Servant.Docs.Internal
, Servant.Docs.Internal.Pretty

-- Bundled with GHC: Lower bound to not force re-installs
-- text and mtl are bundled starting with GHC-8.4
--
-- note: mtl lower bound is so low because of GHC-7.8
build-depends:
base >=4.7 && <5
, base-compat >= 0.9.1 && <0.10
, aeson
, aeson-pretty
, bytestring >= 0.10.4.0 && <0.11
, case-insensitive
, hashable
, http-media >= 0.6
, http-types >= 0.7
, lens
, servant == 0.12.*
, string-conversions
, text
, unordered-containers >=0.2.5.0
, control-monad-omega >= 0.3.1 && <0.4
base >= 4.7 && < 4.11
, bytestring >= 0.10.4.0 && < 0.11
, text >= 1.2.3.0 && < 1.3

if !impl(ghc >= 8.0)
build-depends:
semigroups >=0.17 && <0.19
semigroups >=0.18.3 && <0.19

-- Servant dependencies
build-depends:
servant == 0.12.*

-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
aeson >= 1.2.3.0 && < 1.3
, aeson-pretty >= 0.8.5 && < 0.9
, base-compat >= 0.9.3 && < 0.10
, case-insensitive >= 1.2.0.10 && < 1.3
, control-monad-omega >= 0.3.1 && < 0.4
, hashable >= 1.2.6.1 && < 1.3
, http-media >= 0.7.1.1 && < 0.8
, http-types >= 0.9.1 && < 0.12
, lens >= 4.15.4 && < 4.16
, string-conversions >= 0.4.0.1 && < 0.5
, unordered-containers >= 0.2.8.0 && < 0.3

hs-source-dirs: src
default-language: Haskell2010
ghc-options: -Wall
Expand All @@ -76,19 +90,25 @@ executable greet-docs
default-language: Haskell2010

test-suite spec
default-language: Haskell2010
type: exitcode-stdio-1.0
main-is: Spec.hs
other-modules: Servant.DocsSpec
build-tool-depends:
hspec-discover:hspec-discover
hs-source-dirs: test
ghc-options: -Wall

-- Dependencies inherited from the library. No need to specify bounds.
build-depends:
base
, aeson
, hspec
, lens
, servant
, servant-docs
, string-conversions
default-language: Haskell2010

-- Additonal dependencies
build-depends:
hspec >= 2.4.4 && < 2.5

build-tool-depends:
hspec-discover:hspec-discover >=2.4.4 && <2.5
Loading

0 comments on commit 030cbbc

Please sign in to comment.