Fix/text 2.1.2 fix and container bump

.github/workflows/ci.yml

@@ -18,16 +18,11 @@ jobs:
           - macOS-latest
         cabal: ["latest"]
         ghc:
-          - "9.0.2"
           - "9.2.8"
           - "9.4.8"
           - "9.6.6"
-          - "9.8.2"
+          - "9.8.4"
           - "9.10.1"
-        exclude:
-          - os: "macOS-latest"
-            ghc: "9.0.2"
-
 
     steps:
     - uses: actions/checkout@v4
@@ -69,11 +64,11 @@ jobs:
       matrix:
         stack: ["latest"]
         resolver:
-          - "--resolver lts-19" # GHC 9.0.2
           - "--resolver lts-20" # GHC 9.2.8
           - "--resolver lts-21" # GHC 9.4.8
           - "--resolver lts-22" # GHC 9.6.6
-          - "--resolver nightly" # GHC 9.8.3
+          - "--resolver lts-23" # GHC 9.8.4
+          - "--resolver nightly" # GHC 9.10.1
 
     steps:
     - uses: actions/checkout@v4

ChangeLog.md

@@ -1,5 +1,11 @@
 # Changelog for safe-json
 
+## 1.2.1.0
+
+* Bumped upper bound of `containers` to `< 0.9`
+* Adjusted test modules to build with `text-2.1.2`
+* Dropped testing with GHC `9.0.2`
+
 ## 1.2.0.2
 
 * Make the test build with `quickcheck-instances-0.3.32`

package.yaml

@@ -1,5 +1,5 @@
 name:                safe-json
-version:             1.2.0.2
+version:             1.2.1.0
 github:              "Vlix/safe-json"
 license:             MIT
 author:              "Felix Paulusma"
@@ -8,11 +8,10 @@ copyright:           "2019 Felix Paulusma"
 # Metadata used when publishing your package
 synopsis:            Automatic JSON format versioning
 category:            "JSON"
-tested-with:         GHC == 9.0.2
-                   , GHC == 9.2.8
+tested-with:         GHC == 9.2.8
                    , GHC == 9.4.8
                    , GHC == 9.6.6
-                   , GHC == 9.8.3
+                   , GHC == 9.8.4
                    , GHC == 9.10.1
 
 extra-source-files:
@@ -52,7 +51,7 @@ description: >
 dependencies:
 - base                  >= 4.9        && < 5
 - bytestring            >= 0.10.8.1   && < 1
-- containers            >= 0.5.7.1    && < 0.8
+- containers            >= 0.5.7.1    && < 0.9
 - dlist                 >= 0.8.0.3    && < 2
 - hashable              >= 1.2.6.1    && < 1.6
 - scientific            >= 0.3.5.2    && < 0.4

safe-json.cabal

@@ -65,7 +65,7 @@ library
       aeson >=1.4.1 && <2.3
     , base >=4.9 && <5
     , bytestring >=0.10.8.1 && <1
-    , containers >=0.5.7.1 && <0.8
+    , containers >=0.5.7.1 && <0.9
     , dlist >=0.8.0.3 && <2
     , hashable >=1.2.6.1 && <1.6
     , scientific >=0.3.5.2 && <0.4
@@ -102,7 +102,7 @@ test-suite safe-json-test
   build-depends:
       base >=4.9 && <5
     , bytestring >=0.10.8.1 && <1
-    , containers >=0.5.7.1 && <0.8
+    , containers >=0.5.7.1 && <0.9
     , dlist >=0.8.0.3 && <2
     , hashable >=1.2.6.1 && <1.6
     , quickcheck-instances >=0.3.16 && <0.4

test/Types.hs

@@ -13,7 +13,8 @@ import Data.Maybe (isJust)
 #else
 import Data.Monoid ((<>))
 #endif
-import Data.Text as T
+import Data.Text (Text)
+import qualified Data.Text as T
 import Data.Time (UTCTime)
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
 import Data.UUID as UUID
@@ -83,11 +84,11 @@ instance ToJSON Version1 where
 
 instance Migrate Version1 where
   type MigrateFrom Version1 = NoVersion
-  migrate (NoVersion i) = Version1 . pack . show $ i
+  migrate (NoVersion i) = Version1 . T.pack . show $ i
 
 instance Migrate (Reverse Version1) where
   type MigrateFrom (Reverse Version1) = Version2
-  migrate (Version2 ts) = Reverse . Version1 $ intercalate ", " ts
+  migrate (Version2 ts) = Reverse . Version1 $ T.intercalate ", " ts
 
 
 newtype Version2 = Version2 [Text] deriving (Eq, Show)