2baee34 · typeable/hjsonschema

git.iko.soy/typeable/hjsonschema

Merge pull request #60 from 4e6/ghc-84

Add GHC-8.4 support

commit2baee344d0e28b0dfc0008e4cf112690a0affa87 authorIan Jeffries <ianspiral@gmail.com> dateSat 28 Apr 2018, 17:02 (8 years ago) parent554f51d 370cee6

3 files changed+10−4

compare with master

unifiedsplit

.travis.yml+5−2 hjsonschema.cabal+3−1 src/JSONSchema/Fetch.hs+2−1

.travis.yml+5−2

@@ -32,9 +32,12 @@ matrix:

3232 - compiler: "ghc-8.0.2"

3333 # env: TEST=--disable-tests BENCH=--disable-benchmarks

3434 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}

35− - compiler: "ghc-8.2.1"

35+ - compiler: "ghc-8.2.2"

3636 # env: TEST=--disable-tests BENCH=--disable-benchmarks

37− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}

37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}

38+ - compiler: "ghc-8.4.1"

39+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

40+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}

3841

3942before_install:

4043 - HC=${CC}

hjsonschema.cabal+3−1

@@ -10,7 +10,7 @@ category: Data

1010build-type: Simple

1111cabal-version: >=1.10

1212-- Rerun multi-ghc-travis (executable make-travis-yml-2) after changing:

13−Tested-With: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.1

13+Tested-With: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1

1414extra-source-files:

1515 changelog.md

1616 JSON-Schema-Test-Suite/remotes/*.json

@@ -81,6 +81,8 @@ library

8181 , unordered-containers >= 0.2

8282 , text >= 1.1

8383 , vector >= 0.10

84+ if impl(ghc < 8.0)

85+ build-depends: semigroups == 0.18.*

8486

8587test-suite local

8688 hs-source-dirs:

src/JSONSchema/Fetch.hs+2−1

@@ -7,6 +7,7 @@ import Control.Monad (foldM)

77import qualified Data.ByteString as BS

88import qualified Data.ByteString.Lazy as LBS

99import qualified Data.HashMap.Strict as HM

10+import qualified Data.Semigroup as S

1011import qualified Data.Text as T

1112import qualified Network.HTTP.Client as NC

1213import qualified Network.HTTP.Client.TLS as NCTLS

@@ -29,7 +30,7 @@ data FetchInfo schema = FetchInfo

2930-- | Keys are URIs (without URI fragments).

3031newtype URISchemaMap schema

3132 = URISchemaMap { _unURISchemaMap :: HashMap Text schema }

32− deriving (Eq, Show, Monoid)

33+ deriving (Eq, Show, S.Semigroup, Monoid)

3334

3435-- | A top-level schema along with its location.

3536data SchemaWithURI schema = SchemaWithURI