Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow crypton-connection 0.4. #109

Merged
merged 3 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
linux:

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -25,13 +25,21 @@ jobs:
cabal: 'latest'
- ghc: '9.2'
cabal: 'latest'
- ghc: '9.4'
cabal: 'latest'
- ghc: '9.6'
cabal: 'latest'
- ghc: '9.8'
cabal: 'latest'
- ghc: '9.10'
cabal: 'latest'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# need to install older cabal/ghc versions from ppa repository

- name: Install recent cabal/ghc
uses: haskell/actions/setup@v1
uses: haskell-actions/setup@v2
with:
ghc-version: ${{ matrix.versions.ghc }}
cabal-version: ${{ matrix.versions.cabal }}
Expand All @@ -42,15 +50,15 @@ jobs:

- name: Cache cabal global package db
id: cabal-global
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
~/.cabal
key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ hashFiles('cabal.project') }}

- name: Cache cabal work
id: cabal-local
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
dist-newstyle
Expand Down
5 changes: 3 additions & 2 deletions Network/AMQP/Internal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
import Paths_amqp(version)
import Data.Version(showVersion)

import Control.Applicative

Check warning on line 7 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (8.8, latest)

The import of ‘Control.Applicative’ is redundant

Check warning on line 7 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (8.8, latest)

The import of ‘Control.Applicative’ is redundant

Check warning on line 7 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (8.10, latest)

The import of ‘Control.Applicative’ is redundant

Check warning on line 7 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (8.10, latest)

The import of ‘Control.Applicative’ is redundant

Check warning on line 7 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (9.0, latest)

The import of ‘Control.Applicative’ is redundant

Check warning on line 7 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (9.0, latest)

The import of ‘Control.Applicative’ is redundant
import Control.Concurrent
import Control.Concurrent.STM
import Control.Monad
import Data.Binary
import Data.Binary.Get
import Data.Binary.Put as BPut
import Data.Default.Class
import Data.Int (Int64)
import Data.Maybe
import Data.Text (Text)
Expand Down Expand Up @@ -174,8 +175,8 @@
connectionTLSSettings :: TLSSettings -> Maybe Conn.TLSSettings
connectionTLSSettings tlsSettings =
Just $ case tlsSettings of
TLSTrusted -> Conn.TLSSettingsSimple False False False
TLSUntrusted -> Conn.TLSSettingsSimple True False False
TLSTrusted -> Conn.TLSSettingsSimple False False False def
TLSUntrusted -> Conn.TLSSettingsSimple True False False def
TLSCustom x -> x

-- | A 'SASLMechanism' is described by its name ('saslName'), its initial response ('saslInitialResponse'), and an optional function ('saslChallengeFunc') that
Expand Down Expand Up @@ -384,7 +385,7 @@


watchHeartbeats :: Connection -> Int -> ThreadId -> IO ThreadId
watchHeartbeats conn timeout connThread = scheduleAtFixedRate rate $ do

Check warning on line 388 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (8.8, latest)

This binding for ‘connThread’ shadows the existing binding

Check warning on line 388 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (8.8, latest)

This binding for ‘connThread’ shadows the existing binding

Check warning on line 388 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (8.10, latest)

This binding for ‘connThread’ shadows the existing binding

Check warning on line 388 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (8.10, latest)

This binding for ‘connThread’ shadows the existing binding

Check warning on line 388 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (9.0, latest)

This binding for ‘connThread’ shadows the existing binding

Check warning on line 388 in Network/AMQP/Internal.hs

View workflow job for this annotation

GitHub Actions / linux (9.0, latest)

This binding for ‘connThread’ shadows the existing binding
checkSendTimeout
checkReceiveTimeout
where
Expand Down
7 changes: 5 additions & 2 deletions amqp.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ Library
containers>=0.2,
bytestring>=0.9,
data-binary-ieee754>=0.4.2.1,
data-default-class >= 0.1,
text>=0.11.2,
split>=0.2,
clock >= 0.4.0.1,
monad-control >= 0.3,
crypton-connection >= 0.3.1 && <= 0.4,
crypton-connection >= 0.4 && <= 0.5,
vector,
stm >= 2.4.0,
network-uri >= 2.6,
Expand Down Expand Up @@ -67,6 +68,7 @@ test-suite spec
ConnectionSpec
ExchangeDeclareSpec
ExchangeDeleteSpec
FromURISpec
QueueDeclareSpec
QueueDeleteSpec
QueuePurgeSpec
Expand All @@ -76,12 +78,13 @@ test-suite spec
, containers>=0.2
, bytestring>=0.9
, data-binary-ieee754>=0.4.2.1
, data-default-class >= 0.1
, text>=0.11.2
, split>=0.2
, clock >= 0.4.0.1
, hspec >= 1.3
, hspec-expectations >= 0.3.3
, crypton-connection >= 0.3.1 && <= 0.4
, crypton-connection >= 0.4 && <= 0.5
, vector
, stm >= 2.4.0
, network-uri >= 2.6
Expand Down
Loading