Skip to content

Commit ade5060

Browse files
Merge branch 'release-0.7.1.0'
2 parents 8db0bd1 + 79df722 commit ade5060

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+143
-4847
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@ following conventions:
2424

2525
[KaC]: <https://keepachangelog.com/en/1.0.0/>
2626

27+
## 0.7.1.0 (2026-01-10)
28+
29+
### Non-Breaking
30+
31+
* Bump `base` dependency version upper bound
32+
* Bump `optparse-applicative` dependency version upper bound
33+
* Bump `time` dependency version upper bound
34+
* Remove mock tests, vendored `HMock` and `explainable-predicates`
35+
dependencies
36+
2737
## 0.7.0.0 (2024-12-04)
2838

2939
### Breaking

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright (c) 2019-2024 Travis Cardwell
3+
Copyright (c) 2019-2026 Travis Cardwell
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ MODE ?= stack
1111
DESTDIR ?=
1212
PREFIX ?= /usr/local
1313

14-
DEB_CONTAINER ?= extremais/pkg-debian-stack:bullseye
15-
RPM_CONTAINER ?= extremais/pkg-fedora-stack:37
14+
DEB_CONTAINER ?= extremais/pkg-debian-stack:trixie
15+
RPM_CONTAINER ?= extremais/pkg-fedora-stack:43
1616
MAINTAINER_NAME ?= Travis Cardwell
1717
MAINTAINER_EMAIL ?= travis.cardwell@extrema.is
1818

19-
TEST_DEB_CONTAINER ?= debian:bullseye
19+
TEST_DEB_CONTAINER ?= debian:trixie
2020
TEST_DEB_ARCH ?= amd64
21-
TEST_RPM_CONTAINER ?= fedora:37
22-
TEST_RPM_OS ?= fc37
21+
TEST_RPM_CONTAINER ?= fedora:43
22+
TEST_RPM_OS ?= fc43
2323
TEST_RPM_ARCH ?= x86_64
2424

2525
##############################################################################

VENDOR.md

Lines changed: 0 additions & 43 deletions
This file was deleted.

app/LibOA.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- |
33
-- Module : LibOA
44
-- Description : supplementary functions for optparse-applicative
5-
-- Copyright : Copyright (c) 2019-2024 Travis Cardwell
5+
-- Copyright : Copyright (c) 2019-2026 Travis Cardwell
66
-- License : MIT
77
--
88
-- This is a collection of functions that I often use with

app/Main.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- |
33
-- Module : Main
44
-- Description : hr: a horizontal rule for terminals
5-
-- Copyright : Copyright (c) 2019-2024 Travis Cardwell
5+
-- Copyright : Copyright (c) 2019-2026 Travis Cardwell
66
-- License : MIT
77
--
88
-- See the README for details.

cabal-bounds-lower.project

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ constraints:
1010
-- GHC boot library
1111
, base == 4.13.0.0
1212

13-
-- https://hackage.haskell.org/package/HMock
14-
, HMock == 0.5.1.0
15-
1613
-- https://hackage.haskell.org/package/optparse-applicative
1714
, optparse-applicative == 0.15.1.0
1815

cabal-bounds-upper.project

Lines changed: 6 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,31 @@
11
packages: ./horizontal-rule.cabal
22

3-
with-compiler: ghc-9.10.1
3+
with-compiler: ghc-9.14.1
44

55
constraints:
6-
-- https://hackage.haskell.org/package/array
7-
-- GHC boot library
8-
-- vendored dependency
9-
array == 0.5.7.0
10-
116
-- https://hackage.haskell.org/package/base
127
-- GHC boot library
13-
, base == 4.20.0.0
14-
15-
-- https://hackage.haskell.org/package/constraints
16-
-- vendored dependency
17-
, constraints == 0.14.2
18-
19-
-- https://hackage.haskell.org/package/containers
20-
-- GHC boot library
21-
-- vendored dependency
22-
, containers == 0.7
23-
24-
-- https://hackage.haskell.org/package/data-default
25-
-- vendored dependency
26-
, data-default == 0.8.0.0
27-
28-
-- https://hackage.haskell.org/package/exceptions
29-
-- GHC boot library
30-
-- vendored dependency
31-
, exceptions == 0.10.9
32-
33-
-- https://hackage.haskell.org/package/extra
34-
-- vendored dependency
35-
, extra == 1.8
36-
37-
-- https://hackage.haskell.org/package/monad-control
38-
-- vendored dependency
39-
, monad-control == 1.0.3.1
40-
41-
-- https://hackage.haskell.org/package/mtl
42-
-- GHC boot library
43-
-- vendored dependency
44-
, mtl == 2.3.1
8+
base == 4.22.0.0
459

4610
-- https://hackage.haskell.org/package/optparse-applicative
47-
, optparse-applicative == 0.18.1.0
11+
, optparse-applicative == 0.19.0.0
4812

4913
-- https://hackage.haskell.org/package/prettyprinter
5014
, prettyprinter == 1.7.1
5115

52-
-- https://hackage.haskell.org/package/stm
53-
-- GHC boot library
54-
-- vendored dependency
55-
, stm == 2.5.3.1
56-
57-
-- https://hackage.haskell.org/package/syb
58-
-- vendored dependency
59-
, syb == 0.7.2.4
60-
6116
-- https://hackage.haskell.org/package/tasty
62-
, tasty == 1.5.2
17+
, tasty == 1.5.3
6318

6419
-- https://hackage.haskell.org/package/tasty-hunit
6520
, tasty-hunit == 0.10.2
6621

67-
-- https://hackage.haskell.org/package/template-haskell
68-
-- GHC boot library
69-
-- vendored dependency
70-
, template-haskell == 2.22.0.0
71-
7222
-- https://hackage.haskell.org/package/terminal-size
7323
, terminal-size == 0.3.4
7424

7525
-- https://hackage.haskell.org/package/text
7626
-- GHC boot library
77-
, text == 2.1.2
27+
, text == 2.1.3
7828

7929
-- https://hackage.haskell.org/package/time
8030
-- GHC boot library
81-
, time == 1.14
82-
83-
-- https://hackage.haskell.org/package/transformers-base
84-
-- vendored dependency
85-
, transformers-base == 0.4.6
86-
87-
-- https://hackage.haskell.org/package/unliftio
88-
-- vendored dependency
89-
, unliftio == 0.2.25.0
31+
, time == 1.15

doc/hr.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
. ftr VB CB
1515
. ftr VBI CBI
1616
.\}
17-
.TH "HR" "1" "" "hr-haskell 0.7.0.0 (2024-12-04)" "hr Manual"
17+
.TH "HR" "1" "" "hr-haskell 0.7.1.0 (2026-01-10)" "hr Manual"
1818
.nh
1919
.SH NAME
2020
.PP
@@ -104,7 +104,7 @@ Email: <bugs@extrema.is>
104104
.RE
105105
.TP
106106
Copyright
107-
Copyright (c) 2019-2024 Travis Cardwell
107+
Copyright (c) 2019-2026 Travis Cardwell
108108
.TP
109109
License
110110
The MIT License <https://opensource.org/licenses/MIT>

doc/hr.1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Reporting issues:
8383
Email: <bugs@extrema.is>
8484

8585
Copyright
86-
: Copyright (c) 2019-2024 Travis Cardwell
86+
: Copyright (c) 2019-2026 Travis Cardwell
8787

8888
License
8989
: The MIT License <https://opensource.org/licenses/MIT>

0 commit comments

Comments
 (0)