Skip to content

Commit acfd436

Browse files
authored
Merge pull request #59 from yutotakano/allow-dh-1.18
Update discord-haskell upper bound to include 1.18.0
2 parents f9f65de + 492b1c3 commit acfd436

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

.github/workflows/build_cabal.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
matrix:
2222
os: ["ubuntu-24.04"]
2323
# Range all supported versions on most common ubuntu OS
24-
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.6.7", "9.8.4"]
24+
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.6.7", "9.8.4", "9.10.2", "9.12.2"]
2525
include:
2626
- os: ubuntu-22.04 # one previous ubuntu version
2727
ghc: "9.8.4"
@@ -54,9 +54,6 @@ jobs:
5454
brew update
5555
brew fetch --formula llvm@12
5656
FORMULA_PATH="$(brew --repo homebrew/core)/Formula/l/[email protected]"
57-
if [ ! -f "$FORMULA_PATH" ]; then
58-
FORMULA_PATH="$(brew --repo homebrew/core)/Formula/l/[email protected]"
59-
fi
6057
# Remove the 'disable!' line
6158
sed -i.bak '/^ disable!/d' "$FORMULA_PATH"
6259
# Install ignoring the disabled status

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# discord-haskell-voice
22

33
[![hackage version](https://img.shields.io/hackage/v/discord-haskell-voice?color=7565a8)](https://hackage.haskell.org/package/discord-haskell-voice)
4-
[![discord-haskell version dependency](https://img.shields.io/badge/discord--haskell-%3E=1.12.0%20%26%26%20%3C=1.17.1-677eab)](https://hackage.haskell.org/package/discord-haskell)
4+
[![discord-haskell version dependency](https://img.shields.io/badge/discord--haskell-%3E=1.12.0%20%26%26%20%3C=1.18.0-677eab)](https://hackage.haskell.org/package/discord-haskell)
55
![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/yutotakano/discord-haskell-voice/build_cabal.yml)
66

77
Welcome to `discord-haskell-voice`! This library provides you with a high-level
@@ -106,7 +106,7 @@ dependency in your `.cabal` file:
106106
# --- myproject.cabal <truncated>
107107
build-depends:
108108
base >=4.7 && <5
109-
, discord-haskell ==1.17.1
109+
, discord-haskell ==1.18.0
110110
, discord-haskell-voice ==3.0.0
111111
```
112112
@@ -119,15 +119,15 @@ Stackage for the same reason `discord-haskell` is not on Stackage):
119119
```yaml
120120
# --- stack.yaml <truncated>
121121
extra-deps:
122-
- discord-haskell-1.17.1
122+
- discord-haskell-1.18.0
123123
- discord-haskell-voice-3.0.0
124124
```
125125

126126
```yaml
127127
# --- package.yaml <truncated>
128128
dependencies:
129129
- base >= 4.7 && < 5
130-
- discord-haskell == 1.17.1
130+
- discord-haskell == 1.18.0
131131
- discord-haskell-voice == 3.0.0
132132
```
133133

discord-haskell-voice.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ library
5454
, bytestring >=0.10.12.0 && <0.13
5555
, conduit >=1.3.4.2 && <1.4.0.0
5656
, conduit-extra ==1.3.6
57-
, discord-haskell >=1.12.0 && <=1.17.1
57+
, discord-haskell >=1.12.0 && <=1.18.0
5858
, microlens >=0.4.11.2 && <0.5
5959
, microlens-th >=0.4.3.10 && <0.5
6060
, mtl <2.4
@@ -92,7 +92,7 @@ executable basic-music-bot
9292
build-depends:
9393
base >=4.7 && <5
9494
, conduit >=1.3.4.2 && <=1.4.0.0
95-
, discord-haskell >=1.12.0 && <=1.17.1
95+
, discord-haskell >=1.12.0 && <=1.18.0
9696
, discord-haskell-voice
9797
, optparse-applicative >=0.15.1.0 && <0.20
9898
, stm >=2.5.0.0 && <2.6
@@ -109,7 +109,7 @@ executable join-all-on-start
109109
build-depends:
110110
base >=4.7 && <5
111111
, conduit >=1.3.4.2 && <=1.4.0.0
112-
, discord-haskell >=1.12.0 && <=1.17.1
112+
, discord-haskell >=1.12.0 && <=1.18.0
113113
, discord-haskell-voice
114114
, safe-exceptions >=0.1.7.1 && <0.1.8
115115
, text >=1.2.4.1 && <3

0 commit comments

Comments
 (0)