Merge pull request #27 from serokell/martoon/bump-base-again

Bump to LTS-21.0 / allow base-1.17
serokell · Jul 12, 2023 · 738c3e8 · 738c3e8
2 parents 1ab0d4b + 00147ef
commit 738c3e8
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 31 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,6 +18,7 @@ jobs:
     strategy:
       matrix:
         ghc:
+          - "9.4.5"
           - "9.2.7"
           - "9.0.1"
           - "8.10.7"

diff --git a/core/CHANGES.md b/core/CHANGES.md
@@ -7,6 +7,10 @@
 # Unreleased
 
 
+# 0.9.2
+
+* Bump upper bound on `base` to <4.19.
+
 # 0.9.1
 
 * Bump upper bound on `base` to <4.17.

diff --git a/core/nyan-interpolation-core.cabal b/core/nyan-interpolation-core.cabal
@@ -1,13 +1,11 @@
 cabal-version: 2.0
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.35.1.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 454835beb066a76fcd19ff1540bc89d3e2f2732ac9d7164ec5903d0eb782bebd
 
 name:           nyan-interpolation-core
-version:        0.9.1
+version:        0.9.2
 synopsis:       Customize your nyan interpolator!
 description:    This package to tune up your own variation of interpolator. Declare new rendering modes, set desired switches defaults and more.
 category:       Interpolation, Text
@@ -66,6 +64,7 @@ library
       RecordWildCards
       ScopedTypeVariables
       StandaloneDeriving
+      StandaloneKindSignatures
       TemplateHaskell
       TupleSections
       TypeFamilies
@@ -74,9 +73,9 @@ library
       TypeApplications
       TypeOperators
       QuasiQuotes
-  ghc-options: -Weverything -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-implicit-prelude -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode -Wno-unused-packages
+  ghc-options: -Weverything -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-implicit-prelude -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode -Wno-unused-packages
   build-depends:
-      base <4.17
+      base <4.19
     , fmt
     , megaparsec
     , mtl
@@ -124,6 +123,7 @@ test-suite nyan-interpolation-core-tests
       RecordWildCards
       ScopedTypeVariables
       StandaloneDeriving
+      StandaloneKindSignatures
       TemplateHaskell
       TupleSections
       TypeFamilies
@@ -132,12 +132,12 @@ test-suite nyan-interpolation-core-tests
       TypeApplications
       TypeOperators
       QuasiQuotes
-  ghc-options: -Weverything -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-implicit-prelude -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode -Wno-unused-packages
+  ghc-options: -Weverything -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-implicit-prelude -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode -Wno-unused-packages
   build-tool-depends:
       tasty-discover:tasty-discover
   build-depends:
       HUnit
-    , base <4.17
+    , base <4.19
     , fmt
     , megaparsec
     , mtl

diff --git a/core/package.yaml b/core/package.yaml
@@ -19,7 +19,7 @@ default-extensions: *default-extensions
 ghc-options: *ghc-options
 
 dependencies:
-  - base <4.17
+  - base <4.19
   - fmt
   - megaparsec
   - mtl

diff --git a/core/src/Text/Interpolation/Nyan/Core/Internal/RMode.hs b/core/src/Text/Interpolation/Nyan/Core/Internal/RMode.hs
@@ -6,6 +6,7 @@ module Text.Interpolation.Nyan.Core.Internal.RMode
   ( RMode(..)
   ) where
 
+import Data.Kind (Type)
 import Fmt (Builder)
 
 {- | Type that describes rendering modes.
@@ -30,4 +31,5 @@ More precisely, any @#xxx{expr}@ in interpolator will be expanded to
 "Value is 0x20"
 
 -}
+type RMode :: Type -> Type
 newtype RMode a = RMode { renderWithMode :: a -> Builder }
diff --git a/core/tests/Test/Util.hs b/core/tests/Test/Util.hs
@@ -91,6 +91,9 @@ instance Quasi TestQ where
   qAddCorePlugin a = liftToTestQ $ qAddCorePlugin a
   qGetQ = liftToTestQ qGetQ
   qPutQ a = liftToTestQ $ qPutQ a
+  qGetDoc a = liftToTestQ $ qGetDoc a
+  qPutDoc a b = liftToTestQ $ qPutDoc a b
+  qGetPackageRoot = liftToTestQ $ qGetPackageRoot
 
 -- * Interpolators
 

diff --git a/full/nyan-interpolation.cabal b/full/nyan-interpolation.cabal
@@ -1,13 +1,11 @@
 cabal-version: 2.0
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.35.1.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: a77f2eae2cfd2c173f77963a2f6af54c0547b52b2841f478fa358fb6756a163c
 
 name:           nyan-interpolation
-version:        0.9.1
+version:        0.9.2
 synopsis:       Flexible production-scale string interpolation library
 description:    Interpolation library tuneable to your project and your best practices. It supports custom rendering (via Buildable, Show), numerious modification options (like spaces and indentation stripping), and more.
 category:       Interpolation, Text
@@ -59,6 +57,7 @@ library
       RecordWildCards
       ScopedTypeVariables
       StandaloneDeriving
+      StandaloneKindSignatures
       TemplateHaskell
       TupleSections
       TypeFamilies
@@ -67,9 +66,9 @@ library
       TypeApplications
       TypeOperators
       QuasiQuotes
-  ghc-options: -Weverything -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-implicit-prelude -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode -Wno-unused-packages
+  ghc-options: -Weverything -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-implicit-prelude -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode -Wno-unused-packages
   build-depends:
-      base <4.17
+      base <4.19
     , fmt
     , haskell-src-exts
     , haskell-src-meta
@@ -114,6 +113,7 @@ test-suite nyan-interpolation-tests
       RecordWildCards
       ScopedTypeVariables
       StandaloneDeriving
+      StandaloneKindSignatures
       TemplateHaskell
       TupleSections
       TypeFamilies
@@ -122,12 +122,12 @@ test-suite nyan-interpolation-tests
       TypeApplications
       TypeOperators
       QuasiQuotes
-  ghc-options: -Weverything -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-implicit-prelude -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode -Wno-unused-packages
+  ghc-options: -Weverything -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-implicit-prelude -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode -Wno-unused-packages
   build-tool-depends:
       tasty-discover:tasty-discover
   build-depends:
       HUnit
-    , base <4.17
+    , base <4.19
     , fmt
     , haskell-src-exts
     , haskell-src-meta

diff --git a/full/package.yaml b/full/package.yaml
@@ -19,7 +19,7 @@ default-extensions: *default-extensions
 ghc-options: *ghc-options
 
 dependencies:
-  - base <4.17
+  - base <4.19
   - fmt  # need a direct dep to link things in haddock
   - haskell-src-exts
   - haskell-src-meta

diff --git a/hpack/definitions.yaml b/hpack/definitions.yaml
@@ -8,7 +8,7 @@
 _definitions:
   _top-level:
     - &meta
-      version: 0.9.1
+      version: 0.9.2
       github: serokell/nyan-interpolation
       license: MPL-2.0
       license-file: LICENSE
@@ -40,6 +40,7 @@ _definitions:
       - RecordWildCards
       - ScopedTypeVariables
       - StandaloneDeriving
+      - StandaloneKindSignatures
       - TemplateHaskell
       - TupleSections
       - TypeFamilies
@@ -54,6 +55,7 @@ _definitions:
       - -Wno-missing-export-lists
       - -Wno-missing-exported-signatures
       - -Wno-missing-import-lists
+      - -Wno-missing-kind-signatures
       - -Wno-missed-specialisations
       - -Wno-all-missed-specialisations
       - -Wno-unsafe

diff --git a/simple/nyan-interpolation-simple.cabal b/simple/nyan-interpolation-simple.cabal
@@ -1,13 +1,11 @@
 cabal-version: 2.0
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.35.1.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 3ec4653947d7d52aad6fc03fff069713840f6b334e560a138a0906d8b6b94155
 
 name:           nyan-interpolation-simple
-version:        0.9.1
+version:        0.9.2
 synopsis:       Simplified lightweight interpolation
 description:    This is a variation of 'nyan-interpolation' library that has no `haskell-src-exts` dependency, at the cost of not being able to interpolate arbitrary exressions, only variables.
 category:       Interpolation, Text
@@ -57,6 +55,7 @@ library
       RecordWildCards
       ScopedTypeVariables
       StandaloneDeriving
+      StandaloneKindSignatures
       TemplateHaskell
       TupleSections
       TypeFamilies
@@ -65,9 +64,9 @@ library
       TypeApplications
       TypeOperators
       QuasiQuotes
-  ghc-options: -Weverything -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-implicit-prelude -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode -Wno-unused-packages
+  ghc-options: -Weverything -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-implicit-prelude -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode -Wno-unused-packages
   build-depends:
-      base <4.17
+      base <4.19
     , nyan-interpolation-core
     , text
   default-language: Haskell2010
diff --git a/simple/package.yaml b/simple/package.yaml
@@ -20,7 +20,7 @@ default-extensions: *default-extensions
 ghc-options: *ghc-options
 
 dependencies:
-  - base <4.17
+  - base <4.19
   - nyan-interpolation-core
   - text
 

diff --git a/stack.yaml b/stack.yaml
@@ -1,7 +1,7 @@
 # Note: when updating this file, you may also need
 # to update other stack-*.yaml files.
 
-resolver: lts-19.33
+resolver: lts-21.0
 
 packages:
   - core

diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 619204
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml
-    sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4
-  original: lts-19.33
+    sha256: 1867d84255dff8c87373f5dd03e5a5cb1c10a99587e26c8793e750c54e83ffdc
+    size: 639139
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/0.yaml
+  original: lts-21.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ jobs: @@
         strategy:
           matrix:
             ghc:
+              - "9.4.5"
               - "9.2.7"
               - "9.0.1"
               - "8.10.7"
@@ Expand Down @@