fix: compile against newer dependencies

package.yaml

@@ -29,6 +29,8 @@ ghc-options:
   - -Wno-missed-specialisations
   - -Wno-missing-import-lists
   - -Wno-missing-kind-signatures
+  - -Wno-missing-poly-kind-signatures
+  - -Wno-missing-role-annotations
   - -Wno-missing-safe-haskell-mode
   - -Wno-prepositive-qualified-module
   - -Wno-unsafe

restyler.cabal

@@ -74,7 +74,7 @@ library
       OverloadedStrings
       QuasiQuotes
       TypeFamilies
-  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe
+  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-poly-kind-signatures -Wno-missing-role-annotations -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe
   build-depends:
       Blammo
     , Glob
@@ -134,7 +134,7 @@ executable restyle
       OverloadedStrings
       QuasiQuotes
       TypeFamilies
-  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe -Wall -threaded -rtsopts -with-rtsopts=-N
+  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-poly-kind-signatures -Wno-missing-role-annotations -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe -Wall -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       aeson
     , base
@@ -178,7 +178,7 @@ test-suite test
       OverloadedStrings
       QuasiQuotes
       TypeFamilies
-  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe
+  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-poly-kind-signatures -Wno-missing-role-annotations -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe
   build-depends:
       Blammo
     , aeson

src/Restyler/Config/LogSettings.hs

@@ -90,8 +90,8 @@ colorParser =
     . Mod
     . setLogSettingsColor
     <$> withShownDefault
+      (const "auto")
       LogColorAuto
-      "auto"
       ( setting
           [ help "Enable color WHEN"
           , option

src/Restyler/Config/Restrictions.hs

@@ -77,7 +77,7 @@ subRestrictionsParser =
               ]
         )
     <*> ( Just
-            <$> withShownByDefault
+            <$> withShownDefault
               showBytes
               (Bytes 128 $ Just M)
               ( setting
@@ -97,6 +97,3 @@ restrictedParser =
       [ help "Restrict restylers resources"
       , name "restricted"
       ]
-
-withShownByDefault :: (a -> String) -> a -> Parser a -> Parser a
-withShownByDefault f a = withShownDefault a (f a)

src/Restyler/Config/Restyler.hs

@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-term-variable-capture #-}
+
 -- |
 --
 -- Module      : Restyler.Config.Restyler
@@ -183,7 +185,7 @@ getEnabledRestylers = do
 
 restylerOverridesParser :: Parser [RestylerOverride]
 restylerOverridesParser =
-  withShownDefault [wildcard] "[\"*\"]"
+  withShownDefault (const "[\"*\"]") [wildcard]
     $ setting
       [ help "Restylers to run, and how"
       , example

src/Restyler/Restyler/Run.hs

@@ -211,7 +211,7 @@ withFilteredPaths restylers paths run = do
   pure $ nonEmpty $ catMaybes mas
 
 addExecutableInterpreter
-  :: (MonadDirectory m, MonadLogger m, MonadReadFile m, MonadUnliftIO m)
+  :: (MonadDirectory m, MonadReadFile m, MonadUnliftIO m)
   => FilePath
   -> m (FilePath, Maybe Interpreter)
 addExecutableInterpreter path = suppressWith (path, Nothing) $ do

stack.yaml

@@ -1,17 +1,4 @@
-resolver: lts-22.38
+resolver: lts-23.5
 extra-deps:
-  - Blammo-2.1.1.0
-  - opt-env-conf-0.7.0.1
-
   - ronn-1.1.1.0
   - ronn-opt-env-conf-1.0.1.0
-
-  # For opt-env-conf
-  - autodocodec-0.4.2.2
-  - autodocodec-nix-0.0.1.4
-  - safe-coloured-text-0.3.0.2
-  - safe-coloured-text-layout-0.2.0.1
-
-  # Versions in resolver are broken by missing NumberBounds
-  - autodocodec-schema-0.2.0.0
-  - autodocodec-yaml-0.4.0.0

stack.yaml.lock

@@ -1,23 +1,9 @@
 # This file was autogenerated by Stack.
 # You should not edit this file by hand.
 # For more information, please see the documentation at:
-#   https://docs.haskellstack.org/en/stable/lock_files
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
 
 packages:
-- completed:
-    hackage: Blammo-2.1.1.0@sha256:29fa7c1411fc3dc87504e3c2d1e903a0077208a51228d779eaa02abf025219c0,4755
-    pantry-tree:
-      sha256: 3b2772b11e465564d2addc7225e33c211538ed96f4212b8d091edc7d9c352672
-      size: 1788
-  original:
-    hackage: Blammo-2.1.1.0
-- completed:
-    hackage: opt-env-conf-0.7.0.1@sha256:4929991c57dc1737d580c0a324d9fd6d92aba32faf376f84ed80216fdf8f8a84,1677
-    pantry-tree:
-      sha256: 8cf9d0d0fc20008aa819f63081b0b2d18f097b198be054c6ce211c6722cb59b5
-      size: 1196
-  original:
-    hackage: opt-env-conf-0.7.0.1
 - completed:
     hackage: ronn-1.1.1.0@sha256:6852148b2cd62b3912f1ca851badbac851e0466ce5998ee9c5dd2435d5ea79f8,2834
     pantry-tree:
@@ -32,51 +18,9 @@ packages:
       size: 486
   original:
     hackage: ronn-opt-env-conf-1.0.1.0
-- completed:
-    hackage: autodocodec-0.4.2.2@sha256:93b72477d84181a62c81b54bcffec31afbe15af987214e66bc408c37b9555b4f,1595
-    pantry-tree:
-      sha256: bfb550c0eeee66eea27efc870c0a1c9a427749b37b613fb50a669328ad0d84f7
-      size: 762
-  original:
-    hackage: autodocodec-0.4.2.2
-- completed:
-    hackage: autodocodec-nix-0.0.1.4@sha256:ceade0ec47191222fa7852089ab8450a886bf6ee583f62e7c4ec5e0185748872,1010
-    pantry-tree:
-      sha256: 46da2de0aa606fc311b1957ca95add2c255fe47aaa65fd8b55900e56220eb1b7
-      size: 229
-  original:
-    hackage: autodocodec-nix-0.0.1.4
-- completed:
-    hackage: safe-coloured-text-0.3.0.2@sha256:691a08a1b0677ab4bca1f715c692fcc9c89fe1488cb1a658bb63a2384c831e17,1116
-    pantry-tree:
-      sha256: 2392cdc2cb82cabc52fdb13c89dc4f798570ff5fc5924c0dce7c63bec590c63c
-      size: 427
-  original:
-    hackage: safe-coloured-text-0.3.0.2
-- completed:
-    hackage: safe-coloured-text-layout-0.2.0.1@sha256:887cd6e1ca5d42cf9192cbf5c7559e81acb13fd3fb3eb5edaccd29a959121bcf,1016
-    pantry-tree:
-      sha256: 39c207b9e0f6bc84ad386f648f83f9cae23e3da69e864f6bd765fd3117e19619
-      size: 241
-  original:
-    hackage: safe-coloured-text-layout-0.2.0.1
-- completed:
-    hackage: autodocodec-schema-0.2.0.0@sha256:a3d39f242ec7f624af4a18f9bdfb4deafcb6415d4ce07fda8c5c7a5fd17b456e,1111
-    pantry-tree:
-      sha256: d620c97840950c717cd46f2175af49dd42281e357d3dae7c63d4922684a7e6e0
-      size: 235
-  original:
-    hackage: autodocodec-schema-0.2.0.0
-- completed:
-    hackage: autodocodec-yaml-0.4.0.0@sha256:3e2d0056d208460e608844c98c5f5ad2189d4e0bf170c402057d45412867af69,1189
-    pantry-tree:
-      sha256: 54f05b1159487e13b87f437601017ddbb015f4d70ec8b09662c19657de93fb08
-      size: 440
-  original:
-    hackage: autodocodec-yaml-0.4.0.0
 snapshots:
 - completed:
-    sha256: 0964f3e2c04e21abf42e271490e6974bc923aac2f2fd595fcb53ad0c237dbed1
-    size: 720034
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/38.yaml
-  original: lts-22.38
+    sha256: 2d580e973dc1a5ff70cd2bb1248613f835829b38eed5db5dafc3615a22cb1bcd
+    size: 679292
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/5.yaml
+  original: lts-23.5