Merge pull request #664 from haskell-CI/update-dps

Update dependencies
haskell-CI · Jun 13, 2023 · 782c6f6 · 782c6f6
2 parents 98d3b24 + c60424c
commit 782c6f6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 0.16.5 - 2023-06-13
+
+- Use optparse-applicative-0.18.1.
+  When using older optparse-applicative with prettyprinter,
+  `--help` appeared to hang.
+- Update other dependencies as well.
+
+## 0.16.4 - 2023-06-09
+
+- Add GHC-9.2.8
+
 ## 0.16.3 - 2023-05-25
 
 - Add GHC-9.6.2

diff --git a/cabal-install-parsers/cabal-install-parsers.cabal b/cabal-install-parsers/cabal-install-parsers.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               cabal-install-parsers
-version:            0.6.1
+version:            0.6.1.1
 synopsis:           Utilities to work with cabal-install files
 description:
   @cabal-install-parsers@ provides parsers for @cabal-install@ files:
@@ -129,7 +129,7 @@ test-suite cabal-parsers-golden
 
   -- dependencies needing explicit constraints
   build-depends:
-    , ansi-terminal  >=0.10     && <0.12
+    , ansi-terminal  >=1.0     && <1.1
     , tasty          ^>=1.4
     , tasty-golden   ^>=2.3.1.1
     , tree-diff      >=0.2      && <0.4

diff --git a/haskell-ci.cabal b/haskell-ci.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               haskell-ci
-version:            0.16.4
+version:            0.16.5
 synopsis:           Cabal package script generator for Travis-CI
 description:
   Script generator (@haskell-ci@) for
@@ -81,6 +81,7 @@ library haskell-ci-internal
     HaskellCI.Auxiliary
     HaskellCI.Bash
     HaskellCI.Bash.Template
+    HaskellCI.Cabal
     HaskellCI.Cli
     HaskellCI.Compiler
     HaskellCI.Config
@@ -101,7 +102,6 @@ library haskell-ci-internal
     HaskellCI.Diagnostics
     HaskellCI.Error
     HaskellCI.Ghcup
-    HaskellCI.Cabal
     HaskellCI.GitConfig
     HaskellCI.GitHub
     HaskellCI.GitHub.Yaml
@@ -125,7 +125,6 @@ library haskell-ci-internal
     HaskellCI.YamlSyntax
 
   default-extensions:
-    NoImplicitPrelude
     BangPatterns
     DeriveAnyClass
     DeriveFoldable
@@ -134,6 +133,7 @@ library haskell-ci-internal
     DeriveTraversable
     DerivingStrategies
     GeneralizedNewtypeDeriving
+    NoImplicitPrelude
     ScopedTypeVariables
     TypeOperators
 
@@ -144,29 +144,29 @@ library haskell-ci-internal
     ViewPatterns
 
   build-depends:
-    , base          >=4.10     && <4.18
+    , base          >=4.10      && <4.18
     , binary        ^>=0.8.5.1
     , bytestring    ^>=0.10.8.1 || ^>=0.11.1.0
     , Cabal-syntax  ^>=3.10.1.0
-    , containers    ^>=0.5.7.1 || ^>=0.6.0.1
+    , containers    ^>=0.5.7.1  || ^>=0.6.0.1
     , deepseq       ^>=1.4.2.0
     , directory     ^>=1.3.0.0
     , filepath      ^>=1.4.1.1
     , mtl           ^>=2.2.2
     , parsec        ^>=3.1.13.0
     , pretty        ^>=1.1.3.3
-    , process       ^>=1.4.3.0 || ^>=1.6.1.0
-    , text          ^>=1.2.3.0 || ^>=2.0.1
+    , process       ^>=1.4.3.0  || ^>=1.6.1.0
+    , text          ^>=1.2.3.0  || ^>=2.0.1
     , transformers  ^>=0.5.2.0
 
   if !impl(ghc >=8.2)
     build-depends: bifunctors ^>=5.5.4
 
   -- other dependencies
   build-depends:
-    , aeson                          ^>=1.5.6.0 || ^>=2.0.0.0 || ^>=2.1.0.0
+    , aeson                          ^>=1.5.6.0    || ^>=2.0.0.0 || ^>=2.1.0.0
     , attoparsec                     ^>=0.14.1
-    , base-compat                    ^>=0.12
+    , base-compat                    ^>=0.13.0
     , base16-bytestring              ^>=1.0.1.0
     , cabal-install-parsers          ^>=0.6
     , cryptohash-sha256              ^>=0.11.101.0
@@ -176,9 +176,9 @@ library haskell-ci-internal
     , indexed-traversable            ^>=0.1.1
     , indexed-traversable-instances  ^>=0.1
     , ini                            ^>=0.4.1
-    , lattices                       ^>=2
+    , lattices                       ^>=2.2
     , network-uri                    ^>=2.6.1.0
-    , optparse-applicative           ^>=0.17.0.0
+    , optparse-applicative           ^>=0.18.1.0
     , temporary                      ^>=1.3
     , unordered-containers           ^>=0.2.10.0
     , zinza                          ^>=0.2
@@ -189,6 +189,7 @@ library haskell-ci-internal
 
 executable haskell-ci
   main-is:          Main.hs
+  ghc-options:      -threaded -rtsopts
   hs-source-dirs:   cli
   build-depends:
     , base
@@ -215,7 +216,7 @@ test-suite golden
 
   -- dependencies needing explicit constraints
   build-depends:
-    , ansi-terminal  >=0.10    && <0.12
+    , ansi-terminal  >=1.0     && <1.1
     , Diff           ^>=0.4.0
     , tasty          ^>=1.4.1
     , tasty-golden   ^>=2.3.1.1