Skip to content

Commit 5d9f0cc

Browse files
authored
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.
1 parent 03c6534 commit 5d9f0cc

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

dhall/dhall.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ Test-Suite tasty
419419
tasty-quickcheck >= 0.9.2 && < 0.11,
420420
tasty-silver < 3.4 ,
421421
temporary >= 1.2.1 && < 1.4 ,
422-
turtle < 1.6 ,
422+
turtle < 1.7 ,
423423
Default-Language: Haskell2010
424424

425425
Test-Suite doctest

dhall/tests/Dhall/Test/Freeze.hs

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{-# LANGUAGE OverloadedStrings #-}
22

3+
-- FIXME: Re-enable deprecation warnings after removing support for turtle < 1.6.
4+
{-# OPTIONS_GHC -Wno-deprecations #-}
5+
36
module Dhall.Test.Freeze where
47

58
import Data.Text (Text)

dhall/tests/Dhall/Test/Import.hs

+10-8
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22
{-# LANGUAGE OverloadedStrings #-}
33
{-# LANGUAGE TypeApplications #-}
44

5+
-- FIXME: Re-enable deprecation warnings after removing support for turtle < 1.6.
6+
{-# OPTIONS_GHC -Wno-deprecations #-}
7+
58
module Dhall.Test.Import where
69

7-
import Control.Exception (SomeException)
8-
import Data.Foldable (fold)
9-
import Data.Text (Text, isSuffixOf)
10-
import Data.Void (Void)
11-
import Filesystem.Path.CurrentOS (toText)
12-
import Prelude hiding (FilePath)
13-
import Test.Tasty (TestTree)
14-
import Turtle (FilePath, (</>))
10+
import Control.Exception (SomeException)
11+
import Data.Foldable (fold)
12+
import Data.Text (Text, isSuffixOf)
13+
import Data.Void (Void)
14+
import Prelude hiding (FilePath)
15+
import Test.Tasty (TestTree)
16+
import Turtle (FilePath, toText, (</>))
1517

1618
import qualified Control.Exception as Exception
1719
import qualified Control.Monad as Monad

0 commit comments

Comments
 (0)