diff --git a/cartel.cabal b/cartel.cabal --- a/cartel.cabal +++ b/cartel.cabal @@ -3,11 +3,11 @@ -- http://www.github.com/massysett/cartel -- -- Script name used to generate: GenCartelCabal.hs --- Generated on: 2015-03-27 12:58:07.137738 EDT --- Cartel library version: 0.14.2.6 +-- Generated on: 2015-09-09 21:53:21.77097 EDT +-- Cartel library version: 0.14.2.8 name: cartel -version: 0.14.2.6 +version: 0.14.2.8 cabal-version: >= 1.18 license: BSD3 license-file: LICENSE @@ -27,9 +27,6 @@ . See the documentation in the "Cartel" module for details. category: Distribution -tested-with: - GHC == 7.8.2 - GHC == 7.10.1 extra-source-files: README.md @@ -49,11 +46,11 @@ hs-source-dirs: lib build-depends: - base >= 4.7.0.0 && < 4.9 - , directory >= 1.1.0.2 && < 1.3 - , filepath >= 1.3.0.0 && < 1.5 - , time >= 1.4 && < 1.6 - , transformers >= 0.3.0.0 && < 0.5 + base >= 4.7.0.0 && < 5 + , directory >= 1.1.0.2 + , filepath >= 1.3.0.0 + , time >= 1.4 + , transformers >= 0.3.0.0 source-repository head type: git @@ -64,26 +61,25 @@ buildable: True other-modules: Cartel.Generators - Decrees hs-source-dirs: tests build-depends: - multiarg >= 0.30.0.0 && < 0.31 - , QuickCheck >= 2.7 && < 2.9 - , random >= 1.0.1.1 && < 1.2 - , tasty >= 0.10 && < 0.11 - , tasty-th >= 0.1 && < 0.2 - , tasty-quickcheck >= 0.8 && < 0.9 + multiarg >= 0.30.0.0 + , QuickCheck >= 2.7 + , random >= 1.0.1.1 + , tasty >= 0.10 + , tasty-th >= 0.1 + , tasty-quickcheck >= 0.8 ghc-options: -Wall hs-source-dirs: lib build-depends: - base >= 4.7.0.0 && < 4.9 - , directory >= 1.1.0.2 && < 1.3 - , filepath >= 1.3.0.0 && < 1.5 - , time >= 1.4 && < 1.6 - , transformers >= 0.3.0.0 && < 0.5 + base >= 4.7.0.0 && < 5 + , directory >= 1.1.0.2 + , filepath >= 1.3.0.0 + , time >= 1.4 + , transformers >= 0.3.0.0 else buildable: False default-language: Haskell2010 @@ -93,28 +89,27 @@ default-language: Haskell2010 other-modules: Cartel.Generators - Decrees other-extensions: TemplateHaskell hs-source-dirs: tests build-depends: - multiarg >= 0.30.0.0 && < 0.31 - , QuickCheck >= 2.7 && < 2.9 - , random >= 1.0.1.1 && < 1.2 - , tasty >= 0.10 && < 0.11 - , tasty-th >= 0.1 && < 0.2 - , tasty-quickcheck >= 0.8 && < 0.9 + multiarg >= 0.30.0.0 + , QuickCheck >= 2.7 + , random >= 1.0.1.1 + , tasty >= 0.10 + , tasty-th >= 0.1 + , tasty-quickcheck >= 0.8 ghc-options: -Wall hs-source-dirs: lib build-depends: - base >= 4.7.0.0 && < 4.9 - , directory >= 1.1.0.2 && < 1.3 - , filepath >= 1.3.0.0 && < 1.5 - , time >= 1.4 && < 1.6 - , transformers >= 0.3.0.0 && < 0.5 + base >= 4.7.0.0 && < 5 + , directory >= 1.1.0.2 + , filepath >= 1.3.0.0 + , time >= 1.4 + , transformers >= 0.3.0.0 type: exitcode-stdio-1.0 main-is: cartel-properties.hs diff --git a/lib/Cartel/GenCartelCabal.hs b/lib/Cartel/GenCartelCabal.hs --- a/lib/Cartel/GenCartelCabal.hs +++ b/lib/Cartel/GenCartelCabal.hs @@ -10,38 +10,41 @@ -- Dependencies +atLeast :: NonEmptyString -> [Word] -> Package +atLeast name ver = package name (gtEq ver) + base :: Package -base = closedOpen "base" [4,7,0,0] [4,9] +base = closedOpen "base" [4,7,0,0] [5] directory :: Package -directory = closedOpen "directory" [1,1,0,2] [1,3] +directory = atLeast "directory" [1,1,0,2] filepath :: Package -filepath = closedOpen "filepath" [1,3,0,0] [1,5] +filepath = atLeast "filepath" [1,3,0,0] time :: Package -time = closedOpen "time" [1,4] [1,6] +time = atLeast "time" [1,4] quickcheck :: Package -quickcheck = closedOpen "QuickCheck" [2,7] [2,9] +quickcheck = atLeast "QuickCheck" [2,7] tasty :: Package -tasty = nextBreaking "tasty" [0,10] +tasty = atLeast "tasty" [0,10] tastyQuickcheck :: Package -tastyQuickcheck = nextBreaking "tasty-quickcheck" [0,8] +tastyQuickcheck = atLeast "tasty-quickcheck" [0,8] tastyTh :: Package -tastyTh = nextBreaking "tasty-th" [0,1] +tastyTh = atLeast "tasty-th" [0,1] random :: Package -random = closedOpen "random" [1,0,1,1] [1,2] +random = atLeast "random" [1,0,1,1] transformers :: Package -transformers = closedOpen "transformers" [0,3,0,0] [0,5] +transformers = atLeast "transformers" [0,3,0,0] multiarg :: Package -multiarg = nextBreaking "multiarg" [0,30,0,0] +multiarg = atLeast "multiarg" [0,30,0,0] libDepends :: [Package] libDepends = @@ -97,8 +100,6 @@ , cabalVersion = Just (1,18) , homepage = "http://www.github.com/massysett/cartel" , bugReports = "http://www.github.com/massysett/cartel/issues" - , testedWith = let f v = (ghc, eq v) - in map f [[7,8,2], [7,10,1]] , extraSourceFiles = ["README.md"] } , exposedModules libModules : haskell2010 : commonOptions diff --git a/lib/Cartel/Version.hs b/lib/Cartel/Version.hs --- a/lib/Cartel/Version.hs +++ b/lib/Cartel/Version.hs @@ -11,4 +11,4 @@ import Data.Word version :: [Word] -version = [0,14,2,6] +version = [0,14,2,8] diff --git a/tests/Decrees.hs b/tests/Decrees.hs deleted file mode 100644 --- a/tests/Decrees.hs +++ /dev/null @@ -1,26 +0,0 @@ --- | This module generated by the Quickpull package. --- Quickpull is available at: --- - -module Decrees where - -import Quickpull -import qualified Cartel.Properties - -decrees :: [Decree] -decrees = - - [ Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 41, qName = "prop_vcsCompletesInSecs"} ) ( Single Cartel.Properties.prop_vcsCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 43, qName = "prop_constraintCompletesInSecs"} ) ( Single Cartel.Properties.prop_constraintCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 48, qName = "prop_conditionCompletesInSecs"} ) ( Single Cartel.Properties.prop_conditionCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 55, qName = "prop_buildInfoExeCompletesInSecs"} ) ( Single Cartel.Properties.prop_buildInfoExeCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 58, qName = "prop_condBlockExeCompletesInSecs"} ) ( Single Cartel.Properties.prop_condBlockExeCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 61, qName = "prop_exeMainIsCompletesInSecs"} ) ( Single Cartel.Properties.prop_exeMainIsCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 64, qName = "prop_cabalCompletesInSecs"} ) ( Single Cartel.Properties.prop_cabalCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 67, qName = "prop_propertiesCompletesInSecs"} ) ( Single Cartel.Properties.prop_propertiesCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 70, qName = "prop_repositoryCompletesInSecs"} ) ( Single Cartel.Properties.prop_repositoryCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 73, qName = "prop_sectionCompletesInSecs"} ) ( Single Cartel.Properties.prop_sectionCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 76, qName = "prop_executableCompletesInSecs"} ) ( Single Cartel.Properties.prop_executableCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 79, qName = "prop_benchmarkCompletesInSecs"} ) ( Single Cartel.Properties.prop_benchmarkCompletesInSecs ) - , Decree ( Meta {modDesc = ModDesc {modPath = "tests/Cartel/Properties.hs", modName = ["Cartel","Properties"]}, linenum = 82, qName = "prop_testSuiteCompletesInSecs"} ) ( Single Cartel.Properties.prop_testSuiteCompletesInSecs ) - ]