diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,13 @@ +0.9.2 +----- +* fix bugs introduced with 0.9.1 + +0.9.1 +----- +* Updates for Cabal 1.22.1 +* Ensure that cabal files end with a newline +* Don't unnecessarly add '0' to lower bound versions + 0.9 --- * Updates for Cabal 1.22 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.1 +version: 0.9.2 cabal-version: >=1.9.2 build-type: Simple license: BSD3 diff --git a/lib/CabalBounds/Dependencies.hs b/lib/CabalBounds/Dependencies.hs --- a/lib/CabalBounds/Dependencies.hs +++ b/lib/CabalBounds/Dependencies.hs @@ -47,7 +47,7 @@ -- | A traversal for all 'Dependency' of all 'Section'. allDependency :: Traversal' GenericPackageDescription Dependency allDependency = -#if MIN_VERSION_Cabal(1,22,0) +#if MIN_VERSION_Cabal(1,22,1) CL.allBuildInfo . CL.targetBuildDependsL . traversed #else CL.allDependency @@ -57,8 +57,8 @@ -- | A traversal for the 'Dependency' of 'Section' that match 'CondVars'. dependencyIf :: CL.CondVars -> CL.Section -> Traversal' GenericPackageDescription Dependency dependencyIf condVars section = -#if MIN_VERSION_Cabal(1,22,0) +#if MIN_VERSION_Cabal(1,22,1) CL.buildInfoIf condVars section . CL.targetBuildDependsL . traversed #else - CL.dependencyIf + CL.dependencyIf condVars section #endif diff --git a/lib/CabalBounds/Update.hs b/lib/CabalBounds/Update.hs --- a/lib/CabalBounds/Update.hs +++ b/lib/CabalBounds/Update.hs @@ -56,8 +56,8 @@ then Nothing else do upperVersion <- HM.lookup pkgName_ libs - let newUpperVersion = comp `compOf` upperVersion - newUpperBound = V.UpperBound (nextVersion comp newUpperVersion) V.ExclusiveBound + let newUpperVersion = nextVersion comp upperVersion + newUpperBound = V.UpperBound newUpperVersion V.ExclusiveBound newIntervals = (versionRange_ ^. CL.intervals) & _last . CL.upperBound .~ newUpperBound vrange = fromMaybe (V.earlierVersion newUpperVersion) (mkVersionRange newIntervals) return $ dep & CL.versionRange .~ vrange @@ -86,8 +86,9 @@ nextVersion :: VersionComp -> V.Version -> V.Version nextVersion comp version = - version & CL.versionBranchL %~ ensureMinimalVersionBranch comp - & CL.versionBranchL . _last %~ (+ 1) + (comp `compOf` version) + & CL.versionBranchL %~ ensureMinimalVersionBranch comp + & CL.versionBranchL . _last %~ (+ 1) ensureMinimalVersionBranch :: VersionComp -> [Int] -> [Int] diff --git a/tests/goldenFiles/UpdateBothIgnoreBase.cabal b/tests/goldenFiles/UpdateBothIgnoreBase.cabal --- a/tests/goldenFiles/UpdateBothIgnoreBase.cabal +++ b/tests/goldenFiles/UpdateBothIgnoreBase.cabal @@ -18,7 +18,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -35,7 +35,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -54,7 +54,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -73,7 +73,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -91,7 +91,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 diff --git a/tests/goldenFiles/UpdateBothOfAll.cabal b/tests/goldenFiles/UpdateBothOfAll.cabal --- a/tests/goldenFiles/UpdateBothOfAll.cabal +++ b/tests/goldenFiles/UpdateBothOfAll.cabal @@ -18,7 +18,7 @@ build-depends: base >=4.7.0.1 && <4.8, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -35,7 +35,7 @@ build-depends: base >=4.7.0.1 && <4.8, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -54,7 +54,7 @@ build-depends: base >=4.7.0.1 && <4.8, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -73,7 +73,7 @@ build-depends: base >=4.7.0.1 && <4.8, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -91,7 +91,7 @@ build-depends: base >=4.7.0.1 && <4.8, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 diff --git a/tests/goldenFiles/UpdateBothOfAllExes.cabal b/tests/goldenFiles/UpdateBothOfAllExes.cabal --- a/tests/goldenFiles/UpdateBothOfAllExes.cabal +++ b/tests/goldenFiles/UpdateBothOfAllExes.cabal @@ -35,7 +35,7 @@ build-depends: base >=4.7.0.1 && <4.8, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -54,7 +54,7 @@ build-depends: base >=4.7.0.1 && <4.8, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 diff --git a/tests/goldenFiles/UpdateBothOfExe.cabal b/tests/goldenFiles/UpdateBothOfExe.cabal --- a/tests/goldenFiles/UpdateBothOfExe.cabal +++ b/tests/goldenFiles/UpdateBothOfExe.cabal @@ -35,7 +35,7 @@ build-depends: base >=4.7.0.1 && <4.8, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 diff --git a/tests/goldenFiles/UpdateBothOfLibrary.cabal b/tests/goldenFiles/UpdateBothOfLibrary.cabal --- a/tests/goldenFiles/UpdateBothOfLibrary.cabal +++ b/tests/goldenFiles/UpdateBothOfLibrary.cabal @@ -18,7 +18,7 @@ build-depends: base >=4.7.0.1 && <4.8, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 diff --git a/tests/goldenFiles/UpdateBothOfOtherExe.cabal b/tests/goldenFiles/UpdateBothOfOtherExe.cabal --- a/tests/goldenFiles/UpdateBothOfOtherExe.cabal +++ b/tests/goldenFiles/UpdateBothOfOtherExe.cabal @@ -54,7 +54,7 @@ build-depends: base >=4.7.0.1 && <4.8, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 diff --git a/tests/goldenFiles/UpdateBothOfTest.cabal b/tests/goldenFiles/UpdateBothOfTest.cabal --- a/tests/goldenFiles/UpdateBothOfTest.cabal +++ b/tests/goldenFiles/UpdateBothOfTest.cabal @@ -73,7 +73,7 @@ build-depends: base >=4.7.0.1 && <4.8, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 diff --git a/tests/goldenFiles/UpdateByHaskellPlatformAndSetupConfig.cabal b/tests/goldenFiles/UpdateByHaskellPlatformAndSetupConfig.cabal --- a/tests/goldenFiles/UpdateByHaskellPlatformAndSetupConfig.cabal +++ b/tests/goldenFiles/UpdateByHaskellPlatformAndSetupConfig.cabal @@ -18,7 +18,7 @@ build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.16.0 && <1.17 @@ -35,7 +35,7 @@ build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.16.0 && <1.17 @@ -54,7 +54,7 @@ build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.16.0 && <1.17 @@ -73,7 +73,7 @@ build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.16.0 && <1.17 @@ -91,7 +91,7 @@ build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.16.0 && <1.17 diff --git a/tests/goldenFiles/UpdateLowerIgnoreBase.cabal b/tests/goldenFiles/UpdateLowerIgnoreBase.cabal --- a/tests/goldenFiles/UpdateLowerIgnoreBase.cabal +++ b/tests/goldenFiles/UpdateLowerIgnoreBase.cabal @@ -18,7 +18,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -35,7 +35,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -54,7 +54,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -73,7 +73,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -91,7 +91,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 diff --git a/tests/goldenFiles/UpdateLowerOfAll.cabal b/tests/goldenFiles/UpdateLowerOfAll.cabal --- a/tests/goldenFiles/UpdateLowerOfAll.cabal +++ b/tests/goldenFiles/UpdateLowerOfAll.cabal @@ -18,7 +18,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -35,7 +35,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -54,7 +54,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -73,7 +73,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -91,7 +91,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 diff --git a/tests/goldenFiles/UpdateLowerOfAllExes.cabal b/tests/goldenFiles/UpdateLowerOfAllExes.cabal --- a/tests/goldenFiles/UpdateLowerOfAllExes.cabal +++ b/tests/goldenFiles/UpdateLowerOfAllExes.cabal @@ -35,7 +35,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -54,7 +54,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 diff --git a/tests/goldenFiles/UpdateLowerOfExe.cabal b/tests/goldenFiles/UpdateLowerOfExe.cabal --- a/tests/goldenFiles/UpdateLowerOfExe.cabal +++ b/tests/goldenFiles/UpdateLowerOfExe.cabal @@ -35,7 +35,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 diff --git a/tests/goldenFiles/UpdateLowerOfLibrary.cabal b/tests/goldenFiles/UpdateLowerOfLibrary.cabal --- a/tests/goldenFiles/UpdateLowerOfLibrary.cabal +++ b/tests/goldenFiles/UpdateLowerOfLibrary.cabal @@ -18,7 +18,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 diff --git a/tests/goldenFiles/UpdateLowerOfOtherExe.cabal b/tests/goldenFiles/UpdateLowerOfOtherExe.cabal --- a/tests/goldenFiles/UpdateLowerOfOtherExe.cabal +++ b/tests/goldenFiles/UpdateLowerOfOtherExe.cabal @@ -54,7 +54,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 diff --git a/tests/goldenFiles/UpdateLowerOfTest.cabal b/tests/goldenFiles/UpdateLowerOfTest.cabal --- a/tests/goldenFiles/UpdateLowerOfTest.cabal +++ b/tests/goldenFiles/UpdateLowerOfTest.cabal @@ -73,7 +73,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 diff --git a/tests/goldenFiles/UpdateMinorLower.cabal b/tests/goldenFiles/UpdateMinorLower.cabal --- a/tests/goldenFiles/UpdateMinorLower.cabal +++ b/tests/goldenFiles/UpdateMinorLower.cabal @@ -18,7 +18,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -35,7 +35,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -54,7 +54,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -73,7 +73,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 @@ -91,7 +91,7 @@ build-depends: base >=4.7.0.1 && <5, cmdargs >=0.10.7 && <0.11, - lens >=4.7.0, + lens >=4.7, pretty-show >=1.6.7, strict >=0.3.2, Cabal >=1.20.0.1 diff --git a/tests/goldenFiles/UpdateMinorLowerAndUpper.cabal b/tests/goldenFiles/UpdateMinorLowerAndUpper.cabal --- a/tests/goldenFiles/UpdateMinorLowerAndUpper.cabal +++ b/tests/goldenFiles/UpdateMinorLowerAndUpper.cabal @@ -18,7 +18,7 @@ build-depends: base ==4.7.0.1.*, cmdargs ==0.10.7.*, - lens ==4.7.0.*, + lens >=4.7 && <4.7.1, pretty-show ==1.6.7.*, strict ==0.3.2.*, Cabal ==1.20.0.1.* @@ -35,7 +35,7 @@ build-depends: base ==4.7.0.1.*, cmdargs ==0.10.7.*, - lens ==4.7.0.*, + lens >=4.7 && <4.7.1, pretty-show ==1.6.7.*, strict ==0.3.2.*, Cabal ==1.20.0.1.* @@ -54,7 +54,7 @@ build-depends: base ==4.7.0.1.*, cmdargs ==0.10.7.*, - lens ==4.7.0.*, + lens >=4.7 && <4.7.1, pretty-show ==1.6.7.*, strict ==0.3.2.*, Cabal ==1.20.0.1.* @@ -73,7 +73,7 @@ build-depends: base ==4.7.0.1.*, cmdargs ==0.10.7.*, - lens ==4.7.0.*, + lens >=4.7 && <4.7.1, pretty-show ==1.6.7.*, strict ==0.3.2.*, Cabal ==1.20.0.1.* @@ -91,7 +91,7 @@ build-depends: base ==4.7.0.1.*, cmdargs ==0.10.7.*, - lens ==4.7.0.*, + lens >=4.7 && <4.7.1, pretty-show ==1.6.7.*, strict ==0.3.2.*, Cabal ==1.20.0.1.* diff --git a/tests/goldenFiles/UpdateOnlyMissing.cabal b/tests/goldenFiles/UpdateOnlyMissing.cabal --- a/tests/goldenFiles/UpdateOnlyMissing.cabal +++ b/tests/goldenFiles/UpdateOnlyMissing.cabal @@ -18,7 +18,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -35,7 +35,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -54,7 +54,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -73,7 +73,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21 @@ -91,7 +91,7 @@ build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, - lens >=4.7.0 && <4.8, + lens ==4.7.*, pretty-show >=1.6.7 && <1.7, strict >=0.3.2 && <0.4, Cabal >=1.20.0.1 && <1.21