summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortarleb <>2020-04-03 12:24:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2020-04-03 12:24:00 (GMT)
commitca43ebaf60fe641df1f2c0589d4f223667874c30 (patch)
treedfd1a096f2d350bac13c9ba3063269a2b40f2f68
parentdfe12f1ccfdb7e5024b56884ca6f21351ce197e8 (diff)
version 1.0.1HEAD1.0.1master
-rw-r--r--LICENSE2
-rwxr-xr-x[-rw-r--r--]README.md0
-rwxr-xr-x[-rw-r--r--]changelog.md7
-rw-r--r--hslua-aeson.cabal8
-rw-r--r--src/Foreign/Lua/Aeson.hs2
-rw-r--r--test/AesonSpec.hs4
6 files changed, 15 insertions, 8 deletions
diff --git a/LICENSE b/LICENSE
index 613e97d..25dde49 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright © 2017–2018 Albert Krewinkel
+Copyright © 2017–2019 Albert Krewinkel
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 9de724d..9de724d 100644..100755
--- a/README.md
+++ b/README.md
diff --git a/changelog.md b/changelog.md
index 3d99238..9597310 100644..100755
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,12 @@
# hslua-aeson
+## v1.0.1
+
+Released 2020-04-03
+
+- Relax version constraint for packages hashable and hslua, allow
+ `hashable-1.3` and `hslua-1.1.*`.
+
## v1.0.0
- Update to hslua 1.0.0
diff --git a/hslua-aeson.cabal b/hslua-aeson.cabal
index c2439dc..dd5cab6 100644
--- a/hslua-aeson.cabal
+++ b/hslua-aeson.cabal
@@ -1,5 +1,5 @@
name: hslua-aeson
-version: 1.0.0
+version: 1.0.1
synopsis: Allow aeson data types to be used with lua.
description: This package provides instances to push and receive any
datatype encodable as JSON to and from the Lua stack.
@@ -8,7 +8,7 @@ license: MIT
license-file: LICENSE
author: Albert Krewinkel
maintainer: tarleb+hslua@zeitkraut.de
-copyright: © 2017–2018 Albert Krewinkel
+copyright: © 2017–2020 Albert Krewinkel
category: Foreign
build-type: Simple
extra-source-files: README.md
@@ -24,8 +24,8 @@ library
exposed-modules: Foreign.Lua.Aeson
build-depends: base >= 4.7 && < 5
, aeson >= 0.11 && < 1.5
- , hashable >= 1.2 && < 1.3
- , hslua >= 1.0 && < 1.1
+ , hashable >= 1.2 && < 1.4
+ , hslua >= 1.0 && < 1.2
, scientific >= 0.3 && < 0.4
, text >= 1.1.1.0 && < 1.3
, unordered-containers >= 0.2 && < 0.3
diff --git a/src/Foreign/Lua/Aeson.hs b/src/Foreign/Lua/Aeson.hs
index 162e927..4cae8dd 100644
--- a/src/Foreign/Lua/Aeson.hs
+++ b/src/Foreign/Lua/Aeson.hs
@@ -2,7 +2,7 @@
{-# LANGUAGE LambdaCase #-}
{-|
Module : Foreign.Lua.Aeson
-Copyright : © 2017–2018 Albert Krewinkel
+Copyright : © 2017–2020 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>
diff --git a/test/AesonSpec.hs b/test/AesonSpec.hs
index bffb73f..8cf7bcb 100644
--- a/test/AesonSpec.hs
+++ b/test/AesonSpec.hs
@@ -1,6 +1,6 @@
{-# OPTIONS_GHC -fno-warn-orphans #-}
{-|
-Copyright : © 2017–2018 Albert Krewinkel
+Copyright : © 2017–2020 Albert Krewinkel
License : MIT
Tests for Aeson–Lua glue.
@@ -121,7 +121,7 @@ arbitraryValue size = frequency
[ (1, return Aeson.Null)
, (4, Aeson.Bool <$> arbitrary)
-- FIXME: this is cheating: we don't draw numbers from the whole possible
- -- range, but only fro the range of nubers that can pass through the lua
+ -- range, but only from the range of nubers that can pass through the Lua
-- stack without rounding errors. Good enough for now, but we still might
-- want to do better in the future.
, (4, Aeson.Number . luaNumberToScientific . Lua.Number <$> arbitrary)