From cf55bd7791100b5de933803fdc2318e3386c88e5 Mon Sep 17 00:00:00 2001 From: Sam Doshi Date: Sun, 24 Dec 2017 14:16:13 +0000 Subject: [PATCH 1/4] update time and HUnit bounds --- time-recurrence.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/time-recurrence.cabal b/time-recurrence.cabal index 69e94a6..b23f226 100644 --- a/time-recurrence.cabal +++ b/time-recurrence.cabal @@ -84,7 +84,7 @@ Library -- Packages needed in order to build this package. Build-depends: base >= 4 && < 5, - time >= 1.4 && < 1.6, + time >= 1.4 && < 1.9, data-ordlist >= 0.4.5, mtl >= 2.0 && < 2.3 @@ -101,12 +101,12 @@ Test-Suite test-time-recurrence main-is: Tests.lhs ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-orphans build-depends: base >= 4 && < 5, - time >= 1.4 && < 1.6, + time >= 1.4 && < 1.9, data-ordlist >= 0.4.5, mtl >= 2.0 && < 2.3, test-framework >= 0.8, test-framework-hunit >= 0.3.0, - HUnit >= 1.2 && < 1.4, + HUnit >= 1.2 && < 1.7, old-locale >= 1.0 && < 1.1 other-modules: Data.Time.Recurrence From 9ed002f01d56a219ae52f6a21b3e0c89b7ff95aa Mon Sep 17 00:00:00 2001 From: Sam Doshi Date: Wed, 8 Apr 2020 09:18:02 +0100 Subject: [PATCH 2/4] update for time 1.9 --- src/Data/Time/CalendarTime/CalendarTime.hs | 2 +- tests/Tests.lhs | 2 +- time-recurrence.cabal | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Data/Time/CalendarTime/CalendarTime.hs b/src/Data/Time/CalendarTime/CalendarTime.hs index 19812b6..32bb95d 100644 --- a/src/Data/Time/CalendarTime/CalendarTime.hs +++ b/src/Data/Time/CalendarTime/CalendarTime.hs @@ -14,7 +14,7 @@ module Data.Time.CalendarTime.CalendarTime ) where -import Data.Time +import Data.Time hiding (calendarDay, calendarMonth, calendarYear) import Data.Time.Calendar.OrdinalDate import Data.Time.Calendar.Month import Data.Time.Calendar.WeekDay diff --git a/tests/Tests.lhs b/tests/Tests.lhs index af68ec2..8c5ac99 100644 --- a/tests/Tests.lhs +++ b/tests/Tests.lhs @@ -16,7 +16,7 @@ a local time instance has not been created yet, all the dates are converted into UTC. #if MIN_VERSION_time(1,5,0) -> import Data.Time +> import Data.Time hiding (Monday, Sunday) #else > import Data.Time > import System.Locale (TimeLocale, defaultTimeLocale, rfc822DateFormat) diff --git a/time-recurrence.cabal b/time-recurrence.cabal index b23f226..38b0c06 100644 --- a/time-recurrence.cabal +++ b/time-recurrence.cabal @@ -84,7 +84,7 @@ Library -- Packages needed in order to build this package. Build-depends: base >= 4 && < 5, - time >= 1.4 && < 1.9, + time >= 1.4 && < 1.10, data-ordlist >= 0.4.5, mtl >= 2.0 && < 2.3 @@ -101,7 +101,7 @@ Test-Suite test-time-recurrence main-is: Tests.lhs ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-orphans build-depends: base >= 4 && < 5, - time >= 1.4 && < 1.9, + time >= 1.4 && < 1.10, data-ordlist >= 0.4.5, mtl >= 2.0 && < 2.3, test-framework >= 0.8, From b84f4327bf7dc0c2eef0a3d5fdc8821c8f1f60f6 Mon Sep 17 00:00:00 2001 From: Sam Doshi Date: Fri, 28 Jul 2023 14:23:17 +0100 Subject: [PATCH 3/4] update for time 1.11 --- time-recurrence.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/time-recurrence.cabal b/time-recurrence.cabal index 38b0c06..a307b7b 100644 --- a/time-recurrence.cabal +++ b/time-recurrence.cabal @@ -84,7 +84,7 @@ Library -- Packages needed in order to build this package. Build-depends: base >= 4 && < 5, - time >= 1.4 && < 1.10, + time >= 1.4 && < 1.12, data-ordlist >= 0.4.5, mtl >= 2.0 && < 2.3 @@ -101,7 +101,7 @@ Test-Suite test-time-recurrence main-is: Tests.lhs ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-orphans build-depends: base >= 4 && < 5, - time >= 1.4 && < 1.10, + time >= 1.4 && < 1.12, data-ordlist >= 0.4.5, mtl >= 2.0 && < 2.3, test-framework >= 0.8, From e9a8a7ed15ae64a3ef803672e78050f20062ffad Mon Sep 17 00:00:00 2001 From: Sam Doshi Date: Sat, 28 Oct 2023 09:25:54 +0100 Subject: [PATCH 4/4] bump mtl and time version bounds --- tests/Tests.lhs | 2 +- time-recurrence.cabal | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Tests.lhs b/tests/Tests.lhs index 8c5ac99..916e15b 100644 --- a/tests/Tests.lhs +++ b/tests/Tests.lhs @@ -16,7 +16,7 @@ a local time instance has not been created yet, all the dates are converted into UTC. #if MIN_VERSION_time(1,5,0) -> import Data.Time hiding (Monday, Sunday) +> import Data.Time hiding (Monday, Sunday, January, September, October) #else > import Data.Time > import System.Locale (TimeLocale, defaultTimeLocale, rfc822DateFormat) diff --git a/time-recurrence.cabal b/time-recurrence.cabal index a307b7b..954c8ec 100644 --- a/time-recurrence.cabal +++ b/time-recurrence.cabal @@ -84,9 +84,9 @@ Library -- Packages needed in order to build this package. Build-depends: base >= 4 && < 5, - time >= 1.4 && < 1.12, + time >= 1.4 && < 1.13, data-ordlist >= 0.4.5, - mtl >= 2.0 && < 2.3 + mtl >= 2.0 && < 2.4 Default-Language: Haskell98 -- Modules not exported by this package. @@ -101,9 +101,9 @@ Test-Suite test-time-recurrence main-is: Tests.lhs ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-orphans build-depends: base >= 4 && < 5, - time >= 1.4 && < 1.12, + time >= 1.4 && < 1.13, data-ordlist >= 0.4.5, - mtl >= 2.0 && < 2.3, + mtl >= 2.0 && < 2.4, test-framework >= 0.8, test-framework-hunit >= 0.3.0, HUnit >= 1.2 && < 1.7,