Merge pull request #164 from well-typed/edsko/large-records-0.4.2

Release 0.4.2
well-typed · Oct 15, 2024 · cd652eb · cd652eb
2 parents 9f414d3 + 6ed7129
commit cd652eb
Show file tree

Hide file tree

Showing 56 changed files with 159 additions and 160 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20240514
+# version: 0.19.20240708
 #
-# REGENDATA ("0.19.20240514",["github","cabal.project"])
+# REGENDATA ("0.19.20240708",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -32,9 +32,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.6.4
+          - compiler: ghc-9.6.6
             compilerKind: ghc
-            compilerVersion: 9.6.4
+            compilerVersion: 9.6.6
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.4.8
@@ -59,10 +59,10 @@ jobs:
           apt-get update
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
           mkdir -p "$HOME/.ghcup/bin"
-          curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
+          curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
           "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
-          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -80,7 +80,7 @@ jobs:
           echo "HC=$HC" >> "$GITHUB_ENV"
           echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
           echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
           HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -139,8 +139,8 @@ jobs:
       - name: install cabal-docspec
         run: |
           mkdir -p $HOME/.cabal/bin
-          curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz > cabal-docspec.xz
-          echo '2d18a3f79619e8ec5f11870f926f6dc2616e02a6c889315b7f82044b95a1adb9  cabal-docspec.xz' | sha256sum -c -
+          curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240703/cabal-docspec-0.0.0.20240703-x86_64-linux.xz > cabal-docspec.xz
+          echo '48bf3b7fd2f7f0caa6162afee57a755be8523e7f467b694900eb420f5f9a7b76  cabal-docspec.xz' | sha256sum -c -
           xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
           rm -f cabal-docspec.xz
           chmod a+x $HOME/.cabal/bin/cabal-docspec
@@ -205,20 +205,20 @@ jobs:
           cat >> cabal.project <<EOF
           source-repository-package
             type:     git
-            location: https://github.com/well-typed/beam
-            tag:      57a12e68727c027f0f1c25752f8c5704ddbe1516
+            location: https://github.com/haskell-beam/beam.git
+            tag:      3b0c00bbaebfe879c1461287a1d843c8223fee54
             subdir:   beam-core
 
           source-repository-package
             type:     git
-            location: https://github.com/well-typed/beam
-            tag:      57a12e68727c027f0f1c25752f8c5704ddbe1516
+            location: https://github.com/haskell-beam/beam.git
+            tag:      3b0c00bbaebfe879c1461287a1d843c8223fee54
             subdir:   beam-migrate
 
           source-repository-package
             type:     git
-            location: https://github.com/well-typed/beam
-            tag:      57a12e68727c027f0f1c25752f8c5704ddbe1516
+            location: https://github.com/haskell-beam/beam.git
+            tag:      3b0c00bbaebfe879c1461287a1d843c8223fee54
             subdir:   beam-sqlite
 
           package large-generics

diff --git a/beam-large-records/beam-large-records.cabal b/beam-large-records/beam-large-records.cabal
@@ -11,7 +11,7 @@ author:             Edsko de Vries
 maintainer:         [email protected]
 category:           Database
 extra-source-files: CHANGELOG.md
-tested-with:        GHC ==8.10.7 || ==9.2.8 || ==9.4.8 || ==9.6.4
+tested-with:        GHC ==8.10.7 || ==9.2.8 || ==9.4.8 || ==9.6.6
 
 source-repository head
   type:     git
@@ -74,6 +74,7 @@ test-suite test-beam-large-records
     , beam-core
     , beam-large-records
     , beam-sqlite
+    , ghc-prim
     , large-generics
     , large-records
     , microlens

diff --git a/beam-large-records/test/Test/Record/Beam/Andres.hs b/beam-large-records/test/Test/Record/Beam/Andres.hs
@@ -28,7 +28,6 @@ import Control.Applicative
 import Data.Functor.Identity
 import Data.Kind
 import Data.Proxy
-import Data.Record.Plugin
 import Database.Beam
 import Database.Beam.Schema.Tables
 import GHC.Records.Compat

diff --git a/beam-large-records/test/Test/Record/Beam/SimpleSQL.hs b/beam-large-records/test/Test/Record/Beam/SimpleSQL.hs
@@ -27,7 +27,6 @@ module Test.Record.Beam.SimpleSQL (
 
 import Data.Int
 import Data.Kind
-import Data.Record.Plugin
 import Data.Text (Text)
 import Database.Beam
 

diff --git a/beam-large-records/test/Test/Record/Beam/Tutorial1.hs b/beam-large-records/test/Test/Record/Beam/Tutorial1.hs
@@ -32,7 +32,6 @@ import Data.Functor.Identity
 import Data.Int
 import Data.Kind
 import Data.Record.Beam ()
-import Data.Record.Plugin
 import Data.Text (Text)
 import Database.Beam hiding (Generic, countAll_)
 import Database.Beam.Schema.Tables

diff --git a/beam-large-records/test/Test/Record/Beam/Tutorial2.hs b/beam-large-records/test/Test/Record/Beam/Tutorial2.hs
@@ -32,7 +32,6 @@ module Test.Record.Beam.Tutorial2 (
 import Data.Functor.Const
 import Data.Int
 import Data.Kind
-import Data.Record.Plugin
 import Data.Text (Text)
 import Database.Beam
 import Database.Beam.Schema.Tables

diff --git a/beam-large-records/test/Test/Record/Beam/Tutorial3.hs b/beam-large-records/test/Test/Record/Beam/Tutorial3.hs
@@ -28,7 +28,6 @@ import Prelude hiding (product)
 
 import Data.Int
 import Data.Kind
-import Data.Record.Plugin
 import Data.Text (Text)
 import Data.Time
 import Database.Beam hiding (countAll_)

diff --git a/beam-large-records/test/Test/Record/Beam/Zipping.hs b/beam-large-records/test/Test/Record/Beam/Zipping.hs
@@ -21,7 +21,6 @@ module Test.Record.Beam.Zipping (tests) where
 
 import Data.Functor.Identity
 import Data.Kind
-import Data.Record.Plugin
 import Database.Beam
 import Database.Beam.Schema.Tables
 import Test.Tasty

diff --git a/large-anon/large-anon.cabal b/large-anon/large-anon.cabal
@@ -12,7 +12,7 @@ maintainer:         [email protected]
 category:           Records
 extra-source-files: CHANGELOG.md
                     test/Test/Sanity/RebindableSyntax/Tests.hs
-tested-with:        GHC ==8.10.7 || ==9.2.8 || ==9.4.8 || ==9.6.4
+tested-with:        GHC ==8.10.7 || ==9.2.8 || ==9.4.8 || ==9.6.6
 
 library
   exposed-modules:

diff --git a/large-generics/large-generics.cabal b/large-generics/large-generics.cabal
@@ -13,7 +13,7 @@ author:             Edsko de Vries
 maintainer:         [email protected]
 category:           Generics
 extra-source-files: CHANGELOG.md
-tested-with:        GHC ==8.10.7 || ==9.2.8 || ==9.4.8 || ==9.6.4
+tested-with:        GHC ==8.10.7 || ==9.2.8 || ==9.4.8 || ==9.6.6
 
 library
   exposed-modules:
@@ -47,7 +47,7 @@ library
     , deepseq      >= 1.4.4 && < 1.6
     , generics-sop >= 0.5   && < 0.6
     , sop-core     >= 0.5   && < 0.6
-    , primitive    >= 0.8   && < 0.10
+    , primitive    >= 0.7.3 && < 0.10
 
   if impl(ghc >= 8.10)
     ghc-options: -Wunused-packages

diff --git a/large-records-benchmarks/bench/after/After/Sized/R010.hs b/large-records-benchmarks/bench/after/After/Sized/R010.hs
@@ -23,7 +23,6 @@ module After.Sized.R010 where
 
 import Data.Aeson (ToJSON(..))
 import Data.Record.Generic.JSON
-import Data.Record.Plugin
 
 import Bench.Types
 

diff --git a/large-records-benchmarks/bench/after/After/Sized/R020.hs b/large-records-benchmarks/bench/after/After/Sized/R020.hs
@@ -23,7 +23,6 @@ module After.Sized.R020 where
 
 import Data.Aeson (ToJSON(..))
 import Data.Record.Generic.JSON
-import Data.Record.Plugin
 
 import Bench.Types
 

diff --git a/large-records-benchmarks/bench/after/After/Sized/R030.hs b/large-records-benchmarks/bench/after/After/Sized/R030.hs
@@ -23,7 +23,6 @@ module After.Sized.R030 where
 
 import Data.Aeson (ToJSON(..))
 import Data.Record.Generic.JSON
-import Data.Record.Plugin
 
 import Bench.Types
 

diff --git a/large-records-benchmarks/bench/after/After/Sized/R040.hs b/large-records-benchmarks/bench/after/After/Sized/R040.hs
@@ -23,7 +23,6 @@ module After.Sized.R040 where
 
 import Data.Aeson (ToJSON(..))
 import Data.Record.Generic.JSON
-import Data.Record.Plugin
 
 import Bench.Types
 

diff --git a/large-records-benchmarks/bench/after/After/Sized/R050.hs b/large-records-benchmarks/bench/after/After/Sized/R050.hs
@@ -23,7 +23,6 @@ module After.Sized.R050 where
 
 import Data.Aeson (ToJSON(..))
 import Data.Record.Generic.JSON
-import Data.Record.Plugin
 
 import Bench.Types
 

diff --git a/large-records-benchmarks/bench/after/After/Sized/R060.hs b/large-records-benchmarks/bench/after/After/Sized/R060.hs
@@ -23,7 +23,6 @@ module After.Sized.R060 where
 
 import Data.Aeson (ToJSON(..))
 import Data.Record.Generic.JSON
-import Data.Record.Plugin
 
 import Bench.Types
 

diff --git a/large-records-benchmarks/bench/after/After/Sized/R070.hs b/large-records-benchmarks/bench/after/After/Sized/R070.hs
@@ -23,7 +23,6 @@ module After.Sized.R070 where
 
 import Data.Aeson (ToJSON(..))
 import Data.Record.Generic.JSON
-import Data.Record.Plugin
 
 import Bench.Types
 

diff --git a/large-records-benchmarks/bench/after/After/Sized/R080.hs b/large-records-benchmarks/bench/after/After/Sized/R080.hs
@@ -23,7 +23,6 @@ module After.Sized.R080 where
 
 import Data.Aeson (ToJSON(..))
 import Data.Record.Generic.JSON
-import Data.Record.Plugin
 
 import Bench.Types
 

diff --git a/large-records-benchmarks/bench/after/After/Sized/R090.hs b/large-records-benchmarks/bench/after/After/Sized/R090.hs
@@ -23,7 +23,6 @@ module After.Sized.R090 where
 
 import Data.Aeson (ToJSON(..))
 import Data.Record.Generic.JSON
-import Data.Record.Plugin
 
 import Bench.Types
 

diff --git a/large-records-benchmarks/bench/after/After/Sized/R100.hs b/large-records-benchmarks/bench/after/After/Sized/R100.hs
@@ -23,7 +23,6 @@ module After.Sized.R100 where
 
 import Data.Aeson (ToJSON(..))
 import Data.Record.Generic.JSON
-import Data.Record.Plugin
 
 import Bench.Types
 

diff --git a/large-records-benchmarks/bench/after/HigherKinded/Sized/R010.hs b/large-records-benchmarks/bench/after/HigherKinded/Sized/R010.hs
@@ -21,8 +21,6 @@
 
 module HigherKinded.Sized.R010 where
 
-import Data.Record.Plugin
-
 import Bench.Types
 
 {-# ANN type R largeRecord #-}

diff --git a/large-records-benchmarks/bench/after/HigherKinded/Sized/R020.hs b/large-records-benchmarks/bench/after/HigherKinded/Sized/R020.hs
@@ -21,8 +21,6 @@
 
 module HigherKinded.Sized.R020 where
 
-import Data.Record.Plugin
-
 import Bench.Types
 
 {-# ANN type R largeRecord #-}

diff --git a/large-records-benchmarks/bench/after/HigherKinded/Sized/R030.hs b/large-records-benchmarks/bench/after/HigherKinded/Sized/R030.hs
@@ -21,8 +21,6 @@
 
 module HigherKinded.Sized.R030 where
 
-import Data.Record.Plugin
-
 import Bench.Types
 
 {-# ANN type R largeRecord #-}

diff --git a/large-records-benchmarks/bench/after/HigherKinded/Sized/R040.hs b/large-records-benchmarks/bench/after/HigherKinded/Sized/R040.hs
@@ -21,8 +21,6 @@
 
 module HigherKinded.Sized.R040 where
 
-import Data.Record.Plugin
-
 import Bench.Types
 
 {-# ANN type R largeRecord #-}

diff --git a/large-records-benchmarks/bench/after/HigherKinded/Sized/R050.hs b/large-records-benchmarks/bench/after/HigherKinded/Sized/R050.hs
@@ -21,8 +21,6 @@
 
 module HigherKinded.Sized.R050 where
 
-import Data.Record.Plugin
-
 import Bench.Types
 
 {-# ANN type R largeRecord #-}

diff --git a/large-records-benchmarks/bench/after/HigherKinded/Sized/R060.hs b/large-records-benchmarks/bench/after/HigherKinded/Sized/R060.hs
@@ -21,8 +21,6 @@
 
 module HigherKinded.Sized.R060 where
 
-import Data.Record.Plugin
-
 import Bench.Types
 
 {-# ANN type R largeRecord #-}

diff --git a/large-records-benchmarks/bench/after/HigherKinded/Sized/R070.hs b/large-records-benchmarks/bench/after/HigherKinded/Sized/R070.hs
@@ -21,8 +21,6 @@
 
 module HigherKinded.Sized.R070 where
 
-import Data.Record.Plugin
-
 import Bench.Types
 
 {-# ANN type R largeRecord #-}

diff --git a/large-records-benchmarks/bench/after/HigherKinded/Sized/R080.hs b/large-records-benchmarks/bench/after/HigherKinded/Sized/R080.hs
@@ -21,8 +21,6 @@
 
 module HigherKinded.Sized.R080 where
 
-import Data.Record.Plugin
-
 import Bench.Types
 
 {-# ANN type R largeRecord #-}

diff --git a/large-records-benchmarks/bench/after/HigherKinded/Sized/R090.hs b/large-records-benchmarks/bench/after/HigherKinded/Sized/R090.hs
@@ -21,8 +21,6 @@
 
 module HigherKinded.Sized.R090 where
 
-import Data.Record.Plugin
-
 import Bench.Types
 
 {-# ANN type R largeRecord #-}

diff --git a/large-records-benchmarks/bench/after/HigherKinded/Sized/R100.hs b/large-records-benchmarks/bench/after/HigherKinded/Sized/R100.hs
@@ -21,8 +21,6 @@
 
 module HigherKinded.Sized.R100 where
 
-import Data.Record.Plugin
-
 import Bench.Types
 
 {-# ANN type R largeRecord #-}

diff --git a/large-records-benchmarks/large-records-benchmarks.cabal b/large-records-benchmarks/large-records-benchmarks.cabal
@@ -131,6 +131,7 @@ executable bench-before
   build-depends:
     , aeson
     , generics-sop
+    , ghc-prim
     , json-sop
     , record-dot-preprocessor
     , record-hasfield
@@ -159,7 +160,8 @@ executable bench-after
       -- Needed for the HasNormalForm benchmark
       -freduction-depth=2000
   build-depends:
-      aeson
+    , aeson
+    , ghc-prim
     , large-generics
     , large-records
     , record-hasfield
@@ -656,8 +658,9 @@ test-suite test-large-records-benchmarks
       bench/before
       bench/experiments
   build-depends:
-      aeson
+    , aeson
     , generics-sop
+    , ghc-prim
     , json-sop
     , large-generics
     , large-records

diff --git a/large-records/CHANGELOG.md b/large-records/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Revision history for large-records
 
+## 0.4.2 -- 2024-10-15
+
+* Support `primitive-0.7.3` (#159, Isaac Elliott).
+* Plugin idempotence (#159, Isaac Elliott).
+* Document required additional dependencies and language extensions (#161).
+* Use `Exact` names for `Prelude` imports, to avoid unexpected clashes (#162).
+
+Notes:
+
+* If your code imports `Data.Plugin.Record` only for the `largeRecord`
+  identifier used in the `ANN` annotations, this import is no longer required as
+  of this version and can be omitted.
+* In addition to `large-generics` and `record-hasfield` you will now also need
+  to declare a dependency on `ghc-prim`.
+
 ## 0.4.1 -- 2024-05-30
 
 * Support ghc 9.6 (and drop ghc <= 8.8)