Allow crypton-connection 0.4 (#109)

* Allow `crypton-connection` 0.4.

* `crypton-connection` 0.4 requires new parameter.

* Also test against `ghc-9.10`.

---------

Co-authored-by: Andreas Ländle <[email protected]>

Author: alaendle

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   linux:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -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 }}
@@ -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

Network/AMQP/Internal.hs

@@ -11,6 +11,7 @@ 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)
@@ -174,8 +175,8 @@ data TLSSettings =
 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

amqp.cabal

@@ -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,
@@ -67,6 +68,7 @@ test-suite spec
       ConnectionSpec
       ExchangeDeclareSpec
       ExchangeDeleteSpec
+      FromURISpec
       QueueDeclareSpec
       QueueDeleteSpec
       QueuePurgeSpec
@@ -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