Drop support for GHC 8.0 and below

Author: andreasabel

CHANGELOG.md

@@ -1,3 +1,10 @@
+## Changes for 0.29.1
+
+- Drop support for GHC 8.0 and below.
+- Drop dependency `time-compat`.
+
+Tested with GHC 8.2 - 9.10.1.
+
 ## Changes for 0.29
 
 _2023-06-24, Andreas Abel, Midsommar edition_

github.cabal

@@ -1,7 +1,6 @@
 cabal-version:      2.4
 name:               github
-version:            0.29
-x-revision:         5
+version:            0.29.1
 synopsis:           Access to the GitHub API, v3.
 category:           Network
 description:
@@ -42,9 +41,6 @@ tested-with:
   GHC == 8.6.5
   GHC == 8.4.4
   GHC == 8.2.2
-  -- Build failure of HsOpenSSL with GHC 8.0
-  -- https://github.com/haskell-cryptography/HsOpenSSL/issues/97
-  -- GHC == 8.0.2
 
 extra-doc-files:
   README.md
@@ -66,11 +62,9 @@ library
   default-language:   Haskell2010
   ghc-options:
     -Wall
-  if impl(ghc >= 8.0)
-    ghc-options:
-      -Wcompat
-      -Wno-star-is-type
-        -- The star-is-type warning cannot be sensiblity addressed while supporting GHC 7.
+    -Wcompat
+    -Wno-star-is-type
+      -- The star-is-type warning cannot be sensiblity addressed while supporting GHC 7.
   hs-source-dirs:     src
   default-extensions:
     DataKinds
@@ -188,15 +182,15 @@ library
 
   -- Packages bundles with GHC, mtl and text are also here
   build-depends:
-      base          >=4.7      && <5
+      base          >=4.10     && <5
     , binary        >=0.7.1.0  && <0.11
     , bytestring    >=0.10.4.0 && <0.13
     , containers    >=0.5.5.1  && <0.8
     , deepseq       >=1.3.0.2  && <1.6
     , exceptions    >=0.10.2   && <0.11
     , mtl           >=2.1.3.1  && <2.2 || >=2.2.1 && <2.4
     , text          >=1.2.0.6  && <2.2
-    , time-compat   >=1.9.2.2  && <1.10
+    , time          >=1.8.0.2  && <2
     , transformers  >=0.3.0.0  && <0.7
 
   -- other packages
@@ -229,9 +223,6 @@ library
         http-client-tls  >=0.3.5.3 && <0.4
       , tls              >=1.4.1
 
-  if !impl(ghc >=8.0)
-    build-depends: semigroups >=0.18.5 && <0.20
-
 test-suite github-test
   default-language:   Haskell2010
   type:               exitcode-stdio-1.0

samples/Operational/Operational.hs

@@ -1,7 +1,7 @@
-{-# LANGUAGE CPP               #-}
 {-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE GADTs             #-}
 {-# LANGUAGE OverloadedStrings #-}
+
 module Main (main) where
 
 import Common

src/GitHub/Data.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 -- |
 -- This module re-exports the @GitHub.Data.@ and "GitHub.Auth" submodules.
 

src/GitHub/Data/Name.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 module GitHub.Data.Name (
     Name(..),
     mkName,
@@ -8,10 +7,8 @@ module GitHub.Data.Name (
 import Prelude ()
 import GitHub.Internal.Prelude
 
-#if MIN_VERSION_aeson(1,0,0)
 import Data.Aeson.Types
        (FromJSONKey (..), ToJSONKey (..), fromJSONKeyCoerce, toJSONKeyText)
-#endif
 
 newtype Name entity = N Text
     deriving (Eq, Ord, Show, Generic, Typeable, Data)
@@ -38,12 +35,10 @@ instance ToJSON (Name entity) where
 instance IsString (Name entity) where
     fromString = N . fromString
 
-#if MIN_VERSION_aeson(1,0,0)
 -- | @since 0.15.0.0
 instance ToJSONKey (Name entity) where
     toJSONKey = toJSONKeyText untagName
 
 -- | @since 0.15.0.0
 instance FromJSONKey (Name entity) where
     fromJSONKey = fromJSONKeyCoerce
-#endif

src/GitHub/Data/RateLimit.hs

@@ -3,7 +3,7 @@ module GitHub.Data.RateLimit where
 import GitHub.Internal.Prelude
 import Prelude ()
 
-import Data.Time.Clock.System.Compat (SystemTime (..))
+import Data.Time.Clock.System (SystemTime (..))
 
 import qualified Data.ByteString.Char8 as BS8
 import qualified Network.HTTP.Client as HTTP

src/GitHub/Data/Repos.hs

@@ -1,6 +1,4 @@
-{-# LANGUAGE CPP               #-}
 {-# LANGUAGE FlexibleInstances #-}
-#define UNSAFE 1
 
 -- |
 -- This module also exports
@@ -19,13 +17,7 @@ import Prelude ()
 
 import qualified Data.HashMap.Strict as HM
 import qualified Data.Text as T
-#if MIN_VERSION_aeson(1,0,0)
 import Data.Aeson.Types (FromJSONKey (..), fromJSONKeyCoerce)
-#else
-#ifdef UNSAFE
-import Unsafe.Coerce (unsafeCoerce)
-#endif
-#endif
 
 data Repo = Repo
     { repoId              :: !(Id Repo)
@@ -383,22 +375,8 @@ instance FromJSON Language where
 instance ToJSON Language where
     toJSON = toJSON . getLanguage
 
-#if MIN_VERSION_aeson(1,0,0)
 instance FromJSONKey Language where
     fromJSONKey = fromJSONKeyCoerce
-#else
-instance FromJSON a => FromJSON (HM.HashMap Language a) where
-    parseJSON = fmap mapKeyLanguage . parseJSON
-      where
-        mapKeyLanguage :: HM.HashMap Text a -> HM.HashMap Language a
-#ifdef UNSAFE
-        mapKeyLanguage = unsafeCoerce
-#else
-        mapKeyLanguage = mapKey Language
-        mapKey :: (Eq k2, Hashable k2) => (k1 -> k2) -> HM.HashMap k1 a -> HM.HashMap k2 a
-        mapKey f = HM.fromList . map (first f) . HM.toList
-#endif
-#endif
 
 data ArchiveFormat
     = ArchiveFormatTarball -- ^ ".tar.gz" format

src/GitHub/Data/Request.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP                #-}
 {-# LANGUAGE FlexibleContexts   #-}
 {-# LANGUAGE GADTs              #-}
 {-# LANGUAGE KindSignatures     #-}

src/GitHub/Endpoints/Issues.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 -- |
 -- The issues API as described on <http://developer.github.com/v3/issues/>.
 

src/GitHub/Endpoints/Repos/Comments.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 -- |
 -- The repo commits API as described on
 -- <http://developer.github.com/v3/repos/comments/>.

src/GitHub/Endpoints/Repos/Commits.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 -- |
 -- The repo commits API as described on
 -- <http://developer.github.com/v3/repos/commits/>.

src/GitHub/Internal/Prelude.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE CPP #-}
 
 -- |
 -- This module may change between minor releases. Do not rely on its contents.
@@ -24,7 +23,7 @@ import Data.Maybe               as X (catMaybes)
 import Data.Semigroup           as X (Semigroup (..))
 import Data.String              as X (IsString (..))
 import Data.Text                as X (Text, pack, unpack)
-import Data.Time.Compat         as X (UTCTime)
+import Data.Time                as X (UTCTime)
 import Data.Time.ISO8601        as X (formatISO8601)
 import Data.Vector              as X (Vector)
 import GHC.Generics             as X (Generic)