Migrate to filepath-1.4.99.5

hasufell · Jul 8, 2022 · 6f45498 · 6f45498
1 parent 7bcff59
commit 6f45498
Show file tree

Hide file tree

Showing 38 changed files with 402 additions and 387 deletions.
diff --git a/cabal.project b/cabal.project
@@ -2,23 +2,22 @@ packages: ./hpath
           ./hpath-directory
           ./hpath-posix
           ./streamly-posix
-		  ../../tmp/file-io
-          https://hackage.haskell.org/package/filepath-2.0.0.0/candidate/filepath-2.0.0.0.tar.gz
+          https://hackage.haskell.org/package/filepath-1.4.99.5/candidate/filepath-1.4.99.5.tar.gz
 
 source-repository-package
     type: git
     location: https://github.com/hasufell/unix.git
-    tag: 4d7bce9d85f077908f699532673e12ae66b178b0
+    tag: f3b8ff89e1166df51ae02ce405fc1b3efe3c590f
 
 source-repository-package
     type: git
     location: https://github.com/hasufell/Win32.git
-    tag: a2ab9bc501614c48c62f9508488e87f0c2924b7b
+    tag: 766234a476e9f7b88c72fe13b51e0012f95837e9
 
--- source-repository-package
--- 	type: git
--- 	location: https://github.com/hasufell/file-io.git
--- 	tag: 6bea7270a224c3357f0866b5e9e3aa91fa39e431
+source-repository-package
+    type: git
+    location: https://github.com/hasufell/file-io.git
+    tag: fbf71938823f98610c4d7f8e647bb4d26c5d0c20
 
 package hpath-io
     ghc-options: -O2 -fspec-constr-recursive=16 -fmax-worker-args=16
@@ -27,4 +26,4 @@ package hpath-io
 package streamly
     ghc-options: -O2 -fspec-constr-recursive=16 -fmax-worker-args=16
 
-allow-newer: filepath, Win32
+allow-newer: filepath, Win32, unix
diff --git a/hpath-directory/configure b/hpath-directory/configure
@@ -585,7 +585,7 @@ PACKAGE_STRING='Haskell directory package 1.0'
 PACKAGE_BUGREPORT='libraries@haskell.org'
 PACKAGE_URL=''
 
-ac_unique_file="src/System/Directory/AbstractFilePath.hs"
+ac_unique_file="src/System/Directory/OsPath.hs"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>

diff --git a/hpath-directory/configure.ac b/hpath-directory/configure.ac
@@ -1,7 +1,7 @@
 AC_INIT([Haskell directory package], [1.0], [libraries@haskell.org], [directory])
 
 # Safety check: Ensure that we are in the correct source directory.
-AC_CONFIG_SRCDIR([src/System/Directory/AbstractFilePath.hs])
+AC_CONFIG_SRCDIR([src/System/Directory/OsPath.hs])
 
 AC_CONFIG_HEADERS([src/HsDirectoryConfig.h])
 

diff --git a/hpath-directory/hpath-directory.cabal b/hpath-directory/hpath-directory.cabal
@@ -2,7 +2,7 @@ cabal-version:      >=1.10
 name:               hpath-directory
 version:            0.15.2.2
 synopsis:
-  Alternative to 'directory' package with AbstractFilePath based filepaths
+  Alternative to 'directory' package with OsPath based filepaths
 
 description:
   This provides a safer alternative to the 'directory'
@@ -28,7 +28,7 @@ extra-tmp-files:
 
 extra-source-files:
   ./src/HsDirectoryConfig.h.in
-  ./src/System/Win32/WindowsFilePath/*.h
+  ./src/System/Win32/WindowsPath/*.h
   CHANGELOG.md
 
 tested-with:
@@ -37,16 +37,16 @@ tested-with:
 library
   if os(windows)
     cpp-options:     -DWINDOWS
-    exposed-modules: System.Win32.WindowsFilePath.Directory
+    exposed-modules: System.Win32.WindowsPath.Directory
     build-depends:
         Win32
 
     include-dirs:    src
 
   else
     exposed-modules:
-      System.Posix.PosixFilePath.Directory
-      System.Posix.PosixFilePath.Directory.Errors
+      System.Posix.PosixPath.Directory
+      System.Posix.PosixPath.Directory.Errors
 
     build-depends:
         hpath-posix             >=0.14.0
@@ -55,7 +55,7 @@ library
       , unix-bytestring         >=0.3
 
   exposed-modules:
-    System.Directory.AbstractFilePath
+    System.Directory.OsPath
     System.Directory.HPath
     System.Directory.Errors
     System.Directory.Types
@@ -66,7 +66,7 @@ library
       base                     >=4.8   && <5
     , bytestring               >=0.10
     , exceptions               >=0.10
-    , filepath                 >=2.0.0.0
+    , filepath                 >=1.4.99.5
     , file-io
     , IfElse
     , hpath
@@ -138,7 +138,7 @@ test-suite spec
       , unix-bytestring
 
   build-depends:
-      filepath                 >=2.0.0.0
+      filepath                 >=1.4.99.5
     , base
     , bytestring               >=0.10.0.0
     , hpath-directory

diff --git a/hpath-directory/src/System/Directory/HPath.hs b/hpath-directory/src/System/Directory/HPath.hs
@@ -81,9 +81,9 @@ module System.Directory.HPath
   )
   where
 
-import           System.Directory.AbstractFilePath (Permissions)
-import qualified System.Directory.AbstractFilePath as AFP
-import           System.File.AbstractFilePath
+import           System.Directory.OsPath (Permissions)
+import qualified System.Directory.OsPath as AFP
+import           System.File.OsPath
 import           Prelude                 hiding ( appendFile
                                                 , readFile
                                                 , writeFile