Skip to content

Commit 408d8ae

Browse files
disassemblerdisassembler
authored
Merge pull request IntersectMBO#5411 from input-output-hk/sl/bump-plutus-ledger-api
8.2.0 version bumps
2 parents 0f0a857 + b30697f commit 408d8ae

File tree

43 files changed

+197
-193
lines changed

Some content is hidden

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

43 files changed

+197
-193
lines changed

‎bench/cardano-topology/cardano-topology.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: cardano-topology
4-
version: 8.1.0
4+
version: 8.2.0
55
synopsis: A cardano topology generator
66
description: A cardano topology generator.
77
category: Cardano,
@@ -37,6 +37,6 @@ executable cardano-topology
3737
, bytestring
3838
, containers
3939
, graphviz
40-
, optparse-applicative-fork ^>= 0.16.1
40+
, optparse-applicative-fork
4141
, split
4242
, text

‎bench/locli/locli.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: locli
4-
version: 1.29
4+
version: 1.30
55
synopsis: Cardano log analysis CLI
66
description: Cardano log analysis CLI.
77
category: Cardano,
@@ -116,7 +116,7 @@ library
116116
, ghc
117117
, gnuplot
118118
, iohk-monitoring
119-
, optparse-applicative-fork ^>= 0.16.1
119+
, optparse-applicative-fork
120120
, optparse-generic
121121
, ouroboros-consensus
122122
-- for Data.SOP.Strict:
@@ -155,7 +155,7 @@ executable locli
155155
build-depends: aeson
156156
, cardano-prelude
157157
, locli
158-
, optparse-applicative-fork ^>= 0.16.1
158+
, optparse-applicative-fork
159159
, text
160160
, text-short
161161
, transformers

‎bench/plutus-scripts-bench/plutus-scripts-bench.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.0
22
name: plutus-scripts-bench
3-
version: 1.0.0.0
3+
version: 1.0.0.1
44
synopsis: Plutus scripts used for benchmarking
55
description: Plutus scripts used for benchmarking.
66
category: Cardano,
@@ -100,5 +100,5 @@ executable gen-plutus
100100
build-depends: base >=4.12 && <5
101101
, bytestring
102102
, filepath
103-
, optparse-applicative >= 0.16.0 && < 0.16.1
103+
, optparse-applicative
104104
, plutus-scripts-bench

‎bench/trace-analyzer/trace-analyzer.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ executable trace-analyzer
4040
main-is: trace-analyzer.hs
4141

4242
build-depends: aeson
43-
, optparse-applicative >= 0.16.0 && < 0.16.1
43+
, optparse-applicative
4444
, text
4545
, containers
4646
, attoparsec

‎bench/tx-generator/src/Cardano/Benchmarking/OuroborosImports.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import Cardano.Node.Configuration.Logging (LoggingLayer)
3636
import Cardano.Node.Protocol.Types (SomeConsensusProtocol (..))
3737

3838
import Cardano.Api.Shelley (CardanoMode)
39-
import Cardano.CLI.Types (SigningKeyFile)
39+
import Cardano.CLI.Types.Legacy (SigningKeyFile)
4040

4141
import Cardano.Api (BlockType (..), ConsensusModeParams (..), EpochSlots (..),
4242
LocalNodeConnectInfo (..), NetworkId (..), PaymentKey, SigningKey, SocketPath,

‎bench/tx-generator/src/Cardano/TxGenerator/Setup/NixService.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Data.List.NonEmpty (NonEmpty)
2020
import Data.Maybe (fromMaybe)
2121
import GHC.Generics (Generic)
2222

23-
import Cardano.CLI.Types (FileDirection (..), SigningKeyFile)
23+
import Cardano.CLI.Types.Legacy (FileDirection (..), SigningKeyFile)
2424
import Cardano.Node.Configuration.NodeAddress (NodeIPv4Address)
2525
import Cardano.Node.Types (AdjustFilePaths (..))
2626

‎bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Control.Monad.Trans.Except
1818
import Control.Monad.Trans.Except.Extra
1919
import Control.Monad.Writer (runWriter)
2020

21-
import Cardano.CLI.Shelley.Run.Read (readFileScriptInAnyLang)
21+
import Cardano.CLI.Run.Legacy.Read (readFileScriptInAnyLang)
2222

2323
import Cardano.Api
2424
import Cardano.Api.Shelley (PlutusScript (..), ProtocolParameters (..), fromAlonzoExUnits,

‎bench/tx-generator/src/Cardano/TxGenerator/Setup/SigningKey.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import qualified Data.ByteString as BS (ByteString)
1616
import Data.ByteString.Base16 as Base16 (decode)
1717

1818
import Cardano.Api
19-
import Cardano.CLI.Types (SigningKeyFile)
19+
import Cardano.CLI.Types.Legacy (SigningKeyFile)
2020

2121
import Cardano.TxGenerator.Types (TxGenError (..))
2222

‎bench/tx-generator/tx-generator.cabal‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: tx-generator
4-
version: 2.5
4+
version: 2.6
55
synopsis: A transaction workload generator for Cardano clusters
66
description: A transaction workload generator for Cardano clusters.
77
category: Cardano,
@@ -99,7 +99,7 @@ library
9999
, bytestring
100100
, cardano-api ^>= 8.8
101101
, cardano-binary
102-
, cardano-cli ^>= 8.3
102+
, cardano-cli ^>= 8.4
103103
, cardano-crypto-class
104104
, cardano-crypto-wrapper
105105
, cardano-data
@@ -122,7 +122,7 @@ library
122122
, mtl
123123
, network
124124
, network-mux
125-
, optparse-applicative-fork ^>= 0.16.1
125+
, optparse-applicative-fork
126126
, ouroboros-consensus >= 0.6
127127
, ouroboros-consensus-cardano >= 0.5
128128
, ouroboros-consensus-diffusion >= 0.7.0
@@ -192,9 +192,9 @@ test-suite tx-generator-apitest
192192
, aeson
193193
, bytestring
194194
, filepath
195-
, optparse-applicative-fork ^>= 0.16.1
195+
, optparse-applicative-fork
196196
, cardano-api ^>= 8.8
197-
, cardano-cli ^>= 8.3
197+
, cardano-cli ^>= 8.4
198198
, cardano-node
199199
, plutus-tx
200200
, transformers
@@ -208,9 +208,9 @@ test-suite tx-generator-apitest
208208
, aeson
209209
, bytestring
210210
, filepath
211-
, optparse-applicative-fork ^>= 0.16.1
211+
, optparse-applicative-fork
212212
, cardano-api ^>= 8.8
213-
, cardano-cli ^>= 8.3
213+
, cardano-cli ^>= 8.4
214214
, cardano-node
215215
, transformers
216216
, transformers-except

‎cabal.project‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
1313
-- See CONTRIBUTING for information about these, including some Nix commands
1414
-- you need to run if you change them
1515
index-state:
16-
, hackage.haskell.org 2023-07-21T10:12:20Z
17-
, cardano-haskell-packages 2023-07-21T12:48:43Z
16+
, hackage.haskell.org 2023-07-27T01:34:31Z
17+
, cardano-haskell-packages 2023-07-27T07:20:05Z
1818

1919
packages:
2020
cardano-client-demo
@@ -38,6 +38,8 @@ package cardano-api
3838

3939
package cardano-cli
4040
ghc-options: -Werror
41+
-- TODO delete the following when the warning is fixed
42+
ghc-options: -Wno-redundant-constraints
4143

4244
package cardano-client-demo
4345
ghc-options: -Werror
@@ -106,10 +108,6 @@ allow-newer:
106108
text,
107109
ekg-forward
108110

109-
constraints:
110-
optparse-applicative >= 0.16.0 && < 0.16.1,
111-
cardano-api < 8.8.1
112-
113111
-- IMPORTANT
114112
-- Do NOT add more source-repository-package stanzas here unless they are strictly
115113
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.

0 commit comments

Comments
 (0)