Skip to content

Commit 4ccf7db

Browse files
authored
Support latest base, containers and contravariant major versions (#108)
1 parent 8d8e102 commit 4ccf7db

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

Changelog.md

+7
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@
5050

5151
* Export `prelude.types.Scopes`.
5252

53+
## Other Changes
54+
55+
* Bump upper-bounds for `base`, `containers` and `contravariant`. This project
56+
can build on GHC 8.6 (though will need `--allow-newer` for `Cabal` until this
57+
is official released).
58+
59+
5360
## 1.1.0.0 -- 2018-06-03
5461

5562
### Breaking Changes

dhall-to-cabal.cabal

+6-6
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ library
128128
-fno-warn-name-shadowing
129129
build-depends:
130130
Cabal ^>=2.2,
131-
base ^>=4.10 || ^>=4.11,
131+
base ^>=4.10 || ^>=4.11 || ^>=4.12,
132132
bytestring ^>=0.10,
133-
containers ^>=0.5,
134-
contravariant ^>=1.4,
133+
containers ^>=0.5 || ^>=0.6,
134+
contravariant ^>=1.4 || ^>=1.5,
135135
dhall ^>=1.15.0,
136136
hashable ^>=1.2.6.1,
137137
insert-ordered-containers ^>=0.2.1.0,
@@ -155,7 +155,7 @@ executable dhall-to-cabal
155155
-fno-warn-name-shadowing
156156
build-depends:
157157
Cabal ^>=2.2,
158-
base ^>=4.10 || ^>=4.11,
158+
base ^>=4.10 || ^>=4.11 || ^>=4.12,
159159
dhall ^>=1.15.0,
160160
dhall-to-cabal -any,
161161
insert-ordered-containers ^>=0.2.1.0,
@@ -179,7 +179,7 @@ executable cabal-to-dhall
179179
-Wno-missing-local-signatures -Wno-monomorphism-restriction
180180
-fno-warn-name-shadowing
181181
build-depends:
182-
base ^>=4.10 || ^>=4.11,
182+
base ^>=4.10 || ^>=4.11 || ^>=4.12,
183183
dhall ^>=1.15.0,
184184
bytestring ^>=0.10,
185185
dhall-to-cabal -any,
@@ -198,7 +198,7 @@ test-suite golden-tests
198198
-Wno-missing-local-signatures -Wno-monomorphism-restriction
199199
-fno-warn-name-shadowing
200200
build-depends:
201-
base ^>=4.10 || ^>=4.11,
201+
base ^>=4.10 || ^>=4.11 || ^>=4.12,
202202
Cabal ^>=2.2,
203203
Diff ^>=0.3.4,
204204
bytestring ^>=0.10,

dhall-to-cabal.dhall

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ in let deps =
2121
, Diff =
2222
majorVersions "Diff" [ v "0.3.4" ]
2323
, base =
24-
majorVersions "base" [ v "4.10", v "4.11" ]
24+
majorVersions "base" [ v "4.10", v "4.11", v "4.12" ]
2525
, bytestring =
2626
majorVersions "bytestring" [ v "0.10" ]
2727
, containers =
28-
majorVersions "containers" [ v "0.5" ]
28+
majorVersions "containers" [ v "0.5", v "0.6" ]
2929
, dhall =
3030
majorVersions "dhall" [ v "1.15.0" ]
3131
, dhall-to-cabal =
@@ -39,7 +39,7 @@ in let deps =
3939
, prettyprinter =
4040
majorVersions "prettyprinter" [ v "1.2.0.1" ]
4141
, contravariant =
42-
majorVersions "contravariant" [ v "1.4" ]
42+
majorVersions "contravariant" [ v "1.4", v "1.5" ]
4343
, hashable =
4444
majorVersions "hashable" [ v "1.2.6.1" ]
4545
, tasty =

0 commit comments

Comments
 (0)