Disable hgeometry dependency and bump version. (#282)

.azure/azure-linux-template.yml

@@ -24,7 +24,7 @@ jobs:
   steps:
   - task: Cache@2
     inputs:
-      key: ${{ parameters.name }} | ${{ parameters.vmImage }} | $(ARGS) | $(STACK_YAML) | stack-root | $(Agent.OS)
+      key: ${{ parameters.name }} | ${{ parameters.vmImage }} | $(ARGS) | $(STACK_YAML) | stack-root | $(Agent.OS) | v2
       path: $(STACK_ROOT)
       cacheHitVar: CACHE_RESTORED
     displayName: Cache stack root

ChangeLog.md

@@ -5,6 +5,9 @@ Notable changes to the project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and the
 project adheres to the [Haskell Package Versioning
 Policy (PVP)](https://pvp.haskell.org)
+## 1.1.6.0 -- 2022-06-02
+
+ * Drop hgeometry dependency.
 
 ## 1.1.4.0 -- 2021-03-11
 

reanimate.cabal

@@ -3,7 +3,7 @@ cabal-version:       2.0
 --  see http://haskell.org/cabal/users-guide/
 
 name:                reanimate
-version:             1.1.5.0
+version:             1.1.6.0
 -- synopsis:
 -- description:
 license:             PublicDomain
@@ -37,13 +37,6 @@ Source-Repository head
     Type:      git
     Location:  git://github.com/lemmih/reanimate.git
 
-flag no-hgeometry
-  description:
-    Disable all features that depend on hgeometry. Should only
-    be used when developing new hgeometry algorithms.
-  default: False
-  manual: True
-
 library
   hs-source-dirs:     src
   if os(windows)
@@ -113,12 +106,7 @@ library
                       Detach
                       POVRay
   autogen-modules:    Paths_reanimate
-  if flag(no-hgeometry)
-    cpp-options: -DNO_HGEOMETRY
-  else
-    build-depends:
-      hgeometry               >=0.11.0.0 && < 0.14,
-      hgeometry-combinatorial >=0.11.0.0 && < 0.14
+  cpp-options: -DNO_HGEOMETRY
   build-depends:
     base                 >=4.10 && <5,
     JuicyPixels          >=3.3.3,
@@ -178,6 +166,7 @@ test-suite spec
     Helpers
   hs-source-dirs: test
   ghc-options: -w
+  cpp-options: -DNO_HGEOMETRY
   build-depends:
     base,
     directory,

src/Reanimate/PolyShape.hs

@@ -41,7 +41,7 @@ module Reanimate.PolyShape
   , plGroupTouching
   ) where
 
-import           Control.Lens                                         ((&), (.~), (^.))
+import           Control.Lens                                         ((&), (.~))
 import           Data.List                                            (nub, partition, sortOn)
 import qualified Data.Vector                                          as V
 import           Geom2D.CubicBezier.Linear                            (ClosedPath (..),
@@ -67,6 +67,7 @@ import           Reanimate.Math.Polygon                               (Polygon,
 import           Reanimate.Svg
 
 #if !defined(NO_HGEOMETRY)
+import           Control.Lens                                         ((^.))
 import           Algorithms.Geometry.PolygonTriangulation.Triangulate (triangulate')
 
 import           Data.Ext

stack-lts-14.yaml

@@ -14,8 +14,6 @@ extra-deps:
 - hmatrix-0.20.0.0@sha256:d79a9218e314f1a2344457c3851bd1d2536518ecb5f1a2fcd81daa45e46cd025,4870
 - earcut-0.1.0.4@sha256:d5118b3eecf24d130263d81fb30f1ff56b1db43036582bfd1d8cc9ba3adae8be,1010
 - tasty-rerun-1.1.17@sha256:d4a3ccb0f63f499f36edc71b33c0f91c850eddb22dd92b928aa33b8459f3734a,1373
-- hgeometry-0.11.0.0@sha256:09ead201a6ac3492c0be8dda5a6b32792b9ae87cab730b8362d46ee8d5c2acb4,11714
-- hgeometry-combinatorial-0.11.0.0@sha256:03176f235a1c49a415fe1266274dafca84deb917cbcbf9a654452686b4cd2bfe,8286
 - vinyl-0.13.0@sha256:0f247cd3f8682b30881a07de18e6fec52d540646fbcb328420049cc8d63cd407,3724
 - hashable-1.3.0.0@sha256:4c70f1407881059e93550d3742191254296b2737b793a742bd901348fb3e1fb1,5206
 - network-3.1.2.1@sha256:188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b,4968

stack-lts-15.yaml

@@ -9,6 +9,4 @@ extra-deps:
 - chiphunk-0.1.2.1
 - earcut-0.1.0.4@sha256:d5118b3eecf24d130263d81fb30f1ff56b1db43036582bfd1d8cc9ba3adae8be,1010
 - reanimate-svg-0.13.0.1
-- hgeometry-0.11.0.0@sha256:09ead201a6ac3492c0be8dda5a6b32792b9ae87cab730b8362d46ee8d5c2acb4,11714
-- hgeometry-combinatorial-0.11.0.0@sha256:03176f235a1c49a415fe1266274dafca84deb917cbcbf9a654452686b4cd2bfe,8286
 - vinyl-0.13.0@sha256:0f247cd3f8682b30881a07de18e6fec52d540646fbcb328420049cc8d63cd407,3724

stack-lts-16.yaml

@@ -8,6 +8,4 @@ packages:
 extra-deps:
 - earcut-0.1.0.4
 - reanimate-svg-0.13.0.1
-- hgeometry-0.11.0.0@sha256:09ead201a6ac3492c0be8dda5a6b32792b9ae87cab730b8362d46ee8d5c2acb4,11714
-- hgeometry-combinatorial-0.11.0.0@sha256:03176f235a1c49a415fe1266274dafca84deb917cbcbf9a654452686b4cd2bfe,8286
 - vinyl-0.13.0@sha256:0f247cd3f8682b30881a07de18e6fec52d540646fbcb328420049cc8d63cd407,3724

stack-lts-17.yaml

@@ -8,6 +8,4 @@ packages:
 extra-deps:
 - earcut-0.1.0.4
 - reanimate-svg-0.13.0.1
-- hgeometry-0.11.0.0@sha256:09ead201a6ac3492c0be8dda5a6b32792b9ae87cab730b8362d46ee8d5c2acb4,11714
-- hgeometry-combinatorial-0.11.0.0@sha256:03176f235a1c49a415fe1266274dafca84deb917cbcbf9a654452686b4cd2bfe,8286
 - vinyl-0.13.0@sha256:0f247cd3f8682b30881a07de18e6fec52d540646fbcb328420049cc8d63cd407,3724

test/Properties.hs

@@ -1,13 +1,17 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleInstances    #-}
 {-# OPTIONS_GHC -w      #-}
 {-# LANGUAGE TemplateHaskell      #-}
 module Properties where
 
+import           Test.Tasty
+
+#if !defined(NO_HGEOMETRY)
+
 import qualified Data.Vector            as V
 import           Linear.V2
 import           Linear.Vector
 import           Test.QuickCheck
-import           Test.Tasty
 import           Test.Tasty.QuickCheck
 
 import           Reanimate.Math.Common
@@ -18,6 +22,8 @@ import           Helpers
 
 import Debug.Trace
 
+
+
 prop_pGenerate (PolyParam a) (PolyParam b) (PolyParam c) (PolyParam d) =
   pIsSimple $ pGenerate [a,b,c,d]
 
@@ -87,3 +93,7 @@ prop_dualCycle p = forAll (choose (0,pSize p-1)) $ \n ->
 return []
 all_props :: TestTree
 all_props = testProperties "properties" $allProperties
+#else
+all_props :: TestTree
+all_props = testGroup "properties" []
+#endif