cabal-bounds 0.9.1 → 0.9.2
raw patch · 22 files changed
+71/−60 lines, 22 files
Files
- CHANGELOG +10/−0
- cabal-bounds.cabal +1/−1
- lib/CabalBounds/Dependencies.hs +3/−3
- lib/CabalBounds/Update.hs +5/−4
- tests/goldenFiles/UpdateBothIgnoreBase.cabal +5/−5
- tests/goldenFiles/UpdateBothOfAll.cabal +5/−5
- tests/goldenFiles/UpdateBothOfAllExes.cabal +2/−2
- tests/goldenFiles/UpdateBothOfExe.cabal +1/−1
- tests/goldenFiles/UpdateBothOfLibrary.cabal +1/−1
- tests/goldenFiles/UpdateBothOfOtherExe.cabal +1/−1
- tests/goldenFiles/UpdateBothOfTest.cabal +1/−1
- tests/goldenFiles/UpdateByHaskellPlatformAndSetupConfig.cabal +5/−5
- tests/goldenFiles/UpdateLowerIgnoreBase.cabal +5/−5
- tests/goldenFiles/UpdateLowerOfAll.cabal +5/−5
- tests/goldenFiles/UpdateLowerOfAllExes.cabal +2/−2
- tests/goldenFiles/UpdateLowerOfExe.cabal +1/−1
- tests/goldenFiles/UpdateLowerOfLibrary.cabal +1/−1
- tests/goldenFiles/UpdateLowerOfOtherExe.cabal +1/−1
- tests/goldenFiles/UpdateLowerOfTest.cabal +1/−1
- tests/goldenFiles/UpdateMinorLower.cabal +5/−5
- tests/goldenFiles/UpdateMinorLowerAndUpper.cabal +5/−5
- tests/goldenFiles/UpdateOnlyMissing.cabal +5/−5
CHANGELOG view
@@ -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
cabal-bounds.cabal view
@@ -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
lib/CabalBounds/Dependencies.hs view
@@ -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
lib/CabalBounds/Update.hs view
@@ -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]
tests/goldenFiles/UpdateBothIgnoreBase.cabal view
@@ -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
tests/goldenFiles/UpdateBothOfAll.cabal view
@@ -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
tests/goldenFiles/UpdateBothOfAllExes.cabal view
@@ -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
tests/goldenFiles/UpdateBothOfExe.cabal view
@@ -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
tests/goldenFiles/UpdateBothOfLibrary.cabal view
@@ -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
tests/goldenFiles/UpdateBothOfOtherExe.cabal view
@@ -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
tests/goldenFiles/UpdateBothOfTest.cabal view
@@ -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
tests/goldenFiles/UpdateByHaskellPlatformAndSetupConfig.cabal view
@@ -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
tests/goldenFiles/UpdateLowerIgnoreBase.cabal view
@@ -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
tests/goldenFiles/UpdateLowerOfAll.cabal view
@@ -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
tests/goldenFiles/UpdateLowerOfAllExes.cabal view
@@ -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
tests/goldenFiles/UpdateLowerOfExe.cabal view
@@ -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
tests/goldenFiles/UpdateLowerOfLibrary.cabal view
@@ -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
tests/goldenFiles/UpdateLowerOfOtherExe.cabal view
@@ -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
tests/goldenFiles/UpdateLowerOfTest.cabal view
@@ -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
tests/goldenFiles/UpdateMinorLower.cabal view
@@ -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
tests/goldenFiles/UpdateMinorLowerAndUpper.cabal view
@@ -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.*
tests/goldenFiles/UpdateOnlyMissing.cabal view
@@ -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