Update to the 9.6/9.8 GHC API

.github/workflows/build-test-deploy.yml

@@ -12,6 +12,7 @@ on:
       - '.github/workflows/*.yml'
     branches:
       - 'master'
+      - '9.8'
   pull_request:
     branches:
       - 'master'
@@ -29,8 +30,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.7']
-        cabal: ['3.4.0.0']
+        ghc: ['9.8', '9.6']
+        cabal: ['3.10.2.1']
 
     steps:
     - uses: actions/checkout@v2
@@ -72,10 +73,10 @@ jobs:
       run: cabal build --enable-tests --enable-benchmarks all
     - name: Run tests
       run: cabal run test
-    - name: Run slow-test
-      run: cabal run slow-test
     - name: Run benchmark
       run: cabal run benchmark
+    - name: Run slow-test
+      run: cabal run slow-test
 
   deploy:
     runs-on: ubuntu-latest
@@ -120,7 +121,7 @@ jobs:
         with:
           context: .
           build-args: |
-            "HASKELL_VERSION=8.10.7"
+            "HASKELL_VERSION=9.6.4"
             "PROPR_VERSION=1.0.0"
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}

Dockerfile

@@ -47,8 +47,7 @@ RUN chmod +x /app/propr
 RUN cabal update
 COPY ./check-helpers /app/check-helpers
 WORKDIR /app/check-helpers
-RUN cabal install --lib check-helpers
-RUN cabal install --lib random QuickCheck
+RUN cabal install --lib check-helpers random QuickCheck
 
 ENV LOG_LEVEL=INFO
 ENV REPAIR_TARGET=/input

PropR.cabal

@@ -1,5 +1,5 @@
+cabal-version: 3.8
 name: PropR
-cabal-version: 1.24
 build-type: Simple
 version: 1.0.0
 author: Matthías Páll Gissurarson
@@ -11,150 +11,118 @@ category: Compiler Plugin
 license: MIT
 license-file: LICENSE
 
-
 library
-  default-language: Haskell2010
+  default-language: GHC2021
   ghc-options: -O2
   hs-source-dirs: src/
   exposed-modules: PropR
-                   PropR.Configuration,
-                   PropR.Eval,
-                   PropR.Plugin,
-                   PropR.Repair,
-                   PropR.Check,
-                   PropR.Traversals,
-                   PropR.Types,
-                   PropR.Diff,
-                   PropR.Util,
-                   PropR.Search,
-                   PropR.Search.PseudoGenetic,
-                   PropR.Search.Genetic,
-                   PropR.Search.Random,
-                   PropR.Search.Exhaustive,
+                   PropR.Configuration
+                   PropR.Eval
+                   PropR.Plugin
+                   PropR.Repair
+                   PropR.Check
+                   PropR.Traversals
+                   PropR.Types
+                   PropR.Diff
+                   PropR.Util
+                   PropR.Search
+                   PropR.Search.PseudoGenetic
+                   PropR.Search.Genetic
+                   PropR.Search.Random
+                   PropR.Search.Exhaustive
                    PropR.Packages
-  other-modules: PropR.Configuration.Configure,
-                 PropR.Configuration.Types,
-                 PropR.Configuration.Materializeable,
-                 PropR.Search.Class,
-                 PropR.Search.Genetic.Configuration,
-                 PropR.Search.Genetic.GenMonad,
-                 PropR.Search.Genetic.Search,
-                 PropR.Search.Genetic.Types,
+  other-modules: PropR.Configuration.Configure
+                 PropR.Configuration.Types
+                 PropR.Configuration.Materializeable
+                 PropR.Search.Class
+                 PropR.Search.Genetic.Configuration
+                 PropR.Search.Genetic.GenMonad
+                 PropR.Search.Genetic.Search
+                 PropR.Search.Genetic.Types
                  PropR.Search.Genetic.Utils
-                 PropR.Search.PseudoGenetic.Configuration,
-                 PropR.Search.PseudoGenetic.Search,
-                 PropR.Search.Random.Configuration,
-                 PropR.Search.Random.Search,
-                 PropR.Search.Exhaustive.Configuration,
+                 PropR.Search.PseudoGenetic.Configuration
+                 PropR.Search.PseudoGenetic.Search
+                 PropR.Search.Random.Configuration
+                 PropR.Search.Random.Search
+                 PropR.Search.Exhaustive.Configuration
                  PropR.Search.Exhaustive.Search
+
   build-depends: base >= 4 && < 5,
-                 ghc >= 8 && < 9,
-                 ghc-boot >= 8 && < 9,
-                 ghc-boot-th >= 8 && < 9,
-                 ghc-paths >= 0.1 && < 0.2,
-                 ghc-prim >= 0.6 && < 0.7,
-                 hpc >= 0.6 && < 0.7,
-                 time >= 1.9 && < 1.10,
-                 directory >= 1.3 && < 1.4,
-                 filepath >= 1.4 && < 1.5,
-                 process >= 1.6 && < 1.7,
-                 containers >= 0.6 && < 0.7,
-                 unix >= 2.7.2 && < 2.8,
-                 lens >= 5.0 && < 5.1,
-                 comonad >= 5.0 && < 5.1,
-                 mwc-random >= 0.15 && < 0.16,
-                 vector >= 0.12 && < 0.13,
-                 async >= 2.2 && < 2.3,
-                 random >= 1.2 && < 1.3,
-                 transformers >= 0.5 && < 0.6,
-                 monad-par >= 0.3 && < 0.4,
-                 monad-par-extras >= 0.3 && < 0.4,
-                 deepseq >= 1.4 && < 1.5,
-                 data-default >= 0.7 && < 0.8,
-                 vector >= 0.12 && < 0.13,
-                 deriving-aeson >= 0.2 && < 0.3,
-                 bytestring >= 0.10 && < 0.11,
-                 splitmix >= 0.1 && < 0.2,
-                 Cabal >= 3.4 && < 3.5,
-                 aeson >= 1.5 && < 1.6
+                 ghc >= 9,
+                 ghc-boot >= 9,
+                 ghc-paths >= 0.1,
+                 ghc-prim >= 0.10,
+                 bytestring >= 0.11,
+                 Cabal >= 3.8,
+                 hpc >= 0.6,
+                 time >= 1.12,
+                 directory >= 1.3,
+                 filepath >= 1.4,
+                 process >= 1.6,
+                 containers >= 0.6,
+                 unix >= 2.8,
+                 lens >= 5,
+                 comonad >= 5.0,
+                 mwc-random >= 0.15,
+                 vector >= 0.13,
+                 async >= 2.2,
+                 random >= 1.2,
+                 transformers >= 0.5,
+                 deepseq >= 1.4,
+                 data-default >= 0.7,
+                 deriving-aeson >= 0.2,
+                 splitmix >= 0.1,
+                 aeson >= 2.1
 
 executable propr
-  default-language: Haskell2010
+  default-language: GHC2021
   main-is: src/Main.hs
   ghc-options: -threaded -O2
   other-modules: Paths_PropR
   build-depends: base >= 4 && < 5,
-                 containers >= 0.6 && < 0.7,
-                 directory >= 1.3 && < 1.4,
-                 ghc >= 8 && < 9,
-                 time >= 1.9 && < 1.10,
-                 data-default >= 0.7 && < 0.8,
-                 optparse-applicative >= 0.16 && < 0.17,
-                 bytestring >= 0.10 && < 0.11,
-                 aeson >= 1.5 && < 1.6,
-                 random >= 1.2 && < 1.3,
+                 optparse-applicative >= 0.17 && < 0.18,
+                 -- these are all specified in the library itself
+                 containers,
+                 directory,
+                 ghc,
+                 time,
+                 data-default,
+                 bytestring,
+                 aeson,
+                 random,
                  PropR
 
 
-test-suite test
-  default-language: Haskell2010
-  type: exitcode-stdio-1.0
+common testing
+  default-language: GHC2021
   hs-source-dirs: tests/
   ghc-options: -threaded -O2
-  main-is: Tests.hs
   other-modules: TestUtils
   build-depends: base >= 4 && < 5,
-                 tasty >= 1.4 && < 1.5,
+                 tasty >= 1.4,
                  tasty-hunit >= 0.10,
                  tasty-quickcheck >= 0.10,
                  tasty-expected-failure >= 0.12,
-                 containers >= 0.6 && < 0.7,
-                 ghc >= 8 && < 9,
-                 hpc >= 0.6 && < 0.7,
-                 data-default >= 0.7 && < 0.8,
-                 directory >= 1.3 && < 1.4,
+                 containers,
+                 ghc,
+                 hpc,
+                 data-default,
+                 directory,
                  PropR,
                  -- packages used in repair:
                  QuickCheck
 
+test-suite test
+  import: testing
+  type: exitcode-stdio-1.0
+  main-is: Tests.hs
+
 test-suite slow-test
-  default-language: Haskell2010
+  import: testing
   type: exitcode-stdio-1.0
-  hs-source-dirs: tests/
-  ghc-options: -threaded -O2
   main-is: SlowTests.hs
-  other-modules: TestUtils
-  build-depends: base >= 4 && < 5,
-                 tasty >= 1.4,
-                 tasty-hunit >= 0.10,
-                 tasty-quickcheck >= 0.10,
-                 tasty-expected-failure >= 0.12,
-                 containers >= 0.6 && < 0.7,
-                 ghc >= 8 && < 9,
-                 hpc >= 0.6 && < 0.7,
-                 data-default >= 0.7 && < 0.8,
-                 directory >= 1.3 && < 1.4,
-                 PropR,
-                 -- packages used in repair:
-                 QuickCheck
 
 benchmark benchmark
-  default-language: Haskell2010
+  import: testing
   type: exitcode-stdio-1.0
-  hs-source-dirs: tests/
-  ghc-options: -threaded -O2
   main-is: Benchmarks.hs
-  other-modules: TestUtils
-  build-depends: base >= 4 && < 5,
-                 tasty >= 1.4,
-                 tasty-hunit >= 0.10,
-                 tasty-quickcheck >= 0.10,
-                 tasty-expected-failure >= 0.12,
-                 containers >= 0.6 && < 0.7,
-                 ghc >= 8 && < 9,
-                 hpc >= 0.6 && < 0.7,
-                 data-default >= 0.7 && < 0.8,
-                 directory >= 1.3 && < 1.4,
-                 PropR,
-                 -- packages used in repair:
-                 QuickCheck

README.md

@@ -35,7 +35,7 @@ These are the versions we currently use - older versions might work too, please
 
 ## Usage
 -----
-This program requires version `3.4` or higher of `cabal`, and version `8.10`  of `ghc`.
+This program requires version `3.4` or higher of `cabal`, and version `9.6` or  `9.8`  of `ghc`.
 A complete environment required to run (minus the `QuickCheck`)
 is defined in `shell.nix`, and can be activated using `nix-shell`, if installed.
 

check-helpers/check-helpers.cabal

@@ -11,6 +11,11 @@ library
   ghc-options: -O2
   hs-source-dirs: ./
   exposed-modules: Check.Helpers
+  reexported-modules: Test.QuickCheck,
+                      Test.QuickCheck.Random,
+                      Test.Tasty,
+                      Test.Tasty.Runners,
+                      Test.Tasty.Ingredients
   build-depends: base >= 4 && < 5,
                  tasty >= 1.4 && < 1.5,
                  containers >= 0.6 && < 0.7,

src/Main.hs

@@ -18,7 +18,6 @@ import qualified Data.Set as Set
 import Data.Time.LocalTime (utc)
 import Data.Version (showVersion)
 import GHC (HsExpr (HsLet), NoExtField (..))
-import GhcPlugins (noLoc)
 import Options.Applicative
 import Options.Applicative.Types (readerAsk)
 import qualified Paths_PropR as PE (version)