Build against turtle-1.6 (#2431)

Related to commercialhaskell/stackage#6613 I kept the deprecated functions so that we could also support `turtle-1.5` for one release, to (hypothetically) simplify migrations for reverse dependencies. After publishing one release with this change we can remove the deprecated functions.
dhall-lang · Jul 3, 2022 · 5d9f0cc · 5d9f0cc
1 parent 03c6534
commit 5d9f0cc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal
@@ -419,7 +419,7 @@ Test-Suite tasty
         tasty-quickcheck          >= 0.9.2    && < 0.11,
         tasty-silver                             < 3.4 ,
         temporary                 >= 1.2.1    && < 1.4 ,
-        turtle                                   < 1.6 ,
+        turtle                                   < 1.7 ,
     Default-Language: Haskell2010
 
 Test-Suite doctest

diff --git a/dhall/tests/Dhall/Test/Freeze.hs b/dhall/tests/Dhall/Test/Freeze.hs
@@ -1,5 +1,8 @@
 {-# LANGUAGE OverloadedStrings #-}
 
+-- FIXME: Re-enable deprecation warnings after removing support for turtle < 1.6.
+{-# OPTIONS_GHC -Wno-deprecations #-}
+
 module Dhall.Test.Freeze where
 
 import Data.Text    (Text)

diff --git a/dhall/tests/Dhall/Test/Import.hs b/dhall/tests/Dhall/Test/Import.hs
@@ -2,16 +2,18 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeApplications  #-}
 
+-- FIXME: Re-enable deprecation warnings after removing support for turtle < 1.6.
+{-# OPTIONS_GHC -Wno-deprecations #-}
+
 module Dhall.Test.Import where
 
-import Control.Exception         (SomeException)
-import Data.Foldable             (fold)
-import Data.Text                 (Text, isSuffixOf)
-import Data.Void                 (Void)
-import Filesystem.Path.CurrentOS (toText)
-import Prelude                   hiding (FilePath)
-import Test.Tasty                (TestTree)
-import Turtle                    (FilePath, (</>))
+import Control.Exception (SomeException)
+import Data.Foldable     (fold)
+import Data.Text         (Text, isSuffixOf)
+import Data.Void         (Void)
+import Prelude           hiding (FilePath)
+import Test.Tasty        (TestTree)
+import Turtle            (FilePath, toText, (</>))
 
 import qualified Control.Exception                as Exception
 import qualified Control.Monad                    as Monad