From 715008a03061c26e6a2a50f6f6c7d21c32081334 Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 22 Aug 2022 16:56:11 +0100 Subject: [PATCH] Bump stackage version, uses later version of GHC --- src/Dodge/Data/ActionPlan.hs | 48 ++++++++++++------- src/Dodge/Data/Beam.hs | 4 +- src/Dodge/Data/Block.hs | 6 +-- src/Dodge/Data/Bullet.hs | 2 +- src/Dodge/Data/Button.hs | 2 +- src/Dodge/Data/CWorld.hs | 38 +++++++++------ src/Dodge/Data/Cloud.hs | 2 +- src/Dodge/Data/CrGroupParams.hs | 4 +- src/Dodge/Data/Creature.hs | 24 ++++++---- src/Dodge/Data/Creature/Misc.hs | 2 +- src/Dodge/Data/Creature/Perception.hs | 4 +- src/Dodge/Data/Creature/Stance.hs | 4 +- src/Dodge/Data/Creature/State.hs | 4 +- src/Dodge/Data/CreatureEffect.hs | 2 +- src/Dodge/Data/Damage/Type.hs | 2 +- src/Dodge/Data/Door.hs | 2 +- src/Dodge/Data/Equipment/Misc.hs | 6 +-- src/Dodge/Data/GenParams.hs | 2 +- src/Dodge/Data/HUD.hs | 2 +- src/Dodge/Data/Hammer.hs | 2 +- src/Dodge/Data/Item/Combine.hs | 20 ++++---- src/Dodge/Data/Item/Effect.hs | 2 +- src/Dodge/Data/Item/Params.hs | 4 +- src/Dodge/Data/Item/Targeting.hs | 2 +- src/Dodge/Data/Item/Tweak.hs | 2 +- src/Dodge/Data/Item/Use.hs | 4 +- src/Dodge/Data/Item/Use/Consumption/Ammo.hs | 2 +- .../Data/Item/Use/Consumption/LoadAction.hs | 2 +- src/Dodge/Data/Item/Use/Equipment.hs | 2 +- src/Dodge/Data/Machine.hs | 6 +-- src/Dodge/Data/Machine/Sensor.hs | 2 +- src/Dodge/Data/ObjectType.hs | 2 +- src/Dodge/Data/PathGraph.hs | 4 +- src/Dodge/Data/Prop.hs | 2 +- src/Dodge/Data/RightButtonOptions.hs | 2 +- src/Dodge/Data/SoundOrigin.hs | 4 +- src/Dodge/Data/Terminal.hs | 6 +-- src/Dodge/Data/Wall.hs | 4 +- src/IntSetHelp.hs | 16 ------- src/Picture/Data.hs | 2 +- src/Shape/Data.hs | 2 +- src/Sound/Data.hs | 2 +- stack.yaml | 9 ++-- 43 files changed, 141 insertions(+), 124 deletions(-) delete mode 100644 src/IntSetHelp.hs diff --git a/src/Dodge/Data/ActionPlan.hs b/src/Dodge/Data/ActionPlan.hs index b972aaa89..18e658fe7 100644 --- a/src/Dodge/Data/ActionPlan.hs +++ b/src/Dodge/Data/ActionPlan.hs @@ -21,12 +21,8 @@ data ActionPlan , _apStrategy :: Strategy , _apGoal :: [Goal] } - deriving (Eq, Ord, Show, Read) --Generic, Flat) - -data RandImpulse - = RandImpulseList [Impulse] - | RandImpulseCircMove Float - deriving (Eq, Ord, Show, Read) --Generic, Flat) + --deriving (Eq, Ord, Show, Read) --Generic, Flat) + deriving (Eq, Ord, Show) --Generic, Flat) data Impulse = Move Point2 @@ -60,7 +56,14 @@ data Impulse { _impulseUseAheadPos :: P2Imp } | ImpulseNothing - deriving (Eq, Ord, Show, Read) --Generic, Flat) + --deriving (Eq, Ord, Show, Read) --Generic, Flat) + deriving (Eq, Ord, Show) --Generic, Flat) + +data RandImpulse + = RandImpulseList [Impulse] + | RandImpulseCircMove Float + deriving (Eq, Ord, Show) --Generic, Flat) + infixr 9 `WaitThen` @@ -167,7 +170,8 @@ data Action { _sideImpulses :: [Impulse] , _mainAction :: Action } - deriving (Eq, Ord, Show, Read) --Generic, Flat) + deriving (Eq, Ord, Show) --Generic, Flat) + --deriving (Eq, Ord, Show, Read) --Generic, Flat) data Strategy = Flank Int @@ -185,20 +189,32 @@ data Strategy | Reload | Flee | MeleeStrike - deriving (Eq, Ord, Show, Read) --Generic, Flat) + deriving (Eq, Ord, Show) --Generic, Flat) + --deriving (Eq, Ord, Show, Read) --Generic, Flat) data Goal = LiveLongAndProsper | Kill Int | SentinelAt Point2 Float - deriving (Eq, Ord, Show, Read) --Generic, Flat) + deriving (Eq, Ord, Show) --Generic, Flat) + --deriving (Eq, Ord, Show, Read) --Generic, Flat) + +concat <$> mapM (deriveJSON defaultOptions) + [ ''Impulse + , ''RandImpulse + , ''Action + , ''Strategy + , ''ActionPlan + , ''Goal + ] + +--deriveJSON defaultOptions ''Impulse +--deriveJSON defaultOptions ''RandImpulse +--deriveJSON defaultOptions ''Action +--deriveJSON defaultOptions ''Strategy +--deriveJSON defaultOptions ''ActionPlan +--deriveJSON defaultOptions ''Goal -deriveJSON defaultOptions ''ActionPlan -deriveJSON defaultOptions ''RandImpulse -deriveJSON defaultOptions ''Impulse -deriveJSON defaultOptions ''Action -deriveJSON defaultOptions ''Strategy -deriveJSON defaultOptions ''Goal makeLenses ''ActionPlan makeLenses ''Impulse makeLenses ''Action diff --git a/src/Dodge/Data/Beam.hs b/src/Dodge/Data/Beam.hs index 9dd47f62e..5dc876379 100644 --- a/src/Dodge/Data/Beam.hs +++ b/src/Dodge/Data/Beam.hs @@ -52,7 +52,7 @@ data BeamType makeLenses ''BeamType makeLenses ''Beam -deriveJSON defaultOptions ''BeamType -deriveJSON defaultOptions ''Beam deriveJSON defaultOptions ''BeamDraw deriveJSON defaultOptions ''BeamCombineType +deriveJSON defaultOptions ''BeamType +deriveJSON defaultOptions ''Beam diff --git a/src/Dodge/Data/Block.hs b/src/Dodge/Data/Block.hs index 5746b4b6d..da4b5efbf 100644 --- a/src/Dodge/Data/Block.hs +++ b/src/Dodge/Data/Block.hs @@ -13,7 +13,7 @@ import Color import Control.Lens import Data.Aeson import Data.Aeson.TH -import qualified IntSetHelp as IS +import qualified Data.IntSet as IS import Dodge.Data.Material import Dodge.Data.PathGraph import Geometry @@ -47,6 +47,6 @@ data BlSh deriving (Eq, Ord, Show, Read) --Generic, Flat) makeLenses ''Block -deriveJSON defaultOptions ''Block -deriveJSON defaultOptions ''BlockDraw deriveJSON defaultOptions ''BlSh +deriveJSON defaultOptions ''BlockDraw +deriveJSON defaultOptions ''Block diff --git a/src/Dodge/Data/Bullet.hs b/src/Dodge/Data/Bullet.hs index 6d95b556c..fe35a9c62 100644 --- a/src/Dodge/Data/Bullet.hs +++ b/src/Dodge/Data/Bullet.hs @@ -54,9 +54,9 @@ data BulletTrajectory deriving (Show, Eq, Ord, Read) --Generic, Flat) makeLenses ''Bullet -deriveJSON defaultOptions ''Bullet deriveJSON defaultOptions ''EnergyBallType deriveJSON defaultOptions ''BulletUpdateMod deriveJSON defaultOptions ''BulletEffect deriveJSON defaultOptions ''BulletSpawn deriveJSON defaultOptions ''BulletTrajectory +deriveJSON defaultOptions ''Bullet diff --git a/src/Dodge/Data/Button.hs b/src/Dodge/Data/Button.hs index 4a565d807..fbbf67843 100644 --- a/src/Dodge/Data/Button.hs +++ b/src/Dodge/Data/Button.hs @@ -66,6 +66,6 @@ data ButtonState = BtOn | BtOff | BtNoLabel makeLenses ''Button makeLenses ''ButtonEvent deriveJSON defaultOptions ''ButtonDraw +deriveJSON defaultOptions ''ButtonState deriveJSON defaultOptions ''ButtonEvent deriveJSON defaultOptions ''Button -deriveJSON defaultOptions ''ButtonState diff --git a/src/Dodge/Data/CWorld.hs b/src/Dodge/Data/CWorld.hs index f0d5d1547..2d5175305 100644 --- a/src/Dodge/Data/CWorld.hs +++ b/src/Dodge/Data/CWorld.hs @@ -1,7 +1,7 @@ +{-# LANGUAGE DeriveAnyClass #-} +{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StrictData #-} {-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE DeriveAnyClass #-} module Dodge.Data.CWorld ( module Dodge.Data.CWorld, @@ -112,7 +112,8 @@ data CWCam = CWCam , _cwcBoundBox :: [Point2] , _cwcBoundDist :: (Float, Float, Float, Float) -- NSEW, S and W negative } - --deriving (Eq, Ord, Show, Read) --Generic, Flat) + +--deriving (Eq, Ord, Show, Read) --Generic, Flat) data CWorld = CWorld --{ _cameraCenter :: Point2 @@ -186,8 +187,9 @@ data CWorld = CWorld , _cwTime :: CWTime , _cwGen :: CWGen } - --deriving (Eq, Show, Read) --, Generic) - --h--deriving (Eq, Show, Read) --Generic, Flat) + +--deriving (Eq, Show, Read) --, Generic) +--h--deriving (Eq, Show, Read) --Generic, Flat) data CWTime = CWTime { _maybeWorld :: Maybe' CWorld @@ -195,9 +197,9 @@ data CWTime = CWTime , _worldClock :: Int , _deathDelay :: Maybe Int } - --deriving (Eq, Show, Read) --, Generic) - --h--deriving (Eq, Show, Read) --Generic, Flat) - + +--deriving (Eq, Show, Read) --, Generic) +--h--deriving (Eq, Show, Read) --Generic, Flat) data CWGen = CWGen { _cwgParams :: GenParams @@ -206,7 +208,8 @@ data CWGen = CWGen , _cwgRoomClipping :: [ConvexPoly] , _cwgSeed :: Int } - --deriving (Eq, Ord, Show, Read) --Generic, Flat) + +--deriving (Eq, Ord, Show, Read) --Generic, Flat) data WorldBeams = WorldBeams { _blockingBeams :: [Beam] @@ -214,15 +217,20 @@ data WorldBeams = WorldBeams , _positronBeams :: [Beam] , _electronBeams :: [Beam] } - --deriving (Eq, Ord, Show, Read) --Generic, Flat) -deriveJSON defaultOptions ''CWorld -deriveJSON defaultOptions ''WorldBeams -deriveJSON defaultOptions ''CWCam -deriveJSON defaultOptions ''CWGen -deriveJSON defaultOptions ''CWTime +--deriving (Eq, Ord, Show, Read) --Generic, Flat) + makeLenses ''CWorld makeLenses ''WorldBeams makeLenses ''CWCam makeLenses ''CWGen makeLenses ''CWTime +concat + <$> mapM + (deriveJSON defaultOptions) + [ ''WorldBeams + , ''CWCam + , ''CWGen + , ''CWTime + , ''CWorld + ] diff --git a/src/Dodge/Data/Cloud.hs b/src/Dodge/Data/Cloud.hs index 8fc48c056..174c0e983 100644 --- a/src/Dodge/Data/Cloud.hs +++ b/src/Dodge/Data/Cloud.hs @@ -34,5 +34,5 @@ data CloudType makeLenses ''Cloud deriveJSON defaultOptions ''CloudDraw -deriveJSON defaultOptions ''Cloud deriveJSON defaultOptions ''CloudType +deriveJSON defaultOptions ''Cloud diff --git a/src/Dodge/Data/CrGroupParams.hs b/src/Dodge/Data/CrGroupParams.hs index e5dabfdcb..0028a34d1 100644 --- a/src/Dodge/Data/CrGroupParams.hs +++ b/src/Dodge/Data/CrGroupParams.hs @@ -8,7 +8,7 @@ module Dodge.Data.CrGroupParams where import Control.Lens import Data.Aeson import Data.Aeson.TH -import qualified IntSetHelp as IS +import qualified Data.IntSet as IS import Geometry.Data data CrGroupParams = CrGroupParams @@ -23,5 +23,5 @@ data CrGroupUpdate = DefaultCrGroupUpdate deriving (Eq, Ord, Show, Read) --Generic, Flat) makeLenses ''CrGroupParams -deriveJSON defaultOptions ''CrGroupParams deriveJSON defaultOptions ''CrGroupUpdate +deriveJSON defaultOptions ''CrGroupParams diff --git a/src/Dodge/Data/Creature.hs b/src/Dodge/Data/Creature.hs index 7ae2de5b0..0ad640c5f 100644 --- a/src/Dodge/Data/Creature.hs +++ b/src/Dodge/Data/Creature.hs @@ -1,8 +1,8 @@ -{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveAnyClass #-} +{-# LANGUAGE DeriveGeneric #-} +{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StrictData #-} {-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE ScopedTypeVariables #-} module Dodge.Data.Creature ( module Dodge.Data.Creature, @@ -73,23 +73,31 @@ data Creature = Creature , _crStatistics :: CreatureStatistics , _crCamouflage :: CamouflageStatus } - --deriving (Eq, Show, Read) --Generic, Flat) + +--deriving (Eq, Show, Read) --Generic, Flat) data CreatureCorpse = MakeDefaultCorpse - --deriving (Eq, Ord, Show, Read) --Generic, Flat) + +--deriving (Eq, Ord, Show, Read) --Generic, Flat) data Intention = Intention { _targetCr :: Maybe Creature , _mvToPoint :: Maybe Point2 , _viewPoint :: Maybe Point2 } - --deriving (Eq, Show, Read) --Generic, Flat) + +--deriving (Eq, Show, Read) --Generic, Flat) crSel :: Creature -> Int crSel = _iselPos . _crInvSel makeLenses ''Creature makeLenses ''Intention -deriveJSON defaultOptions ''Creature -deriveJSON defaultOptions ''CreatureCorpse -deriveJSON defaultOptions ''Intention + +concat + <$> mapM + (deriveJSON defaultOptions) + [ ''CreatureCorpse + , ''Creature + , ''Intention + ] diff --git a/src/Dodge/Data/Creature/Misc.hs b/src/Dodge/Data/Creature/Misc.hs index b463f77fc..99fc92fe3 100644 --- a/src/Dodge/Data/Creature/Misc.hs +++ b/src/Dodge/Data/Creature/Misc.hs @@ -84,5 +84,5 @@ deriveJSON defaultOptions ''CreatureStatistics deriveJSON defaultOptions ''Vocalization deriveJSON defaultOptions ''CrMvType deriveJSON defaultOptions ''HumanoidAI -deriveJSON defaultOptions ''CreatureType deriveJSON defaultOptions ''BarrelType +deriveJSON defaultOptions ''CreatureType diff --git a/src/Dodge/Data/Creature/Perception.hs b/src/Dodge/Data/Creature/Perception.hs index a8ecee915..89b251bc1 100644 --- a/src/Dodge/Data/Creature/Perception.hs +++ b/src/Dodge/Data/Creature/Perception.hs @@ -71,9 +71,9 @@ makeLenses ''Perception makeLenses ''Vision makeLenses ''Audition makeLenses ''Attention -deriveJSON defaultOptions ''Perception deriveJSON defaultOptions ''Vision deriveJSON defaultOptions ''Audition deriveJSON defaultOptions ''Vigilance -deriveJSON defaultOptions ''Attention deriveJSON defaultOptions ''Awareness +deriveJSON defaultOptions ''Attention +deriveJSON defaultOptions ''Perception diff --git a/src/Dodge/Data/Creature/Stance.hs b/src/Dodge/Data/Creature/Stance.hs index abfb45b88..0035977ab 100644 --- a/src/Dodge/Data/Creature/Stance.hs +++ b/src/Dodge/Data/Creature/Stance.hs @@ -43,7 +43,7 @@ data Posture makeLenses ''Stance makeLenses ''Carriage makeLenses ''Posture -deriveJSON defaultOptions ''Stance -deriveJSON defaultOptions ''Carriage deriveJSON defaultOptions ''FootForward deriveJSON defaultOptions ''Posture +deriveJSON defaultOptions ''Carriage +deriveJSON defaultOptions ''Stance diff --git a/src/Dodge/Data/Creature/State.hs b/src/Dodge/Data/Creature/State.hs index 764055ca3..b25c75ef5 100644 --- a/src/Dodge/Data/Creature/State.hs +++ b/src/Dodge/Data/Creature/State.hs @@ -9,7 +9,7 @@ import Color import Control.Lens import Data.Aeson import Data.Aeson.TH -import qualified IntSetHelp as IS +import qualified Data.IntSet as IS import Dodge.Data.Damage import Geometry.Data @@ -55,8 +55,8 @@ data CrGroup makeLenses ''CreatureState makeLenses ''CrSpState makeLenses ''CrGroup -deriveJSON defaultOptions ''CreatureState deriveJSON defaultOptions ''CreatureDropType deriveJSON defaultOptions ''CrSpState deriveJSON defaultOptions ''Faction deriveJSON defaultOptions ''CrGroup +deriveJSON defaultOptions ''CreatureState diff --git a/src/Dodge/Data/CreatureEffect.hs b/src/Dodge/Data/CreatureEffect.hs index f0f7a9e5d..7bd123d8f 100644 --- a/src/Dodge/Data/CreatureEffect.hs +++ b/src/Dodge/Data/CreatureEffect.hs @@ -69,8 +69,8 @@ deriveJSON defaultOptions ''CrWdWd deriveJSON defaultOptions ''IntImp deriveJSON defaultOptions ''CrImp deriveJSON defaultOptions ''P2Imp -deriveJSON defaultOptions ''WdCrBl deriveJSON defaultOptions ''CrBl +deriveJSON defaultOptions ''WdCrBl deriveJSON defaultOptions ''MCrAc deriveJSON defaultOptions ''CrAc deriveJSON defaultOptions ''P2Ac diff --git a/src/Dodge/Data/Damage/Type.hs b/src/Dodge/Data/Damage/Type.hs index d5943466f..207b28dd4 100644 --- a/src/Dodge/Data/Damage/Type.hs +++ b/src/Dodge/Data/Damage/Type.hs @@ -26,8 +26,8 @@ data DamageType | ENTERREMENT deriving (Eq, Ord, Show, Enum, Bounded, Read) --Generic, Flat) +deriveJSON defaultOptions ''DamageType instance ToJSONKey DamageType instance FromJSONKey DamageType -deriveJSON defaultOptions ''DamageType diff --git a/src/Dodge/Data/Door.hs b/src/Dodge/Data/Door.hs index 606ea5a4e..435de7273 100644 --- a/src/Dodge/Data/Door.hs +++ b/src/Dodge/Data/Door.hs @@ -13,7 +13,7 @@ module Dodge.Data.Door ( import Control.Lens import Data.Aeson import Data.Aeson.TH -import qualified IntSetHelp as IS +import qualified Data.IntSet as IS import Dodge.Data.MountedObject import Dodge.Data.PathGraph import Dodge.Data.WorldEffect diff --git a/src/Dodge/Data/Equipment/Misc.hs b/src/Dodge/Data/Equipment/Misc.hs index 8e78c1045..c7ca321d2 100644 --- a/src/Dodge/Data/Equipment/Misc.hs +++ b/src/Dodge/Data/Equipment/Misc.hs @@ -29,9 +29,9 @@ data EquipPosition deriving (Eq, Ord) --deriving (Eq, Ord, Show, Read) --Generic, Flat) -instance ToJSONKey EquipPosition - -instance FromJSONKey EquipPosition deriveJSON defaultOptions ''EquipSite deriveJSON defaultOptions ''EquipPosition +instance ToJSONKey EquipPosition + +instance FromJSONKey EquipPosition diff --git a/src/Dodge/Data/GenParams.hs b/src/Dodge/Data/GenParams.hs index 2ec2388e4..6a106e0f1 100644 --- a/src/Dodge/Data/GenParams.hs +++ b/src/Dodge/Data/GenParams.hs @@ -21,5 +21,5 @@ data DecorationShape = PLUS | SQUARE | CIRCLE | THREELINES deriving (Eq, Ord, Enum, Show, Read) --Generic, Flat) makeLenses ''GenParams -deriveJSON defaultOptions ''GenParams deriveJSON defaultOptions ''DecorationShape +deriveJSON defaultOptions ''GenParams diff --git a/src/Dodge/Data/HUD.hs b/src/Dodge/Data/HUD.hs index b892a8908..dee7f504b 100644 --- a/src/Dodge/Data/HUD.hs +++ b/src/Dodge/Data/HUD.hs @@ -35,6 +35,6 @@ data HUD = HUD makeLenses ''HUD makeLenses ''HUDElement makeLenses ''SubInventory -deriveJSON defaultOptions ''HUDElement deriveJSON defaultOptions ''SubInventory +deriveJSON defaultOptions ''HUDElement deriveJSON defaultOptions ''HUD diff --git a/src/Dodge/Data/Hammer.hs b/src/Dodge/Data/Hammer.hs index b23aad386..ff3f56f47 100644 --- a/src/Dodge/Data/Hammer.hs +++ b/src/Dodge/Data/Hammer.hs @@ -21,5 +21,5 @@ data HammerPosition deriving (Eq, Ord, Show, Read) --Generic, Flat) makeLenses ''HammerType -deriveJSON defaultOptions ''HammerType deriveJSON defaultOptions ''HammerPosition +deriveJSON defaultOptions ''HammerType diff --git a/src/Dodge/Data/Item/Combine.hs b/src/Dodge/Data/Item/Combine.hs index a7a202a74..602109937 100644 --- a/src/Dodge/Data/Item/Combine.hs +++ b/src/Dodge/Data/Item/Combine.hs @@ -209,21 +209,21 @@ data ModuleSlot | ModHeldAttach deriving (Eq, Ord, Show, Read) --Generic, Flat) -instance ToJSONKey ModuleSlot - -instance FromJSONKey ModuleSlot - -deriveJSON defaultOptions ''ItemType +makeLenses ''ItemType +makeLenses ''ItemBaseType +makeLenses ''HeldItemType deriveJSON defaultOptions ''Stack deriveJSON defaultOptions ''CraftType -deriveJSON defaultOptions ''ItemBaseType deriveJSON defaultOptions ''ConsumableItemType +deriveJSON defaultOptions ''Detector deriveJSON defaultOptions ''EquipItemType deriveJSON defaultOptions ''LeftItemType deriveJSON defaultOptions ''HeldItemType deriveJSON defaultOptions ''ItemModuleType -deriveJSON defaultOptions ''Detector deriveJSON defaultOptions ''ModuleSlot -makeLenses ''ItemType -makeLenses ''ItemBaseType -makeLenses ''HeldItemType +deriveJSON defaultOptions ''ItemBaseType +deriveJSON defaultOptions ''ItemType +instance ToJSONKey ModuleSlot + +instance FromJSONKey ModuleSlot + diff --git a/src/Dodge/Data/Item/Effect.hs b/src/Dodge/Data/Item/Effect.hs index 4164fd2df..8b9203eec 100644 --- a/src/Dodge/Data/Item/Effect.hs +++ b/src/Dodge/Data/Item/Effect.hs @@ -35,7 +35,7 @@ data ItDropEffect = NoDropEffect deriving (Eq, Ord, Show, Read) --Generic, Flat) makeLenses ''ItEffect -deriveJSON defaultOptions ''ItEffect deriveJSON defaultOptions ''ItInvEffect deriveJSON defaultOptions ''ItFloorEffect deriveJSON defaultOptions ''ItDropEffect +deriveJSON defaultOptions ''ItEffect diff --git a/src/Dodge/Data/Item/Params.hs b/src/Dodge/Data/Item/Params.hs index c649a8f75..7180aca43 100644 --- a/src/Dodge/Data/Item/Params.hs +++ b/src/Dodge/Data/Item/Params.hs @@ -109,9 +109,9 @@ makeLenses ''BarrelSpread makeLenses ''ItemParams makeLenses ''Nozzle makeLenses ''GunBarrels -deriveJSON defaultOptions ''ItemParams deriveJSON defaultOptions ''ShrinkGunStatus deriveJSON defaultOptions ''PreviousArcEffect -deriveJSON defaultOptions ''GunBarrels deriveJSON defaultOptions ''Nozzle deriveJSON defaultOptions ''BarrelSpread +deriveJSON defaultOptions ''GunBarrels +deriveJSON defaultOptions ''ItemParams diff --git a/src/Dodge/Data/Item/Targeting.hs b/src/Dodge/Data/Item/Targeting.hs index 468691420..14afa38de 100644 --- a/src/Dodge/Data/Item/Targeting.hs +++ b/src/Dodge/Data/Item/Targeting.hs @@ -37,6 +37,6 @@ data TargetDraw deriving (Eq, Ord, Show, Read) --Generic, Flat) makeLenses ''Targeting -deriveJSON defaultOptions ''Targeting deriveJSON defaultOptions ''TargetUpdate deriveJSON defaultOptions ''TargetDraw +deriveJSON defaultOptions ''Targeting diff --git a/src/Dodge/Data/Item/Tweak.hs b/src/Dodge/Data/Item/Tweak.hs index b109e40f0..e9c14f65e 100644 --- a/src/Dodge/Data/Item/Tweak.hs +++ b/src/Dodge/Data/Item/Tweak.hs @@ -34,6 +34,6 @@ data TweakParam = TweakParam makeLenses ''TweakParam makeLenses ''ItemTweaks -deriveJSON defaultOptions ''ItemTweaks deriveJSON defaultOptions ''TweakType deriveJSON defaultOptions ''TweakParam +deriveJSON defaultOptions ''ItemTweaks diff --git a/src/Dodge/Data/Item/Use.hs b/src/Dodge/Data/Item/Use.hs index 1c032603d..9a1c3524e 100644 --- a/src/Dodge/Data/Item/Use.hs +++ b/src/Dodge/Data/Item/Use.hs @@ -79,7 +79,7 @@ data ItZoom = ItZoom makeLenses ''ItemUse makeLenses ''AimParams makeLenses ''ItZoom -deriveJSON defaultOptions ''ItemUse -deriveJSON defaultOptions ''AimParams deriveJSON defaultOptions ''AimStance deriveJSON defaultOptions ''ItZoom +deriveJSON defaultOptions ''AimParams +deriveJSON defaultOptions ''ItemUse diff --git a/src/Dodge/Data/Item/Use/Consumption/Ammo.hs b/src/Dodge/Data/Item/Use/Consumption/Ammo.hs index ddfccbbe7..b2de32e1f 100644 --- a/src/Dodge/Data/Item/Use/Consumption/Ammo.hs +++ b/src/Dodge/Data/Item/Use/Consumption/Ammo.hs @@ -68,6 +68,6 @@ makeLenses ''AmmoType deriveJSON defaultOptions ''ProjectileDraw deriveJSON defaultOptions ''ProjectileCreate deriveJSON defaultOptions ''ProjectileUpdate -deriveJSON defaultOptions ''AmmoType deriveJSON defaultOptions ''GasCreate deriveJSON defaultOptions ''ForceFieldType +deriveJSON defaultOptions ''AmmoType diff --git a/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs b/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs index aadd38a52..5d344719a 100644 --- a/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs +++ b/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs @@ -30,5 +30,5 @@ makeLenses ''LoadAction makeLenses ''InvSel makeLenses ''InvSelAction deriveJSON defaultOptions ''LoadAction -deriveJSON defaultOptions ''InvSel deriveJSON defaultOptions ''InvSelAction +deriveJSON defaultOptions ''InvSel diff --git a/src/Dodge/Data/Item/Use/Equipment.hs b/src/Dodge/Data/Item/Use/Equipment.hs index dfae95ae2..d9512b26d 100644 --- a/src/Dodge/Data/Item/Use/Equipment.hs +++ b/src/Dodge/Data/Item/Use/Equipment.hs @@ -32,5 +32,5 @@ data EquipParams makeLenses ''EquipEffect makeLenses ''EquipParams -deriveJSON defaultOptions ''EquipEffect deriveJSON defaultOptions ''EquipParams +deriveJSON defaultOptions ''EquipEffect diff --git a/src/Dodge/Data/Machine.hs b/src/Dodge/Data/Machine.hs index b0c230a21..f87c80a84 100644 --- a/src/Dodge/Data/Machine.hs +++ b/src/Dodge/Data/Machine.hs @@ -17,7 +17,7 @@ import Color import Control.Lens import Data.Aeson import Data.Aeson.TH -import qualified IntSetHelp as IS +import qualified Data.IntSet as IS import qualified Data.Map.Strict as M import Dodge.Data.Damage import Dodge.Data.GenParams @@ -66,6 +66,6 @@ data Turret = Turret makeLenses ''Machine makeLenses ''Turret makePrisms ''MachineType -deriveJSON defaultOptions ''Machine -deriveJSON defaultOptions ''MachineType deriveJSON defaultOptions ''Turret +deriveJSON defaultOptions ''MachineType +deriveJSON defaultOptions ''Machine diff --git a/src/Dodge/Data/Machine/Sensor.hs b/src/Dodge/Data/Machine/Sensor.hs index e14bff28a..3dec9d001 100644 --- a/src/Dodge/Data/Machine/Sensor.hs +++ b/src/Dodge/Data/Machine/Sensor.hs @@ -42,6 +42,6 @@ data CloseToggle = NotClose | IsClose makeLenses ''Sensor makeLenses ''ProximityRequirement -deriveJSON defaultOptions ''Sensor deriveJSON defaultOptions ''ProximityRequirement deriveJSON defaultOptions ''CloseToggle +deriveJSON defaultOptions ''Sensor diff --git a/src/Dodge/Data/ObjectType.hs b/src/Dodge/Data/ObjectType.hs index 5d1c30413..011ccd7f5 100644 --- a/src/Dodge/Data/ObjectType.hs +++ b/src/Dodge/Data/ObjectType.hs @@ -22,8 +22,8 @@ data ObjectType | ObItem deriving (Eq, Show, Ord, Enum, Bounded, Read) --Generic, Flat) +deriveJSON defaultOptions ''ObjectType instance ToJSONKey ObjectType instance FromJSONKey ObjectType -deriveJSON defaultOptions ''ObjectType diff --git a/src/Dodge/Data/PathGraph.hs b/src/Dodge/Data/PathGraph.hs index cc718572d..0252f9aac 100644 --- a/src/Dodge/Data/PathGraph.hs +++ b/src/Dodge/Data/PathGraph.hs @@ -54,7 +54,7 @@ data EdgeObstacle makeLenses ''PathGraph makeLenses ''PathEdge -deriveJSON defaultOptions ''PathGraph -deriveJSON defaultOptions ''PathEdge deriveJSON defaultOptions ''EdgeObstacle +deriveJSON defaultOptions ''PathEdge deriveJSON defaultOptions ''Gr +deriveJSON defaultOptions ''PathGraph diff --git a/src/Dodge/Data/Prop.hs b/src/Dodge/Data/Prop.hs index a83884240..6d6cb8705 100644 --- a/src/Dodge/Data/Prop.hs +++ b/src/Dodge/Data/Prop.hs @@ -74,6 +74,6 @@ data PrWdLsLs makeLenses ''Prop deriveJSON defaultOptions ''PropDraw -deriveJSON defaultOptions ''PropUpdate deriveJSON defaultOptions ''PrWdLsLs +deriveJSON defaultOptions ''PropUpdate deriveJSON defaultOptions ''Prop diff --git a/src/Dodge/Data/RightButtonOptions.hs b/src/Dodge/Data/RightButtonOptions.hs index a1f4928c1..67ff95f11 100644 --- a/src/Dodge/Data/RightButtonOptions.hs +++ b/src/Dodge/Data/RightButtonOptions.hs @@ -54,6 +54,6 @@ data AllocateEquipment makeLenses ''RightButtonOptions makeLenses ''AllocateEquipment makeLenses ''ActivateEquipment -deriveJSON defaultOptions ''RightButtonOptions deriveJSON defaultOptions ''ActivateEquipment deriveJSON defaultOptions ''AllocateEquipment +deriveJSON defaultOptions ''RightButtonOptions diff --git a/src/Dodge/Data/SoundOrigin.hs b/src/Dodge/Data/SoundOrigin.hs index ec542f13b..10dfe9a59 100644 --- a/src/Dodge/Data/SoundOrigin.hs +++ b/src/Dodge/Data/SoundOrigin.hs @@ -37,8 +37,8 @@ data SoundOrigin | Tap Int deriving (Eq, Ord, Show, Read) --Generic, Flat) + +deriveJSON defaultOptions ''SoundOrigin instance ToJSONKey SoundOrigin instance FromJSONKey SoundOrigin - -deriveJSON defaultOptions ''SoundOrigin diff --git a/src/Dodge/Data/Terminal.hs b/src/Dodge/Data/Terminal.hs index b1486fa30..475af3346 100644 --- a/src/Dodge/Data/Terminal.hs +++ b/src/Dodge/Data/Terminal.hs @@ -127,13 +127,13 @@ makeLenses ''EffectArguments makeLenses ''TerminalCommand deriveJSON defaultOptions ''TerminalStatus deriveJSON defaultOptions ''TerminalInput -deriveJSON defaultOptions ''TerminalBootProgram -deriveJSON defaultOptions ''Terminal deriveJSON defaultOptions ''TerminalLineString deriveJSON defaultOptions ''TmTm deriveJSON defaultOptions ''TerminalLine -deriveJSON defaultOptions ''TerminalToggle +deriveJSON defaultOptions ''TerminalBootProgram deriveJSON defaultOptions ''BlBl +deriveJSON defaultOptions ''TerminalToggle deriveJSON defaultOptions ''EffectArguments deriveJSON defaultOptions ''TerminalCommandEffect deriveJSON defaultOptions ''TerminalCommand +deriveJSON defaultOptions ''Terminal diff --git a/src/Dodge/Data/Wall.hs b/src/Dodge/Data/Wall.hs index 00afb8a5e..f0c51c473 100644 --- a/src/Dodge/Data/Wall.hs +++ b/src/Dodge/Data/Wall.hs @@ -59,7 +59,7 @@ data WallStructure makeLenses ''Wall makeLenses ''Opacity makeLenses ''WallStructure -deriveJSON defaultOptions ''Wall -deriveJSON defaultOptions ''Opacity deriveJSON defaultOptions ''WallDraw +deriveJSON defaultOptions ''Opacity deriveJSON defaultOptions ''WallStructure +deriveJSON defaultOptions ''Wall diff --git a/src/IntSetHelp.hs b/src/IntSetHelp.hs deleted file mode 100644 index 02bc7226a..000000000 --- a/src/IntSetHelp.hs +++ /dev/null @@ -1,16 +0,0 @@ -{-# LANGUAGE DeriveAnyClass #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} - -module IntSetHelp ( - --module IntSetHelp, - module Data.IntSet, -) where - -import Data.IntSet.Internal -import Data.IntSet - --- IntSet is not an instance of Generic?! ---deriving instance Generic IntSet ---deriving instance Flat IntSet diff --git a/src/Picture/Data.hs b/src/Picture/Data.hs index 37d8c15ea..9ed1edebe 100644 --- a/src/Picture/Data.hs +++ b/src/Picture/Data.hs @@ -84,6 +84,6 @@ tflat4 (x, y, z, w) = [x, y, z, w] {-# INLINE tflat4 #-} makeLenses ''Verx -deriveJSON defaultOptions ''Verx deriveJSON defaultOptions ''Layer deriveJSON defaultOptions ''ShadNum +deriveJSON defaultOptions ''Verx diff --git a/src/Shape/Data.hs b/src/Shape/Data.hs index 90afd6f32..3d74bdb76 100644 --- a/src/Shape/Data.hs +++ b/src/Shape/Data.hs @@ -47,6 +47,6 @@ makeLenses ''ShapeObj type Shape = [ShapeObj] -deriveJSON defaultOptions ''ShapeObj deriveJSON defaultOptions ''ShapeType deriveJSON defaultOptions ''ShapeV +deriveJSON defaultOptions ''ShapeObj diff --git a/src/Sound/Data.hs b/src/Sound/Data.hs index e0b48b063..c65e889e6 100644 --- a/src/Sound/Data.hs +++ b/src/Sound/Data.hs @@ -62,7 +62,7 @@ makeLenses ''SoundData makeLenses ''Sound makeLenses ''SoundID makeLenses ''SoundStatus -deriveJSON defaultOptions ''SoundStatus deriveJSON defaultOptions ''PlayStatus deriveJSON defaultOptions ''SoundID +deriveJSON defaultOptions ''SoundStatus deriveJSON defaultOptions ''ToPlaySound diff --git a/stack.yaml b/stack.yaml index 06ed85354..7bc5b0b78 100644 --- a/stack.yaml +++ b/stack.yaml @@ -18,7 +18,8 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml #resolver: lts-17.1 -resolver: lts-18.28 +#resolver: lts-18.28 +resolver: lts-19.20 #resolver: lts-19.3 # User packages to be built. @@ -39,9 +40,9 @@ packages: extra-deps: #- SDL-0.6.7.0@sha256:9d6ba75c0cab575ec38468c8277803983e985f9622437aeca6a53e6a7337a7d5,2045 - sdl2-mixer-1.2.0.0@sha256:6a6b5a46c035c9e77eaf9c244e45de9e4a9b9a110890cfeeb9fa72faa2419cef,4497 -- repa-3.4.1.5@sha256:4d94845e66d668345130f75f5de8f7c69139b91495c8c4b5a825014e8985e2fd,3562 -- strict-containers-0.1@sha256:d751696a8a74e368cf778cf98410b43fcd192d68febd4c691faaac1d6c3ab63f,10591 -- strict-containers-lens-0.1@sha256:97c0e68e2e23578074d41fa45690a9ff7b1d47057ea6635d863af99f0daa2f9d,1103 + #- repa-3.4.1.5@sha256:4d94845e66d668345130f75f5de8f7c69139b91495c8c4b5a825014e8985e2fd,3562 + #- strict-containers-0.1@sha256:d751696a8a74e368cf778cf98410b43fcd192d68febd4c691faaac1d6c3ab63f,10591 + #- strict-containers-lens-0.1@sha256:97c0e68e2e23578074d41fa45690a9ff7b1d47057ea6635d863af99f0daa2f9d,1103 #- repa-3.4.1.4@sha256:5a99bde69fe96a18d70aae23f47c8f719b1134558dca3ee5a7c15423b68a132e,3323 #- sdl2-mixer-1.1.0@sha256:c809aecd91ebf9c759af66eebaa4f45f766f2603c13a73412abfd0bd1e02071a,3067 # # for threadscope