diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +2022-10-07 Ivan Perez + * Yampa.cabal: Version bump (0.13.7) (#238), add version bounds to + dependencies (#233). + * LICENSE: Update years, copyright holders (#235). + * src/: Update years, copyright holders (#235). + * .travis.yml: Update distribution to bionic (#236). + 2022-08-07 Ivan Perez * Yampa.cabal: Version bump (0.13.6) (#232). * src/: Fix typos in documentation (#224), replace AFRP with Yampa diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,7 @@ -Copyright (c) 2003, Henrik Nilsson, Antony Courtney and Yale University. +Copyright (c) 2014-2022, Ivan Perez +Copyright (c) 2007-2012, George Griogidge +Copyright (c) 2005-2006, Henrik Nilsson +Copyright (c) 2003-2004, Henrik Nilsson, Antony Courtney and Yale University. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Yampa.cabal b/Yampa.cabal --- a/Yampa.cabal +++ b/Yampa.cabal @@ -30,7 +30,7 @@ build-type: Simple name: Yampa -version: 0.13.6 +version: 0.13.7 author: Henrik Nilsson, Antony Courtney maintainer: Ivan Perez (ivan.perez@keera.co.uk) homepage: https://github.com/ivanperez-keera/Yampa/ @@ -99,10 +99,11 @@ build-depends: base < 6 - , deepseq - , random - , simple-affine-space + , deepseq >= 1.3.0.1 && < 1.5 + , random >= 1.1 && < 1.3 + , simple-affine-space >= 0.1 && < 0.2 + default-language: Haskell2010 @@ -135,7 +136,8 @@ False else build-depends: - base + base >= 4 && < 5 + , hlint >= 1.7 -- Verify that the code is thoroughly documented @@ -161,12 +163,13 @@ else build-depends: base >= 4 && < 5 - , directory - , filepath - , process - , regex-posix + , directory >= 1.2 && < 1.4 + , filepath >= 1.3.0.1 && < 1.5 + , process >= 1.1.0.2 && < 1.7 + , regex-posix >= 0.95 && < 0.97 + executable yampa-examples-sdl-bouncingbox main-is: MainBouncingBox.hs @@ -188,9 +191,10 @@ True build-depends: base < 5 - , deepseq - , random - , SDL + + , deepseq >= 1.3.0.1 && < 1.5 + , random >= 1.1 && < 1.3 + , SDL >= 0.6 && < 0.7 , Yampa else buildable: @@ -218,9 +222,10 @@ True build-depends: base < 5 - , deepseq - , random - , SDL + + , deepseq >= 1.3.0.1 && < 1.5 + , random >= 1.1 && < 1.3 + , SDL >= 0.6 && < 0.7 , Yampa else buildable: @@ -248,10 +253,11 @@ True build-depends: base < 5 - , deepseq - , hcwiid - , random - , SDL + + , deepseq >= 1.3.0.1 && < 1.5 + , hcwiid >= 0.0.5 && < 0.1 + , random >= 1.1 && < 1.3 + , SDL >= 0.6 && < 0.7 , Yampa else buildable: diff --git a/src/FRP/Yampa.hs b/src/FRP/Yampa.hs --- a/src/FRP/Yampa.hs +++ b/src/FRP/Yampa.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Arrow.hs b/src/FRP/Yampa/Arrow.hs --- a/src/FRP/Yampa/Arrow.hs +++ b/src/FRP/Yampa/Arrow.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.Arrow --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Basic.hs b/src/FRP/Yampa/Basic.hs --- a/src/FRP/Yampa/Basic.hs +++ b/src/FRP/Yampa/Basic.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.Basic --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Conditional.hs b/src/FRP/Yampa/Conditional.hs --- a/src/FRP/Yampa/Conditional.hs +++ b/src/FRP/Yampa/Conditional.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Delays.hs b/src/FRP/Yampa/Delays.hs --- a/src/FRP/Yampa/Delays.hs +++ b/src/FRP/Yampa/Delays.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.Delays --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Diagnostics.hs b/src/FRP/Yampa/Diagnostics.hs --- a/src/FRP/Yampa/Diagnostics.hs +++ b/src/FRP/Yampa/Diagnostics.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.Diagnostics --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Event.hs b/src/FRP/Yampa/Event.hs --- a/src/FRP/Yampa/Event.hs +++ b/src/FRP/Yampa/Event.hs @@ -2,7 +2,10 @@ {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} -- | -- Module : FRP.Yampa.Event --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/EventS.hs b/src/FRP/Yampa/EventS.hs --- a/src/FRP/Yampa/EventS.hs +++ b/src/FRP/Yampa/EventS.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.EventS --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Hybrid.hs b/src/FRP/Yampa/Hybrid.hs --- a/src/FRP/Yampa/Hybrid.hs +++ b/src/FRP/Yampa/Hybrid.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.Hybrid --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Integration.hs b/src/FRP/Yampa/Integration.hs --- a/src/FRP/Yampa/Integration.hs +++ b/src/FRP/Yampa/Integration.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.Integration --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/InternalCore.hs b/src/FRP/Yampa/InternalCore.hs --- a/src/FRP/Yampa/InternalCore.hs +++ b/src/FRP/Yampa/InternalCore.hs @@ -2,7 +2,10 @@ {-# LANGUAGE GADTs #-} -- | -- Module : FRP.Yampa --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Loop.hs b/src/FRP/Yampa/Loop.hs --- a/src/FRP/Yampa/Loop.hs +++ b/src/FRP/Yampa/Loop.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.Loop --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Random.hs b/src/FRP/Yampa/Random.hs --- a/src/FRP/Yampa/Random.hs +++ b/src/FRP/Yampa/Random.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.Random --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Scan.hs b/src/FRP/Yampa/Scan.hs --- a/src/FRP/Yampa/Scan.hs +++ b/src/FRP/Yampa/Scan.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.Scan --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Simulation.hs b/src/FRP/Yampa/Simulation.hs --- a/src/FRP/Yampa/Simulation.hs +++ b/src/FRP/Yampa/Simulation.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.Simulation --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Switches.hs b/src/FRP/Yampa/Switches.hs --- a/src/FRP/Yampa/Switches.hs +++ b/src/FRP/Yampa/Switches.hs @@ -1,7 +1,10 @@ {-# LANGUAGE Rank2Types #-} -- | -- Module : FRP.Yampa.Switches --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Task.hs b/src/FRP/Yampa/Task.hs --- a/src/FRP/Yampa/Task.hs +++ b/src/FRP/Yampa/Task.hs @@ -2,7 +2,10 @@ {-# LANGUAGE Rank2Types #-} -- | -- Module : FRP.Yampa.Task --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk diff --git a/src/FRP/Yampa/Time.hs b/src/FRP/Yampa/Time.hs --- a/src/FRP/Yampa/Time.hs +++ b/src/FRP/Yampa/Time.hs @@ -1,6 +1,9 @@ -- | -- Module : FRP.Yampa.Time --- Copyright : (c) Antony Courtney and Henrik Nilsson, Yale University, 2003 +-- Copyright : (c) Ivan Perez, 2014-2022 +-- (c) George Giorgidze, 2007-2012 +-- (c) Henrik Nilsson, 2005-2006 +-- (c) Antony Courtney and Henrik Nilsson, Yale University, 2003-2004 -- License : BSD-style (see the LICENSE file in the distribution) -- -- Maintainer : ivan.perez@keera.co.uk