diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +2.4.0 +----- +* Support Cabal 3.12 +* Tested with ghc 9.4.7 + 2.3.0 ----- * Support Cabal 3.0 diff --git a/cabal-bounds.cabal b/cabal-bounds.cabal --- a/cabal-bounds.cabal +++ b/cabal-bounds.cabal @@ -1,13 +1,13 @@ cabal-version: >=1.10.0 name: cabal-bounds -version: 2.3.0 +version: 2.4.0 license: BSD3 license-file: LICENSE maintainer: daniel.trstenjak@gmail.com author: Daniel Trstenjak tested-with: ghc ==7.6.2 ghc ==7.6.3 ghc ==7.8.3 ghc ==7.10.1 ghc ==8.0.1 - ghc ==8.2.1 ghc ==8.4.2 ghc ==8.6.3 ghc ==8.10.1 + ghc ==8.2.1 ghc ==8.4.2 ghc ==8.6.3 ghc ==8.10.1 ghc ==9.4.7 synopsis: A command line program for managing the dependency versions in a cabal file. @@ -97,7 +97,7 @@ unordered-containers >=0.2.3.3 && <0.3, transformers >=0.3.0.0 && <0.6, cabal-lenses >=0.8.0 && <1.0, - Cabal >=3.0.0.0 && <4.0, + Cabal >=3.12 && <4.0, filepath >=1.3 && <1.5, directory >=1.2 && <1.4, aeson >=1.2.3.0 && <1.6, diff --git a/lib/CabalBounds/Update.hs b/lib/CabalBounds/Update.hs --- a/lib/CabalBounds/Update.hs +++ b/lib/CabalBounds/Update.hs @@ -7,6 +7,7 @@ import qualified Distribution.PackageDescription as D import qualified Distribution.Package as P import qualified Distribution.Version as V +import qualified Distribution.Types.VersionInterval as VI import Control.Lens import CabalBounds.Bound (UpdateBound(..)) import CabalBounds.Dependencies (Dependencies(..), filterDependency, dependencyIf) @@ -43,7 +44,7 @@ lowerVersion <- HM.lookup pkgName_ libs let newLowerVersion = comp `compOf` lowerVersion newLowerBound = V.LowerBound newLowerVersion V.InclusiveBound - newIntervals = (versionRange_ ^. CL.intervals) & _head . CL.lowerBound %~ updateIf (>) newLowerBound + newIntervals = (versionRange_ ^. CL.intervals) & _head . CL.lowerBound %~ updateIfLower newLowerBound vrange = mkVersionRange newIntervals return $ dep & CL.versionRange .~ vrange where @@ -51,14 +52,16 @@ versionRange_ = dep ^. CL.versionRange lowerBound_ = fromMaybe CL.noLowerBound $ versionRange_ ^? CL.intervals . _head . CL.lowerBound - updateIf f newBound oldBound + updateIfLower newBound oldBound | oldBound /= CL.noLowerBound - = if f oldBound newBound + = if (version newBound) < (version oldBound) then newBound else oldBound | otherwise = newBound + where + version (V.LowerBound vers _) = vers updateDependency (UpdateUpper comp ifMissing) libs dep = @@ -69,7 +72,7 @@ upperVersion <- HM.lookup pkgName_ libs let newUpperVersion = nextVersion comp upperVersion newUpperBound = V.UpperBound newUpperVersion V.ExclusiveBound - newIntervals = (versionRange_ ^. CL.intervals) & _last . CL.upperBound %~ updateIf (<) newUpperBound + newIntervals = (versionRange_ ^. CL.intervals) & _last . CL.upperBound %~ updateIfGreater newUpperBound vrange = mkVersionRange newIntervals return $ dep & CL.versionRange .~ vrange where @@ -77,14 +80,16 @@ pkgName_ = dep ^. CL.packageName . _Wrapped upperBound_ = fromMaybe V.NoUpperBound $ versionRange_ ^? CL.intervals . _last . CL.upperBound - updateIf f newBound oldBound + updateIfGreater newBound oldBound | oldBound /= V.NoUpperBound - = if f oldBound newBound + = if (version newBound) > (version oldBound) then newBound else oldBound | otherwise = newBound + where + version (V.UpperBound vers _) = vers updateDependency (UpdateBoth lowerComp upperComp ifMissing) libs dep = @@ -125,4 +130,4 @@ mkVersionRange :: [V.VersionInterval] -> V.VersionRange mkVersionRange [] = V.anyVersion -mkVersionRange vis = V.fromVersionIntervals . V.mkVersionIntervals $ vis +mkVersionRange vis = fromMaybe V.noVersion (V.fromVersionIntervals <$> VI.mkVersionIntervals vis) diff --git a/tests/goldenFiles/DropBothIgnoreA.cabal b/tests/goldenFiles/DropBothIgnoreA.cabal --- a/tests/goldenFiles/DropBothIgnoreA.cabal +++ b/tests/goldenFiles/DropBothIgnoreA.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -18,9 +18,9 @@ build-depends: base >=3, A >=0.1 && <0.2, - B -any, - C -any, - D -any + B, + C, + D executable cabal-bounds main-is: ExeMain1.hs @@ -37,9 +37,9 @@ build-depends: base >=3, A >=0.1 && <0.2, - B -any, - C -any, - D -any + B, + C, + D executable other-exe main-is: ExeMain2.hs @@ -56,9 +56,9 @@ build-depends: base >=3, A >=0.1 && <0.2, - B -any, - C -any, - D -any + B, + C, + D test-suite some-test type: exitcode-stdio-1.0 @@ -75,9 +75,9 @@ build-depends: base >=3, A >=0.1 && <0.2, - B -any, - C -any, - D -any + B, + C, + D test-suite other-test type: exitcode-stdio-1.0 @@ -94,6 +94,6 @@ build-depends: base >=3, A >=0.1 && <0.2, - B -any, - C -any, - D -any + B, + C, + D diff --git a/tests/goldenFiles/DropBothOfAll.cabal b/tests/goldenFiles/DropBothOfAll.cabal --- a/tests/goldenFiles/DropBothOfAll.cabal +++ b/tests/goldenFiles/DropBothOfAll.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -17,10 +17,10 @@ other-modules: Paths_setup_config build-depends: base >=3, - A -any, - B -any, - C -any, - D -any + A, + B, + C, + D executable cabal-bounds main-is: ExeMain1.hs @@ -36,10 +36,10 @@ ghc-options: -W build-depends: base >=3, - A -any, - B -any, - C -any, - D -any + A, + B, + C, + D executable other-exe main-is: ExeMain2.hs @@ -55,10 +55,10 @@ ghc-options: -W build-depends: base >=3, - A -any, - B -any, - C -any, - D -any + A, + B, + C, + D test-suite some-test type: exitcode-stdio-1.0 @@ -74,10 +74,10 @@ ghc-options: -W build-depends: base >=3, - A -any, - B -any, - C -any, - D -any + A, + B, + C, + D test-suite other-test type: exitcode-stdio-1.0 @@ -93,7 +93,7 @@ ghc-options: -W build-depends: base >=3, - A -any, - B -any, - C -any, - D -any + A, + B, + C, + D diff --git a/tests/goldenFiles/DropBothOfAllExes.cabal b/tests/goldenFiles/DropBothOfAllExes.cabal --- a/tests/goldenFiles/DropBothOfAllExes.cabal +++ b/tests/goldenFiles/DropBothOfAllExes.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -36,10 +36,10 @@ ghc-options: -W build-depends: base >=3, - A -any, - B -any, - C -any, - D -any + A, + B, + C, + D executable other-exe main-is: ExeMain2.hs @@ -55,10 +55,10 @@ ghc-options: -W build-depends: base >=3, - A -any, - B -any, - C -any, - D -any + A, + B, + C, + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/DropBothOfExe.cabal b/tests/goldenFiles/DropBothOfExe.cabal --- a/tests/goldenFiles/DropBothOfExe.cabal +++ b/tests/goldenFiles/DropBothOfExe.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -36,10 +36,10 @@ ghc-options: -W build-depends: base >=3, - A -any, - B -any, - C -any, - D -any + A, + B, + C, + D executable other-exe main-is: ExeMain2.hs @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/DropBothOfLib.cabal b/tests/goldenFiles/DropBothOfLib.cabal --- a/tests/goldenFiles/DropBothOfLib.cabal +++ b/tests/goldenFiles/DropBothOfLib.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -17,10 +17,10 @@ other-modules: Paths_setup_config build-depends: base >=3, - A -any, - B -any, - C -any, - D -any + A, + B, + C, + D executable cabal-bounds main-is: ExeMain1.hs @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/DropBothOfOtherExe.cabal b/tests/goldenFiles/DropBothOfOtherExe.cabal --- a/tests/goldenFiles/DropBothOfOtherExe.cabal +++ b/tests/goldenFiles/DropBothOfOtherExe.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -55,10 +55,10 @@ ghc-options: -W build-depends: base >=3, - A -any, - B -any, - C -any, - D -any + A, + B, + C, + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/DropBothOfTest.cabal b/tests/goldenFiles/DropBothOfTest.cabal --- a/tests/goldenFiles/DropBothOfTest.cabal +++ b/tests/goldenFiles/DropBothOfTest.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -74,10 +74,10 @@ ghc-options: -W build-depends: base >=3, - A -any, - B -any, - C -any, - D -any + A, + B, + C, + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/DropBothOnlyBase.cabal b/tests/goldenFiles/DropBothOnlyBase.cabal --- a/tests/goldenFiles/DropBothOnlyBase.cabal +++ b/tests/goldenFiles/DropBothOnlyBase.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -16,7 +16,7 @@ hs-source-dirs: src other-modules: Paths_setup_config build-depends: - base -any, + base, A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, @@ -35,7 +35,7 @@ ghc-options: -W build-depends: - base -any, + base, A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, @@ -54,11 +54,11 @@ ghc-options: -W build-depends: - base -any, + base, A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -73,11 +73,11 @@ ghc-options: -W build-depends: - base -any, + base, A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 @@ -92,7 +92,7 @@ ghc-options: -W build-depends: - base -any, + base, A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, diff --git a/tests/goldenFiles/DropUpperIgnoreA.cabal b/tests/goldenFiles/DropUpperIgnoreA.cabal --- a/tests/goldenFiles/DropUpperIgnoreA.cabal +++ b/tests/goldenFiles/DropUpperIgnoreA.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -39,7 +39,7 @@ A >=0.1 && <0.2, B >=0.2, C >=0.3, - D -any + D executable other-exe main-is: ExeMain2.hs @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2, C >=0.3, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2, C >=0.3, - D -any + D test-suite other-test type: exitcode-stdio-1.0 @@ -96,4 +96,4 @@ A >=0.1 && <0.2, B >=0.2, C >=0.3, - D -any + D diff --git a/tests/goldenFiles/DropUpperOfAll.cabal b/tests/goldenFiles/DropUpperOfAll.cabal --- a/tests/goldenFiles/DropUpperOfAll.cabal +++ b/tests/goldenFiles/DropUpperOfAll.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -39,7 +39,7 @@ A >=0.1, B >=0.2, C >=0.3, - D -any + D executable other-exe main-is: ExeMain2.hs @@ -58,7 +58,7 @@ A >=0.1, B >=0.2, C >=0.3, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1, B >=0.2, C >=0.3, - D -any + D test-suite other-test type: exitcode-stdio-1.0 @@ -96,4 +96,4 @@ A >=0.1, B >=0.2, C >=0.3, - D -any + D diff --git a/tests/goldenFiles/DropUpperOfAllExes.cabal b/tests/goldenFiles/DropUpperOfAllExes.cabal --- a/tests/goldenFiles/DropUpperOfAllExes.cabal +++ b/tests/goldenFiles/DropUpperOfAllExes.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -39,7 +39,7 @@ A >=0.1, B >=0.2, C >=0.3, - D -any + D executable other-exe main-is: ExeMain2.hs @@ -58,7 +58,7 @@ A >=0.1, B >=0.2, C >=0.3, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/DropUpperOfExe.cabal b/tests/goldenFiles/DropUpperOfExe.cabal --- a/tests/goldenFiles/DropUpperOfExe.cabal +++ b/tests/goldenFiles/DropUpperOfExe.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -39,7 +39,7 @@ A >=0.1, B >=0.2, C >=0.3, - D -any + D executable other-exe main-is: ExeMain2.hs @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/DropUpperOfLib.cabal b/tests/goldenFiles/DropUpperOfLib.cabal --- a/tests/goldenFiles/DropUpperOfLib.cabal +++ b/tests/goldenFiles/DropUpperOfLib.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/DropUpperOfOtherExe.cabal b/tests/goldenFiles/DropUpperOfOtherExe.cabal --- a/tests/goldenFiles/DropUpperOfOtherExe.cabal +++ b/tests/goldenFiles/DropUpperOfOtherExe.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1, B >=0.2, C >=0.3, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/DropUpperOfTest.cabal b/tests/goldenFiles/DropUpperOfTest.cabal --- a/tests/goldenFiles/DropUpperOfTest.cabal +++ b/tests/goldenFiles/DropUpperOfTest.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1, B >=0.2, C >=0.3, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/DropUpperOnlyBase.cabal b/tests/goldenFiles/DropUpperOnlyBase.cabal --- a/tests/goldenFiles/DropUpperOnlyBase.cabal +++ b/tests/goldenFiles/DropUpperOnlyBase.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/Format.cabal b/tests/goldenFiles/Format.cabal --- a/tests/goldenFiles/Format.cabal +++ b/tests/goldenFiles/Format.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateBothIgnoreA.cabal b/tests/goldenFiles/UpdateBothIgnoreA.cabal --- a/tests/goldenFiles/UpdateBothIgnoreA.cabal +++ b/tests/goldenFiles/UpdateBothIgnoreA.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense diff --git a/tests/goldenFiles/UpdateBothOfAll.cabal b/tests/goldenFiles/UpdateBothOfAll.cabal --- a/tests/goldenFiles/UpdateBothOfAll.cabal +++ b/tests/goldenFiles/UpdateBothOfAll.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense diff --git a/tests/goldenFiles/UpdateBothOfAllExes.cabal b/tests/goldenFiles/UpdateBothOfAllExes.cabal --- a/tests/goldenFiles/UpdateBothOfAllExes.cabal +++ b/tests/goldenFiles/UpdateBothOfAllExes.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateBothOfExe.cabal b/tests/goldenFiles/UpdateBothOfExe.cabal --- a/tests/goldenFiles/UpdateBothOfExe.cabal +++ b/tests/goldenFiles/UpdateBothOfExe.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateBothOfLibrary.cabal b/tests/goldenFiles/UpdateBothOfLibrary.cabal --- a/tests/goldenFiles/UpdateBothOfLibrary.cabal +++ b/tests/goldenFiles/UpdateBothOfLibrary.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateBothOfOtherExe.cabal b/tests/goldenFiles/UpdateBothOfOtherExe.cabal --- a/tests/goldenFiles/UpdateBothOfOtherExe.cabal +++ b/tests/goldenFiles/UpdateBothOfOtherExe.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateBothOfTest.cabal b/tests/goldenFiles/UpdateBothOfTest.cabal --- a/tests/goldenFiles/UpdateBothOfTest.cabal +++ b/tests/goldenFiles/UpdateBothOfTest.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateByHaskellPlatform.cabal b/tests/goldenFiles/UpdateByHaskellPlatform.cabal --- a/tests/goldenFiles/UpdateByHaskellPlatform.cabal +++ b/tests/goldenFiles/UpdateByHaskellPlatform.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense diff --git a/tests/goldenFiles/UpdateLowerOfAll.cabal b/tests/goldenFiles/UpdateLowerOfAll.cabal --- a/tests/goldenFiles/UpdateLowerOfAll.cabal +++ b/tests/goldenFiles/UpdateLowerOfAll.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -17,8 +17,8 @@ other-modules: Paths_setup_config build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.7 @@ -36,8 +36,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 && <0.9 @@ -55,8 +55,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 @@ -74,8 +74,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 @@ -93,7 +93,7 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 && <1.0 diff --git a/tests/goldenFiles/UpdateLowerOfAllExes.cabal b/tests/goldenFiles/UpdateLowerOfAllExes.cabal --- a/tests/goldenFiles/UpdateLowerOfAllExes.cabal +++ b/tests/goldenFiles/UpdateLowerOfAllExes.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -36,8 +36,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 && <0.9 @@ -55,8 +55,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateLowerOfExe.cabal b/tests/goldenFiles/UpdateLowerOfExe.cabal --- a/tests/goldenFiles/UpdateLowerOfExe.cabal +++ b/tests/goldenFiles/UpdateLowerOfExe.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -36,8 +36,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 && <0.9 @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateLowerOfLibrary.cabal b/tests/goldenFiles/UpdateLowerOfLibrary.cabal --- a/tests/goldenFiles/UpdateLowerOfLibrary.cabal +++ b/tests/goldenFiles/UpdateLowerOfLibrary.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -17,8 +17,8 @@ other-modules: Paths_setup_config build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.7 @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateLowerOfOtherExe.cabal b/tests/goldenFiles/UpdateLowerOfOtherExe.cabal --- a/tests/goldenFiles/UpdateLowerOfOtherExe.cabal +++ b/tests/goldenFiles/UpdateLowerOfOtherExe.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -55,8 +55,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateLowerOfTest.cabal b/tests/goldenFiles/UpdateLowerOfTest.cabal --- a/tests/goldenFiles/UpdateLowerOfTest.cabal +++ b/tests/goldenFiles/UpdateLowerOfTest.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -74,8 +74,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 diff --git a/tests/goldenFiles/UpdateMajor1Lower.cabal b/tests/goldenFiles/UpdateMajor1Lower.cabal --- a/tests/goldenFiles/UpdateMajor1Lower.cabal +++ b/tests/goldenFiles/UpdateMajor1Lower.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -20,7 +20,7 @@ A <0.2, B <0.3, C <0.4, - D -any + D executable cabal-bounds main-is: ExeMain1.hs @@ -58,7 +58,7 @@ A <0.2, B <0.3, C <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A <0.2, B <0.3, C <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateMajor1LowerAndUpper.cabal b/tests/goldenFiles/UpdateMajor1LowerAndUpper.cabal --- a/tests/goldenFiles/UpdateMajor1LowerAndUpper.cabal +++ b/tests/goldenFiles/UpdateMajor1LowerAndUpper.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -17,10 +17,10 @@ other-modules: Paths_setup_config build-depends: base >=3, - A ==0.*, - B ==0.*, - C ==0.*, - D ==0.* + A <1, + B <1, + C <1, + D <1 executable cabal-bounds main-is: ExeMain1.hs @@ -36,10 +36,10 @@ ghc-options: -W build-depends: base >=3, - A ==0.*, - B ==0.*, - C ==0.*, - D ==0.* + A <1, + B <1, + C <1, + D <1 executable other-exe main-is: ExeMain2.hs @@ -55,10 +55,10 @@ ghc-options: -W build-depends: base >=3, - A ==0.*, - B ==0.*, - C ==0.*, - D ==0.* + A <1, + B <1, + C <1, + D <1 test-suite some-test type: exitcode-stdio-1.0 @@ -74,10 +74,10 @@ ghc-options: -W build-depends: base >=3, - A ==0.*, - B ==0.*, - C ==0.*, - D ==0.* + A <1, + B <1, + C <1, + D <1 test-suite other-test type: exitcode-stdio-1.0 @@ -93,7 +93,7 @@ ghc-options: -W build-depends: base >=3, - A ==0.*, - B ==0.*, - C ==0.*, + A <1, + B <1, + C <1, D <1.0 diff --git a/tests/goldenFiles/UpdateMajor1Upper.cabal b/tests/goldenFiles/UpdateMajor1Upper.cabal --- a/tests/goldenFiles/UpdateMajor1Upper.cabal +++ b/tests/goldenFiles/UpdateMajor1Upper.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -39,7 +39,7 @@ A >=0.1 && <1, B >=0.2 && <1, C >=0.3 && <1, - D ==0.* + D <1 executable other-exe main-is: ExeMain2.hs @@ -58,7 +58,7 @@ A >=0.1 && <1, B >=0.2 && <1, C >=0.3 && <1, - D ==0.* + D <1 test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <1, B >=0.2 && <1, C >=0.3 && <1, - D ==0.* + D <1 test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateMajor2Lower.cabal b/tests/goldenFiles/UpdateMajor2Lower.cabal --- a/tests/goldenFiles/UpdateMajor2Lower.cabal +++ b/tests/goldenFiles/UpdateMajor2Lower.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -17,8 +17,8 @@ other-modules: Paths_setup_config build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2 && <0.4, D >=0.7 @@ -36,10 +36,10 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2 && <0.4, - D ==0.8.* + D >=0.8 && <0.9 executable other-exe main-is: ExeMain2.hs @@ -55,8 +55,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2 && <0.4, D >=0.8 @@ -74,8 +74,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2 && <0.4, D >=0.8 @@ -93,7 +93,7 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2 && <0.4, D >=0.8 && <1.0 diff --git a/tests/goldenFiles/UpdateMajor2Upper.cabal b/tests/goldenFiles/UpdateMajor2Upper.cabal --- a/tests/goldenFiles/UpdateMajor2Upper.cabal +++ b/tests/goldenFiles/UpdateMajor2Upper.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -19,7 +19,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D >=0.7 && <0.9 executable cabal-bounds @@ -38,7 +38,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 executable other-exe @@ -57,7 +57,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 test-suite some-test @@ -76,7 +76,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 test-suite other-test @@ -95,5 +95,5 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <1.0 diff --git a/tests/goldenFiles/UpdateMinorLower.cabal b/tests/goldenFiles/UpdateMinorLower.cabal --- a/tests/goldenFiles/UpdateMinorLower.cabal +++ b/tests/goldenFiles/UpdateMinorLower.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -17,8 +17,8 @@ other-modules: Paths_setup_config build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.7 @@ -36,8 +36,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 && <0.9 @@ -55,8 +55,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 @@ -74,8 +74,8 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 @@ -93,7 +93,7 @@ ghc-options: -W build-depends: base >=3, - A ==0.1.*, - B ==0.2.*, + A >=0.1 && <0.2, + B >=0.2 && <0.3, C >=0.2.5 && <0.4, D >=0.8.2 && <1.0 diff --git a/tests/goldenFiles/UpdateMinorLowerAndUpper.cabal b/tests/goldenFiles/UpdateMinorLowerAndUpper.cabal --- a/tests/goldenFiles/UpdateMinorLowerAndUpper.cabal +++ b/tests/goldenFiles/UpdateMinorLowerAndUpper.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <0.3.1, B >=0.2 && <0.3.0.2, C >=0.2.5 && <0.4, - D ==0.8.2.* + D >=0.8.2 && <0.8.3 test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.3.1, B >=0.2 && <0.3.0.2, C >=0.2.5 && <0.4, - D ==0.8.2.* + D >=0.8.2 && <0.8.3 test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateMinorUpper.cabal b/tests/goldenFiles/UpdateMinorUpper.cabal --- a/tests/goldenFiles/UpdateMinorUpper.cabal +++ b/tests/goldenFiles/UpdateMinorUpper.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -19,7 +19,7 @@ base >=3, A >=0.1 && <0.3.1, B >=0.2 && <0.3.0.2, - C ==0.3.*, + C >=0.3 && <0.4, D >=0.7 && <0.8.3 executable cabal-bounds @@ -38,7 +38,7 @@ base >=3, A >=0.1 && <0.3.1, B >=0.2 && <0.3.0.2, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 executable other-exe @@ -57,7 +57,7 @@ base >=3, A >=0.1 && <0.3.1, B >=0.2 && <0.3.0.2, - C ==0.3.*, + C >=0.3 && <0.4, D <0.8.3 test-suite some-test @@ -76,7 +76,7 @@ base >=3, A >=0.1 && <0.3.1, B >=0.2 && <0.3.0.2, - C ==0.3.*, + C >=0.3 && <0.4, D <0.8.3 test-suite other-test @@ -95,5 +95,5 @@ base >=3, A >=0.1 && <0.3.1, B >=0.2 && <0.3.0.2, - C ==0.3.*, + C >=0.3 && <0.4, D <1.0 diff --git a/tests/goldenFiles/UpdateOnlyMissing.cabal b/tests/goldenFiles/UpdateOnlyMissing.cabal --- a/tests/goldenFiles/UpdateOnlyMissing.cabal +++ b/tests/goldenFiles/UpdateOnlyMissing.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense diff --git a/tests/goldenFiles/UpdateUpperFromFile.cabal b/tests/goldenFiles/UpdateUpperFromFile.cabal --- a/tests/goldenFiles/UpdateUpperFromFile.cabal +++ b/tests/goldenFiles/UpdateUpperFromFile.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <2.3, B >=0.2 && <0.3, C >=0.3 && <0.6, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <2.3, B >=0.2 && <0.3, C >=0.3 && <0.6, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateUpperOfAll.cabal b/tests/goldenFiles/UpdateUpperOfAll.cabal --- a/tests/goldenFiles/UpdateUpperOfAll.cabal +++ b/tests/goldenFiles/UpdateUpperOfAll.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -19,7 +19,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D >=0.7 && <0.9 executable cabal-bounds @@ -38,7 +38,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 executable other-exe @@ -57,7 +57,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 test-suite some-test @@ -76,7 +76,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 test-suite other-test @@ -95,5 +95,5 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <1.0 diff --git a/tests/goldenFiles/UpdateUpperOfAllExes.cabal b/tests/goldenFiles/UpdateUpperOfAllExes.cabal --- a/tests/goldenFiles/UpdateUpperOfAllExes.cabal +++ b/tests/goldenFiles/UpdateUpperOfAllExes.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -38,7 +38,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 executable other-exe @@ -57,7 +57,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 test-suite some-test @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateUpperOfExe.cabal b/tests/goldenFiles/UpdateUpperOfExe.cabal --- a/tests/goldenFiles/UpdateUpperOfExe.cabal +++ b/tests/goldenFiles/UpdateUpperOfExe.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -38,7 +38,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 executable other-exe @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateUpperOfLibrary.cabal b/tests/goldenFiles/UpdateUpperOfLibrary.cabal --- a/tests/goldenFiles/UpdateUpperOfLibrary.cabal +++ b/tests/goldenFiles/UpdateUpperOfLibrary.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -19,7 +19,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D >=0.7 && <0.9 executable cabal-bounds @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateUpperOfOtherExe.cabal b/tests/goldenFiles/UpdateUpperOfOtherExe.cabal --- a/tests/goldenFiles/UpdateUpperOfOtherExe.cabal +++ b/tests/goldenFiles/UpdateUpperOfOtherExe.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -57,7 +57,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 test-suite some-test @@ -77,7 +77,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite other-test type: exitcode-stdio-1.0 diff --git a/tests/goldenFiles/UpdateUpperOfTest.cabal b/tests/goldenFiles/UpdateUpperOfTest.cabal --- a/tests/goldenFiles/UpdateUpperOfTest.cabal +++ b/tests/goldenFiles/UpdateUpperOfTest.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.9.2 +cabal-version: >=1.10 name: setup-config version: 0.1 license: UnspecifiedLicense @@ -58,7 +58,7 @@ A >=0.1 && <0.2, B >=0.2 && <0.3, C >=0.3 && <0.4, - D -any + D test-suite some-test type: exitcode-stdio-1.0 @@ -76,7 +76,7 @@ base >=3, A >=0.1 && <0.4, B >=0.2 && <0.4, - C ==0.3.*, + C >=0.3 && <0.4, D <0.9 test-suite other-test