git.iko.soy/typeable/http-api-data
on master help sign in
Merge pull request #71 from phadej/ghc-8.4.1
ffac6a5Oleg Grenrus
.travis.yml+2−20
compare with master
unifiedsplit
@@ -45,12 +45,9 @@ matrix:
45 # env: TEST=--disable-tests BENCH=--disable-benchmarks
45 # env: TEST=--disable-tests BENCH=--disable-benchmarks
46 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
46 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
47 - compiler: "ghc-8.4.1"
47 - compiler: "ghc-8.4.1"
48− env: GHCHEAD=true
48+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
49 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
49 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
50
50
51− allow_failures:
52− - compiler: "ghc-8.4.1"
53−
54before_install:
51before_install:
55 - HC=${CC}
52 - HC=${CC}
56 - HCPKG=${HC/ghc/ghc-pkg}
53 - HCPKG=${HC/ghc/ghc-pkg}
@@ -73,21 +70,6 @@ install:
73 - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
70 - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
74 - rm -fv cabal.project cabal.project.local
71 - rm -fv cabal.project cabal.project.local
75 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
72 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
76− # Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
77− - |
78− if $GHCHEAD; then
79− sed -i.bak 's/-- allow-newer:.*/allow-newer: *:base, *:template-haskell, *:ghc, *:Cabal/' ${HOME}/.cabal/config
80−
81− echo 'repository head.hackage' >> ${HOME}/.cabal/config
82− echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config
83− echo ' secure: True' >> ${HOME}/.cabal/config
84− echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config
85− echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config
86− echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
87− echo ' key-threshold: 3' >> ${HOME}/.cabal.config
88−
89− cabal new-update head.hackage -v
90− fi
91 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
73 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
92 - "printf 'packages: \".\"\\n' > cabal.project"
74 - "printf 'packages: \".\"\\n' > cabal.project"
93 - cat cabal.project
75 - cat cabal.project
@@ -97,7 +79,7 @@ install:
97 - rm -f cabal.project.freeze
79 - rm -f cabal.project.freeze
98 - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
80 - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
99 - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
81 - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
100− - rm -rf "."/.ghc.environment.* "."/dist
82+ - rm -rf .ghc.environment.* "."/dist
101 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
83 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
102
84
103# Here starts the actual work to be performed for the package under test;
85# Here starts the actual work to be performed for the package under test;
CHANGELOG.md+5
@@ -1,3 +1,8 @@
1+0.3.8.1
2+---
3+
4+* GHC-8.4.1 support
5+
10.3.8
60.3.8
2---
7---
3
8
http-api-data.cabal+5−5
@@ -1,5 +1,5 @@
1name: http-api-data
1name: http-api-data
2−version: 0.3.8
2+version: 0.3.8.1
3license: BSD3
3license: BSD3
4license-file: LICENSE
4license-file: LICENSE
5author: Nickolay Kudasov <nickolay.kudasov@gmail.com>
5author: Nickolay Kudasov <nickolay.kudasov@gmail.com>
@@ -28,7 +28,7 @@ tested-with:
28
28
29custom-setup
29custom-setup
30 setup-depends:
30 setup-depends:
31− base >= 4.7 && <4.11,
31+ base >= 4.7 && <4.12,
32 Cabal >= 1.18 && <2.3,
32 Cabal >= 1.18 && <2.3,
33 cabal-doctest >=1.0.6 && <1.1
33 cabal-doctest >=1.0.6 && <1.1
34
34
@@ -40,7 +40,7 @@ flag use-text-show
40library
40library
41 hs-source-dirs: src/
41 hs-source-dirs: src/
42 include-dirs: include/
42 include-dirs: include/
43− build-depends: base >= 4.7 && < 4.11
43+ build-depends: base >= 4.7 && < 4.12
44 , attoparsec >= 0.13.0.1 && < 0.14
44 , attoparsec >= 0.13.0.1 && < 0.14
45 , attoparsec-iso8601 >= 1.0.0.0 && < 1.1
45 , attoparsec-iso8601 >= 1.0.0.0 && < 1.1
46 , bytestring >= 0.10.4.0 && < 0.11
46 , bytestring >= 0.10.4.0 && < 0.11
@@ -88,14 +88,14 @@ test-suite spec
88 , text
88 , text
89 , time
89 , time
90 , bytestring
90 , bytestring
91− , uuid
91+ , uuid-types
92
92
93test-suite doctests
93test-suite doctests
94 ghc-options: -Wall
94 ghc-options: -Wall
95 build-depends:
95 build-depends:
96 base,
96 base,
97 directory >= 1.0,
97 directory >= 1.0,
98− doctest >= 0.11 && <0.14,
98+ doctest >= 0.11 && <0.16,
99 filepath
99 filepath
100 default-language: Haskell2010
100 default-language: Haskell2010
101 hs-source-dirs: test
101 hs-source-dirs: test
test/Web/Internal/HttpApiDataSpec.hs+1−1
@@ -11,7 +11,7 @@ import qualified Data.Text.Lazy as L
11import qualified Data.ByteString as BS
11import qualified Data.ByteString as BS
12import Data.ByteString.Builder (toLazyByteString)
12import Data.ByteString.Builder (toLazyByteString)
13import Data.Version
13import Data.Version
14−import qualified Data.UUID as UUID
14+import qualified Data.UUID.Types as UUID
15
15
16import Data.Proxy
16import Data.Proxy
17
17