Bump stackage version, uses later version of GHC

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
+

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

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

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

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

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

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

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

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