Merge pull request #17 from haskell-works/upgrade-to-cabal-file-versi…

…on-2.2 Upgrade to cabal file version 2.2
haskell-works · May 17, 2019 · a730588 · a730588
2 parents 20da746 + c6ab313
commit a730588
Showing 1 changed file with 62 additions and 53 deletions.
diff --git a/hw-excess.cabal b/hw-excess.cabal
@@ -1,64 +1,73 @@
-cabal-version: 1.12
-name:           hw-excess
-version:        0.2.0.2
-synopsis:       Excess
-description:    Please see README.md
-category:       Data, Succinct Data Structures, Data Structures
-homepage:       http://github.com/haskell-works/hw-excess#readme
-bug-reports:    https://github.com/haskell-works/hw-excess/issues
-author:         John Ky
-maintainer:     newhoggy@gmail.com
-copyright:      2016 John Ky
-license:        BSD3
-license-file:   LICENSE
-tested-with:    GHC == 8.4.2, GHC == 8.2.2, GHC == 7.10.3
-build-type:     Simple
+cabal-version:        2.2
+
+name:                 hw-excess
+version:              0.2.0.2
+synopsis:             Excess
+description:          Please see README.md
+category:             Data, Succinct Data Structures, Data Structures
+homepage:             http://github.com/haskell-works/hw-excess#readme
+bug-reports:          https://github.com/haskell-works/hw-excess/issues
+author:               John Ky
+maintainer:           newhoggy@gmail.com
+copyright:            2016 John Ky
+license:              BSD-3-Clause
+license-file:         LICENSE
+tested-with:          GHC == 8.6.5, GHC == 8.4.4, GHC == 8.2.2
+build-type:           Simple
 extra-source-files:
-    README.md
+  README.md
 
 source-repository head
   type: git
   location: https://github.com/haskell-works/hw-excess
 
+common base               { build-depends: base               >= 4.8      &&  < 5     }
+
+common QuickCheck         { build-depends: QuickCheck         >= 2.10     && < 2.12   }
+common hspec              { build-depends: hspec              >= 2.3      && < 2.6    }
+common hw-bits            { build-depends: hw-bits            >= 0.4.0.0  && < 0.8    }
+common hw-prim            { build-depends: hw-prim            >= 0.4.0.0  && < 0.8    }
+common hw-rankselect-base { build-depends: hw-rankselect-base >= 0.2.0.0  && < 0.4    }
+common safe               { build-depends: safe               >= 0.2      && < 0.4    }
+common vector             { build-depends: vector             >= 0.12     && < 0.13   }
+
+common config
+  default-language:     Haskell2010
+
 library
+  import:   base, config
+    , hw-bits
+    , hw-prim
+    , hw-rankselect-base
+    , safe
+    , vector
   exposed-modules:
-      HaskellWorks.Data.Excess
-      HaskellWorks.Data.Excess.Excess0
-      HaskellWorks.Data.Excess.Excess1
-      HaskellWorks.Data.Excess.MinMaxExcess0
-      HaskellWorks.Data.Excess.MinMaxExcess1
-      HaskellWorks.Data.Excess.Triplet
-  other-modules:
-      Paths_hw_excess
-  hs-source-dirs:
-      src
-  ghc-options: -Wall -O2 -msse4.2
-  build-depends:
-      base >=4.8 && <5
-    , hw-bits >=0.4.0.0 && <0.8
-    , hw-prim >=0.4.0.0 && <0.8
-    , hw-rankselect-base >=0.2.0.0 && <0.4
-    , safe >=0.2 && <0.4
-    , vector >=0.12 && <0.13
-  default-language: Haskell2010
+    HaskellWorks.Data.Excess
+    HaskellWorks.Data.Excess.Excess0
+    HaskellWorks.Data.Excess.Excess1
+    HaskellWorks.Data.Excess.MinMaxExcess0
+    HaskellWorks.Data.Excess.MinMaxExcess1
+    HaskellWorks.Data.Excess.Triplet
+  autogen-modules:      Paths_hw_excess
+  other-modules:        Paths_hw_excess
+  hs-source-dirs:       src
+  ghc-options:          -Wall -O2 -msse4.2
 
 test-suite hw-excess-test
-  type: exitcode-stdio-1.0
-  main-is: Spec.hs
+  import:   base, config
+          , QuickCheck
+          , hspec
+          , hw-bits
+          , hw-prim
+          , vector
+  type:                 exitcode-stdio-1.0
+  main-is:              Spec.hs
+  hs-source-dirs:       test
+  ghc-options:          -Wall -threaded -rtsopts -with-rtsopts=-N
+  build-tool-depends:   hspec-discover:hspec-discover
+  build-depends:        hw-excess
+  autogen-modules:      Paths_hw_excess
   other-modules:
-      HaskellWorks.Data.Excess.MinMaxExcess0Spec
-      HaskellWorks.Data.Excess.MinMaxExcess1Spec
-      Paths_hw_excess
-  hs-source-dirs:
-      test
-  ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
-  build-depends:
-      QuickCheck >=2.10 && <2.12
-    , base >=4.8 && <5
-    , hspec >=2.3 && <2.6
-    , hw-bits >=0.4.0.0 && <0.8
-    , hw-excess
-    , hw-prim >=0.4.0.0 && <0.8
-    , vector >=0.12 && <0.13
-  default-language: Haskell2010
-  build-tool-depends: hspec-discover:hspec-discover
+    HaskellWorks.Data.Excess.MinMaxExcess0Spec
+    HaskellWorks.Data.Excess.MinMaxExcess1Spec
+    Paths_hw_excess