Remove cabal flag use-old-time, commit to directory >= 1.2

Author: andreasabel

example-client/example-client.cabal

@@ -40,7 +40,7 @@ executable example-client
 
   build-depends:       base                 >= 4.8 && < 4.20,
                        bytestring           >= 0.9,
-                       directory            >= 1.1,
+                       directory            >= 1.2,
                        filepath             >= 1.2,
                        optparse-applicative >= 0.11,
                        time                 >= 1.2,

hackage-repo-tool/hackage-repo-tool.cabal

@@ -48,10 +48,6 @@ flag use-network-uri
   description: Are we using @network-uri@?
   manual: False
 
-flag use-old-time
-  description: Are we using @old-time@?
-  manual: False
-
 flag Cabal-syntax
   description: Are we using Cabal-syntax?
   manual: False
@@ -70,18 +66,12 @@ executable hackage-repo-tool
   -- the respective GHC release
   build-depends:       base                 >= 4.8  && < 4.20,
                        bytestring           >= 0.9  && < 0.13,
-                       directory            >= 1.1  && < 1.4,
+                       directory            >= 1.2  && < 1.4,
                        filepath             >= 1.3  && < 1.5,
                        time                 >= 1.4  && < 1.13
   if !os(windows)
     build-depends:     unix                 >= 2.5  && < 2.9
 
-  if flag(use-old-time)
-    build-depends: directory < 1.2
-                 , old-time == 1.1.*
-  else
-    build-depends: directory >= 1.2
-
   -- For non-boot libraries we try to support single major versions
   -- to reduce the risk of semantic differences
   build-depends:       microlens            >= 0.4.11.2 && < 0.5,

hackage-repo-tool/src/Hackage/Security/RepoTool/Util/IO.hs

@@ -34,11 +34,7 @@ import           System.Posix.Types                (EpochTime)
 import qualified System.Posix.Files                as Posix
 #endif
 
-#if MIN_VERSION_directory(1,2,0)
 import           Data.Time.Clock.POSIX             (utcTimeToPOSIXSeconds)
-#else
-import           System.Time                       (ClockTime (TOD))
-#endif
 
 -- | Get the modification time of the specified file
 --
@@ -50,13 +46,8 @@ getFileModTime opts repoLoc targetPath =
       -- from POSIX seconds, so there shouldn't be loss of precision.
       -- NB: Apparently, this has low clock resolution on GHC < 7.8.
       -- I don't think we care.
-#if MIN_VERSION_directory(1,2,0)
       fromInteger . floor . utcTimeToPOSIXSeconds
         <$> Directory.getModificationTime (toFilePath fp)
-#else
-      Directory.getModificationTime (toFilePath fp) >>= \(TOD s _) ->
-        return (fromInteger s)
-#endif
   where
     fp :: Path Absolute
     fp = anchorTargetPath' opts repoLoc targetPath

hackage-security/hackage-security.cabal

@@ -118,7 +118,7 @@ library
                        bytestring        >= 0.9     && < 0.13,
                        containers        >= 0.4     && < 0.8,
                        cryptohash-sha256 >= 0.11    && < 0.12,
-                       directory         >= 1.2     && < 1.4,
+                       directory         >= 1.2.2   && < 1.4,
                        ed25519           >= 0.0     && < 0.1,
                        filepath          >= 1.2     && < 1.5,
                        mtl               >= 2.2     && < 2.4,

hackage-security/src/Hackage/Security/Util/Path.hs

@@ -88,11 +88,7 @@ import Control.Monad
 import Data.List (isPrefixOf)
 import System.IO (IOMode(..), BufferMode(..), Handle, SeekMode(..))
 import System.IO.Unsafe (unsafeInterleaveIO)
-#if MIN_VERSION_directory(1,2,0)
 import Data.Time (UTCTime)
-#else
-import System.Time (ClockTime)
-#endif
 import qualified Data.ByteString         as BS
 import qualified Data.ByteString.Lazy    as BS.L
 import qualified System.FilePath         as FP.Native
@@ -239,21 +235,7 @@ class FsRoot root where
   toAbsoluteFilePath :: Path root -> IO FilePath
 
 instance FsRoot Relative where
-    toAbsoluteFilePath p = go (unPathNative p)
-      where
-        go :: FilePath -> IO FilePath
-#if MIN_VERSION_directory(1,2,2)
-        go = Dir.makeAbsolute
-#else
-        -- copied implementation from the directory package
-        go = (FP.Native.normalise <$>) . absolutize
-        absolutize path -- avoid the call to `getCurrentDirectory` if we can
-          | FP.Native.isRelative path
-                      = (FP.Native.</> path)
-                      . FP.Native.addTrailingPathSeparator <$>
-                        Dir.getCurrentDirectory
-          | otherwise = return path
-#endif
+    toAbsoluteFilePath p = Dir.makeAbsolute (unPathNative p)
 
 instance FsRoot Absolute where
     toAbsoluteFilePath = return . unPathNative
@@ -371,11 +353,7 @@ doesDirectoryExist path = do
     filePath <- toAbsoluteFilePath path
     Dir.doesDirectoryExist filePath
 
-#if MIN_VERSION_directory(1,2,0)
 getModificationTime :: FsRoot root => Path root -> IO UTCTime
-#else
-getModificationTime :: FsRoot root => Path root -> IO ClockTime
-#endif
 getModificationTime path = do
     filePath <- toAbsoluteFilePath path
     Dir.getModificationTime filePath