aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2018-03-28 23:18:37 +0200
committerPatrick Spek <p.spek@tyil.nl>2018-03-28 23:18:37 +0200
commit6bb06ccbaad0034487a2aa3fd9e82acab36337dc (patch)
tree13f654390aabc946e182694b054105d1812b0bc3
parente9813dd2b3466ed644f75e3eb7799e398c0ebdc0 (diff)
Update to use newer Hash::Merge
-rw-r--r--CHANGELOG.md6
-rw-r--r--META6.json7
-rw-r--r--lib/Config.pm62
3 files changed, 11 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ab2170..5f8e0d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic
Versioning](http://semver.org/spec/v2.0.0.html).
## [UNRELEASED]
+### Added
+- `api` key to META6.json
+
+### Changed
+- Update dependency to `Hash::Merge` to use `api` and `version` adverbs
+
### Removed
- Lingering say statement in get-parser, breaking tests for Rakudo Star users ([GitHub#4](https://github.com/scriptkitties/p6-Config/issues/4))
- Useless `use lib "lib"` statements from tests
diff --git a/META6.json b/META6.json
index fc8a31f..7f3f64a 100644
--- a/META6.json
+++ b/META6.json
@@ -4,12 +4,12 @@
"Patrick Spek <p.spek@tyil.work>"
],
"depends": [
- "Hash::Merge"
+ "Hash::Merge:api<1>:version<1.0.0+>"
],
"description": "Extensible library for reading and writing configuration files.",
"license": "GPL-3.0",
"name": "Config",
- "perl": "6",
+ "perl": "6.c",
"provides": {
"Config": "lib/Config.pm6",
"Config::Exception::FileNotFoundException": "lib/Config/Exception/FileNotFoundException.pm6",
@@ -29,5 +29,6 @@
"test-depends": [
"Test::META"
],
- "version": "1.3.3"
+ "version": "1.3.5",
+ "api": "1"
}
diff --git a/lib/Config.pm6 b/lib/Config.pm6
index d7fee4a..4fc3121 100644
--- a/lib/Config.pm6
+++ b/lib/Config.pm6
@@ -187,7 +187,7 @@ class Config is Associative is export
#| Read a plain Hash into the configuration.
multi method read(Hash $hash)
{
- $!content.merge($hash);
+ $!content = merge-hash($!content, $hash);
return True;
}