Merge pull request #7346 from Bodigrim/master

Allow bytestring-0.11 + tree-diff-0.2

Author: emilypi

Cabal-tests/Cabal-tests.cabal

@@ -107,7 +107,7 @@ test-suite parser-tests
     build-depends: semigroups
 
   if impl(ghc >=7.8)
-    build-depends: tree-diff ==0.1.*
+    build-depends: tree-diff >=0.1 && <0.3
 
 test-suite check-tests
   type:             exitcode-stdio-1.0
@@ -174,7 +174,7 @@ test-suite hackage-tests
     , tar                   >=0.5.0.3  && <0.6
 
   if impl(ghc >=7.8)
-    build-depends: tree-diff ==0.1.*
+    build-depends: tree-diff >=0.1 && <0.3
 
   ghc-options:        -Wall -rtsopts -threaded
   default-extensions: CPP

Cabal-tree-diff/Cabal-tree-diff.cabal

@@ -12,7 +12,7 @@ library
   build-depends:
     , base
     , Cabal      ^>=3.5.0.0
-    , tree-diff  ^>=0.1
+    , tree-diff  ^>=0.1 || ^>=0.2
 
   exposed-modules:  Data.TreeDiff.Instances.Cabal
   other-modules:

bootstrap/cabal-bootstrap-gen.cabal

@@ -10,7 +10,7 @@ executable cabal-bootstrap-gen
   build-depends:
     , aeson                  ^>=1.5.2.0
     , base                   ^>=4.12.0.0 || ^>=4.13.0.0 || ^>=4.14.0.0
-    , bytestring             ^>=0.10.8.2
+    , bytestring             ^>=0.10.8.2 || ^>= 0.11.0.0
     , Cabal                  ^>=3.2.0.0
     , cabal-install-parsers  ^>=0.3.0.1
     , cabal-plan             ^>=0.7.0.0

cabal-install/cabal-install-solver/cabal-install-solver.cabal

@@ -105,7 +105,7 @@ library
     , array         >=0.4      && <0.6
     , base          >=4.8      && <4.15
     , binary        >=0.7.3    && <0.9
-    , bytestring    ^>=0.10.6.0
+    , bytestring    >=0.10.6.0 && <0.12
     , Cabal         ^>=3.5
     , containers    >=0.5.6.2  && <0.7
     , filepath      ^>=1.4.0.0

cabal-install/cabal-install.cabal

@@ -269,7 +269,7 @@ executable cabal
         base       >= 4.8      && < 4.15,
         base16-bytestring >= 0.1.1 && < 1.1.0.0,
         binary     >= 0.7.3    && < 0.9,
-        bytestring >= 0.10.6.0 && < 0.11,
+        bytestring >= 0.10.6.0 && < 0.12,
         Cabal      == 3.5.*,
         containers >= 0.5.6.2  && < 0.7,
         cryptohash-sha256 >= 0.11 && < 0.12,

cabal-testsuite/cabal-testsuite.cabal

@@ -59,7 +59,7 @@ library
     , async                 ^>= 2.2.1
     , attoparsec            ^>= 0.13.2.2
     , base16-bytestring     ^>= 0.1.1.6 || ^>= 1.0.0.0
-    , bytestring            ^>= 0.10.0.2
+    , bytestring            ^>= 0.10.0.2 || ^>= 0.11.0.0
     , containers            ^>= 0.5.0.0 || ^>= 0.6.0.1
     , cryptohash-sha256     ^>= 0.11.101.0
     , directory             ^>= 1.2.0.1 || ^>= 1.3.0.0