diff --git a/.travis.yml b/.travis.yml index 259874e..508f9ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ env: - ARGS="--resolver lts-6" - ARGS="--resolver lts-7" - ARGS="--resolver lts-8" +- ARGS="--resolver lts-9" - ARGS="--resolver lts" - ARGS="--resolver nightly" diff --git a/ringo-core/ringo-core.cabal b/ringo-core/ringo-core.cabal index 51eddaf..5970f2f 100644 --- a/ringo-core/ringo-core.cabal +++ b/ringo-core/ringo-core.cabal @@ -35,7 +35,7 @@ library mtl >=2.1 && <2.3, base-compat >=0.6 && <1.0, raw-strings-qq >=1.0 && <1.2, - hssqlppp ==0.6.0 + hssqlppp >=0.6 && <0.7 ghc-options: -Wall -fwarn-incomplete-uni-patterns -fno-warn-unused-do-bind -fno-warn-orphans -funbox-strict-fields default-language: Haskell2010 diff --git a/ringo/ringo.cabal b/ringo/ringo.cabal index 70dfaa0..ad66ff5 100644 --- a/ringo/ringo.cabal +++ b/ringo/ringo.cabal @@ -24,14 +24,14 @@ executable ringo bytestring >=0.10 && <0.11, containers >=0.5 && <0.6, base-compat >=0.6 && <1.0, - optparse-applicative >=0.11 && <0.14, + optparse-applicative >=0.11 && <0.15, yaml >=0.8.11 && <0.9, vector >=0.10 && <0.13, directory >=1.2 && <1.4, filepath >=1.3 && <1.5, - aeson >=0.8 && <1.2, - Cabal >=1.18 && <1.25, - template-haskell >=2.9 && <2.12, + aeson >=0.8 && <1.3, + Cabal >=1.18 && <2.1, + template-haskell >=2.9 && <2.13, ringo-core ghc-options: -Wall -fwarn-incomplete-uni-patterns -fno-warn-unused-do-bind -fno-warn-orphans -funbox-strict-fields -O2 diff --git a/stack.yaml b/stack.yaml index f4a6387..e87b0fc 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,7 +1,7 @@ # For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) -resolver: lts-8.14 +resolver: lts-9.13 # Local packages, usually specified by relative directory name packages: @@ -10,7 +10,7 @@ packages: # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3) extra-deps: -- hssqlppp-0.6.0 +- hssqlppp-0.6.1 # Override default flag values for local packages and extra-deps flags: {}