Skip to content

Commit

Permalink
Merge branch 'release-0.1.6' into develop. Close #108.
Browse files Browse the repository at this point in the history
  • Loading branch information
ivanperez-keera committed Apr 8, 2023
2 parents 264e0bd + e281bb0 commit 9b3ed88
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
2023-04-02 Ivan Perez <[email protected]>:
2023-04-08 Ivan Perez <[email protected]>:
* Version bump (0.1.6) (#108).
* Simplify travis file (#58).
* Update GHC versions, condition, publication in travis (#77).
* Update to support Yampa 0.13 (#82).
* Update pointer to hands-on file (#85).
* Add support for bearriver (#95).
* Support stopping the game with letter q (#99).
* Update installation instructions (#102).
* Bump version bounds of Yampa/bearriver (#104).
* Update dist in travis config file to Bionic (#105).
* Update GHC versions in travis config file (#106).
Expand Down
15 changes: 8 additions & 7 deletions haskanoid.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
-- The name of the package.
name: haskanoid

-- The package version. See the Haskell package versioning policy (PVP)
-- for standards guiding when and how versions should be incremented.
-- http://www.haskell.org/haskellwiki/Package_versioning_policy
-- The package version. We follow semantic versioning.
-- PVP summary: +-+------- breaking API changes
-- | | +----- non-breaking API additions
-- | | | +--- code changes with no API change
version: 0.1.5.4
-- | | +----- non-breaking changes
-- | | |
version: 0.1.6

-- A short (one-line) description of the package.
synopsis: A breakout game written in Yampa using SDL
Expand Down Expand Up @@ -45,7 +43,7 @@ category: Game, Reactivity, FRP
build-type: Simple

-- Constraint on the version of Cabal needed to build this package.
cabal-version: >=1.8
cabal-version: >=1.10

data-files: data/*.png data/*.wav data/*.mp3 data/*.ttf

Expand Down Expand Up @@ -110,6 +108,9 @@ executable haskanoid
simple-affine-space,
transformers >= 0.3 && < 0.6

default-language:
Haskell2010

if flag(bearriver)
build-depends: bearriver >= 0.9.6 && < 0.15
else
Expand Down

0 comments on commit 9b3ed88

Please sign in to comment.