diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,12 @@ +0.10.0.2: + + Switched hosting from bitbucket to gitlab (and mercurial to + git). The new "home" location is https://gitlab.com/dburke/swish + + Bumped base to a maximum of 4.14 to support GHC 8.8, and + bumped hashable to support version 1.3. Add conditional rules + to avoid warnings when building with GHC 8.8. + 0.10.0.1: Bump to support polyparse and its GHC 8.6 compatibility. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ (c) 2003, 2004 G. Klyne (c) 2009 Vasili I Galchin - (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Doug Burke + (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Doug Burke All rights reserved. @@ -71,15 +71,15 @@ ## With stack -Swish is available as part of the stackage curated package set (at -least it is available in lts-11.1 to lts-12.2, the latest version -at the time of writing). +Swish is available as part of the stackage curated package set. There are several stack configuration files, for different GHC versions: % cd swish % stack install + % STACK_YAML=stack-8.6.yaml stack install + % STACK_YAML=stack-8.4.yaml stack install % STACK_YAML=stack-8.2.yaml stack install % STACK_YAML=stack-8.0.yaml stack install % STACK_YAML=stack-7.10.yaml stack install diff --git a/src/Swish/Datatype.hs b/src/Swish/Datatype.hs --- a/src/Swish/Datatype.hs +++ b/src/Swish/Datatype.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE ExistentialQuantification #-} {-# LANGUAGE OverloadedStrings #-} @@ -7,7 +8,7 @@ -- | -- Module : Datatype -- Copyright : (c) 2003, Graham Klyne, 2009 Vasili I Galchin, --- 2011, 2012, 2018 Douglas Burke +-- 2011, 2012, 2018, 2019 Douglas Burke -- License : GPL V2 -- -- Maintainer : Douglas Burke @@ -71,7 +72,9 @@ -- -- import Swish.Utils.ShowM (ShowM(..)) +#if (!defined(__GLASGOW_HASKELL__)) || (__GLASGOW_HASKELL__ < 808) import Control.Applicative ((<$>)) +#endif import Data.Maybe (isJust, catMaybes) diff --git a/src/Swish/RDF/ClassRestrictionRule.hs b/src/Swish/RDF/ClassRestrictionRule.hs --- a/src/Swish/RDF/ClassRestrictionRule.hs +++ b/src/Swish/RDF/ClassRestrictionRule.hs @@ -57,7 +57,9 @@ import Swish.RDF.VarBinding (RDFVarBinding) import Swish.RDF.Vocabulary (namespaceRDFD) +#if (!defined(__GLASGOW_HASKELL__)) || (__GLASGOW_HASKELL__ < 808) import Control.Applicative ((<$>)) +#endif import Data.List (delete, nub, subsequences) import Data.Maybe (fromJust, fromMaybe, mapMaybe) diff --git a/src/Swish/RDF/Formatter/Turtle.hs b/src/Swish/RDF/Formatter/Turtle.hs --- a/src/Swish/RDF/Formatter/Turtle.hs +++ b/src/Swish/RDF/Formatter/Turtle.hs @@ -7,7 +7,7 @@ -- | -- Module : Turtle -- Copyright : (c) 2003, Graham Klyne, 2009 Vasili I Galchin, --- 2011, 2012, 2013, 2014, 2018 Douglas Burke +-- 2011, 2012, 2013, 2014, 2018, 2019 Douglas Burke -- License : GPL V2 -- -- Maintainer : Douglas Burke @@ -90,7 +90,10 @@ import Swish.RDF.Vocabulary (rdfType, rdfNil) +#if (!defined(__GLASGOW_HASKELL__)) || (__GLASGOW_HASKELL__ < 808) import Control.Applicative ((<$>)) +#endif + import Control.Monad (liftM) import Control.Monad.State (State, modify, gets, runState) diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ flags: {} packages: - '.' -resolver: nightly-2018-11-02 +resolver: lts-13.19 diff --git a/swish.cabal b/swish.cabal --- a/swish.cabal +++ b/swish.cabal @@ -1,18 +1,18 @@ Name: swish -Version: 0.10.0.1 +Version: 0.10.0.2 Stability: experimental License: LGPL-2.1 License-file: LICENSE Author: Graham Klyne - GK@ninebynine.org -Copyright: (c) 2003, 2004 G. Klyne; 2009 Vasili I Galchin; 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Doug Burke; All rights reserved. +Copyright: (c) 2003, 2004 G. Klyne; 2009 Vasili I Galchin; 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Doug Burke; All rights reserved. Maintainer: dburke@cfa.harvard.edu Category: Semantic Web Synopsis: A semantic web toolkit. -Tested-With: GHC==8.2.2 +Tested-With: GHC==8.6.5 Cabal-Version: >= 1.9.2 -Homepage: https://bitbucket.org/doug_burke/swish/wiki/Home -Bug-reports: https://bitbucket.org/doug_burke/swish/issues +Homepage: https://gitlab.com/dburke/swish +Bug-reports: https://gitlab.com/dburke/swish/issues Description: Swish is a framework, written in the purely functional @@ -44,7 +44,7 @@ . * Complete, ready-to-run, command-line and script-driven programs. . - Changes are given in the . + Changes are given in the file. . References: . @@ -62,8 +62,8 @@ Data-Files: scripts/*.ss Source-repository head - type: mercurial - location: https://bitbucket.org/doug_burke/swish + type: git + location: https://gitlab.com/dburke/swish.git -- Removed in 0.9.15 since I haven't been using it and it causes -- problems with 'cabal upload', since Cabal doesn't seem to recognize @@ -90,12 +90,12 @@ Library Build-Depends: - base >= 4.5 && < 4.13, + base >= 4.5 && < 4.14, containers >= 0.5 && < 0.7, directory >= 1.0 && < 1.4, filepath >= 1.1 && < 1.5, -- Early versions of hashable 1.2 are problematic - hashable (>= 1.1 && < 1.2) || (>= 1.2.0.6 && <1.3), + hashable (>= 1.1 && < 1.2) || (>= 1.2.0.6 && <1.4), intern >= 0.8 && < 1.0, mtl >= 2 && < 3, -- old-locale is only needed if time < 1.5 @@ -117,9 +117,12 @@ -Wall -fno-warn-orphans build-depends: semigroups >= 0.16 && < 0.19 else - ghc-options: - -Wall -fno-warn-orphans -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances - + if impl(ghc < 8.8.0) + ghc-options: + -Wall -fno-warn-orphans -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances + else + ghc-options: + -Wall -fno-warn-orphans -Wcompat -Wnoncanonical-monad-instances -- if flag(developer) -- ghc-options: -Werror