diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +0.9.5 +----- +* Support Haskell Platform 7.10.2 +* Raise upper bounds of dependencies + 0.9.4 ----- * Fix misbehaving argument handling of 'dump' command diff --git a/cabal-bounds.cabal b/cabal-bounds.cabal --- a/cabal-bounds.cabal +++ b/cabal-bounds.cabal @@ -1,5 +1,5 @@ name: cabal-bounds -version: 0.9.4 +version: 0.9.5 cabal-version: >=1.9.2 build-type: Simple license: BSD3 @@ -65,6 +65,10 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Main + CabalBounds.VersionComp build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -72,13 +76,9 @@ strict >=0.3.2 && <0.4, unordered-containers >=0.2.3.3 && <0.3, transformers >=0.3.0.0 && <0.5, - either >=4.1.1 && <4.4, + either >=4.1.1 && <4.5, cabal-lenses >=0.4.4 && <0.5, Cabal >=1.18.0 && <1.23 - exposed-modules: - CabalBounds.Args - CabalBounds.Main - CabalBounds.VersionComp cpp-options: -DCABAL hs-source-dirs: lib other-modules: @@ -93,24 +93,24 @@ ghc-options: -W executable cabal-bounds + main-is: Main.hs build-depends: base >=3 && <5, cabal-bounds -any - main-is: Main.hs hs-source-dirs: exe ghc-options: -W test-suite cabal-bounds-tests + type: exitcode-stdio-1.0 + main-is: Main.hs build-depends: base >=3 && <5, tasty >=0.9.0.1 && <0.11, - tasty-golden >=2.2.0.2 && <2.3, + tasty-golden >=2.2.0.2 && <2.4, process >=1.1.0.2 && <1.3, - filepath >=1.3.0.1 && <1.5, + filepath >=1.3.0.1 && <1.4, directory >=1.0.0.0 && <1.3, Glob ==0.7.*, cabal-bounds -any - type: exitcode-stdio-1.0 - main-is: Main.hs hs-source-dirs: tests ghc-options: -W diff --git a/lib/CabalBounds/HaskellPlatform.hs b/lib/CabalBounds/HaskellPlatform.hs --- a/lib/CabalBounds/HaskellPlatform.hs +++ b/lib/CabalBounds/HaskellPlatform.hs @@ -48,6 +48,7 @@ , ("2012.4.0.0", libs_2012_4_0_0) , ("2013.2.0.0", libs_2013_2_0_0) , ("2014.2.0.0", libs_2014_2_0_0) + , ("7.10.2" , libs_7_10_2) ] @@ -435,6 +436,67 @@ , lib "vector" [0,10,9,1] , lib "xhtml" [3000,2,1] , lib "zlib" [0,5,4,1] + ] + + +libs_7_10_2 = + [ lib "array" [0,5,1,0] + , lib "base" [4,8,1,0] + , lib "bytestring" [0,10,6,0] + , lib "Cabal" [1,22,4,0] + , lib "containers" [0,5,6,2] + , lib "deepseq" [1,4,1,1] + , lib "directory" [1,2,2,0] + , lib "filepath" [1,4,0,0] + , lib "hpc" [0,6,0,2] + , lib "old-locale" [1,0,0,7] + , lib "old-time" [1,1,0,3] + , lib "pretty" [1,1,2,0] + , lib "process" [1,2,3,0] + , lib "template-haskell" [2,10,0,0] + , lib "time" [1,5,0,1] + , lib "transformers" [0,4,2,0] + , lib "unix" [2,7,1,0] + , lib "xhtml" [3000,2,1] + , lib "async" [2,0,2] + , lib "attoparsec" [0,13,0,1] + , lib "case-insensitive" [1,2,0,4] + , lib "cgi" [3001,2,2,2] + , lib "exceptions" [0,8,0,2] + , lib "fgl" [5,5,2,1] + , lib "GLURaw" [1,5,0,1] + , lib "GLUT" [2,7,0,1] + , lib "hashable" [1,2,3,3] + , lib "haskell-src" [1,0,2,0] + , lib "html" [1,0,1,2] + , lib "HTTP" [4000,2,20] + , lib "HUnit" [1,2,5,2] + , lib "mtl" [2,2,1] + , lib "multipart" [0,1,2] + , lib "network" [2,6,2,1] + , lib "network-uri" [2,6,0,3] + , lib "ObjectName" [1,1,0,0] + , lib "OpenGL" [2,12,0,1] + , lib "OpenGLRaw" [2,5,1,0] + , lib "parallel" [3,2,0,6] + , lib "parsec" [3,1,9] + , lib "primitive" [0,6] + , lib "QuickCheck" [2,8,1] + , lib "random" [1,1] + , lib "regex-base" [0,93,2] + , lib "regex-compat" [0,95,1] + , lib "regex-posix" [0,95,2] + , lib "scientific" [0,3,3,8] + , lib "split" [0,2,2] + , lib "StateVar" [1,1,0,0] + , lib "stm" [2,4,4] + , lib "syb" [0,5,1] + , lib "text" [1,2,1,3] + , lib "tf-random" [0,5] + , lib "transformers-compat" [0,4,0,4] + , lib "unordered-containers" [0,2,5,1] + , lib "vector" [0,11,0,0] + , lib "zlib" [0,5,4,2] ] diff --git a/tests/goldenFiles/DropBothIgnoreBase.cabal b/tests/goldenFiles/DropBothIgnoreBase.cabal --- a/tests/goldenFiles/DropBothIgnoreBase.cabal +++ b/tests/goldenFiles/DropBothIgnoreBase.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs -any, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs -any, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs -any, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs -any, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs -any, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfAll.cabal b/tests/goldenFiles/DropBothOfAll.cabal --- a/tests/goldenFiles/DropBothOfAll.cabal +++ b/tests/goldenFiles/DropBothOfAll.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base -any, cmdargs -any, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base -any, cmdargs -any, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base -any, cmdargs -any, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base -any, cmdargs -any, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base -any, cmdargs -any, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfAllExes.cabal b/tests/goldenFiles/DropBothOfAllExes.cabal --- a/tests/goldenFiles/DropBothOfAllExes.cabal +++ b/tests/goldenFiles/DropBothOfAllExes.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base -any, cmdargs -any, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base -any, cmdargs -any, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfExe.cabal b/tests/goldenFiles/DropBothOfExe.cabal --- a/tests/goldenFiles/DropBothOfExe.cabal +++ b/tests/goldenFiles/DropBothOfExe.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base -any, cmdargs -any, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfLib.cabal b/tests/goldenFiles/DropBothOfLib.cabal --- a/tests/goldenFiles/DropBothOfLib.cabal +++ b/tests/goldenFiles/DropBothOfLib.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base -any, cmdargs -any, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfOtherExe.cabal b/tests/goldenFiles/DropBothOfOtherExe.cabal --- a/tests/goldenFiles/DropBothOfOtherExe.cabal +++ b/tests/goldenFiles/DropBothOfOtherExe.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base -any, cmdargs -any, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfTest.cabal b/tests/goldenFiles/DropBothOfTest.cabal --- a/tests/goldenFiles/DropBothOfTest.cabal +++ b/tests/goldenFiles/DropBothOfTest.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base -any, cmdargs -any, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOnlyBase.cabal b/tests/goldenFiles/DropBothOnlyBase.cabal --- a/tests/goldenFiles/DropBothOnlyBase.cabal +++ b/tests/goldenFiles/DropBothOnlyBase.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base -any, cmdargs >=0.10.5 && <0.11, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base -any, cmdargs >=0.10.5 && <0.11, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base -any, cmdargs >=0.10.5 && <0.11, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base -any, cmdargs >=0.10.5 && <0.11, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base -any, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperIgnoreBase.cabal b/tests/goldenFiles/DropUpperIgnoreBase.cabal --- a/tests/goldenFiles/DropUpperIgnoreBase.cabal +++ b/tests/goldenFiles/DropUpperIgnoreBase.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfAll.cabal b/tests/goldenFiles/DropUpperOfAll.cabal --- a/tests/goldenFiles/DropUpperOfAll.cabal +++ b/tests/goldenFiles/DropUpperOfAll.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3, cmdargs >=0.10.5, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfAllExes.cabal b/tests/goldenFiles/DropUpperOfAllExes.cabal --- a/tests/goldenFiles/DropUpperOfAllExes.cabal +++ b/tests/goldenFiles/DropUpperOfAllExes.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfExe.cabal b/tests/goldenFiles/DropUpperOfExe.cabal --- a/tests/goldenFiles/DropUpperOfExe.cabal +++ b/tests/goldenFiles/DropUpperOfExe.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfLib.cabal b/tests/goldenFiles/DropUpperOfLib.cabal --- a/tests/goldenFiles/DropUpperOfLib.cabal +++ b/tests/goldenFiles/DropUpperOfLib.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3, cmdargs >=0.10.5, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfOtherExe.cabal b/tests/goldenFiles/DropUpperOfOtherExe.cabal --- a/tests/goldenFiles/DropUpperOfOtherExe.cabal +++ b/tests/goldenFiles/DropUpperOfOtherExe.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfTest.cabal b/tests/goldenFiles/DropUpperOfTest.cabal --- a/tests/goldenFiles/DropUpperOfTest.cabal +++ b/tests/goldenFiles/DropUpperOfTest.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOnlyBase.cabal b/tests/goldenFiles/DropUpperOnlyBase.cabal --- a/tests/goldenFiles/DropUpperOnlyBase.cabal +++ b/tests/goldenFiles/DropUpperOnlyBase.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3, cmdargs >=0.10.5 && <0.11, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3, cmdargs >=0.10.5 && <0.11, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3, cmdargs >=0.10.5 && <0.11, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3, cmdargs >=0.10.5 && <0.11, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/FromFile.cabal b/tests/goldenFiles/FromFile.cabal --- a/tests/goldenFiles/FromFile.cabal +++ b/tests/goldenFiles/FromFile.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <2.3, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal -any - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <2.3, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <2.3, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal -any - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <2.3, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <2.3, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal -any - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/UpdateByHaskellPlatform.cabal b/tests/goldenFiles/UpdateByHaskellPlatform.cabal --- a/tests/goldenFiles/UpdateByHaskellPlatform.cabal +++ b/tests/goldenFiles/UpdateByHaskellPlatform.cabal @@ -15,6 +15,11 @@ location: https://github.com/dan-t/cabal-bounds library + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.5 && <0.11, @@ -22,16 +27,12 @@ pretty-show -any, strict -any, Cabal >=1.16.0 && <1.17 - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds + main-is: ExeMain1.hs build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.5 && <0.11, @@ -39,7 +40,6 @@ pretty-show -any, strict -any, Cabal >=1.16.0 && <1.17 - main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,6 +51,7 @@ ghc-options: -W executable other-exe + main-is: ExeMain2.hs build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.5 && <0.11, @@ -58,7 +59,6 @@ pretty-show -any, strict -any, Cabal >=1.16.0 && <1.17 - main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,6 +70,8 @@ ghc-options: -W test-suite some-test + type: exitcode-stdio-1.0 + main-is: TestMain1.hs build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.5 && <0.11, @@ -77,8 +79,6 @@ pretty-show -any, strict -any, Cabal >=1.16.0 && <1.17 - type: exitcode-stdio-1.0 - main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,6 +88,8 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test + type: exitcode-stdio-1.0 + main-is: TestMain2.hs build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.5 && <0.11, @@ -95,8 +97,6 @@ pretty-show -any, strict -any, Cabal >=1.16.0 && <1.17 - type: exitcode-stdio-1.0 - main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds