From 6bb06ccbaad0034487a2aa3fd9e82acab36337dc Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Wed, 28 Mar 2018 23:18:37 +0200
Subject: Update to use newer Hash::Merge
---
CHANGELOG.md | 6 ++++++
META6.json | 7 ++++---
lib/Config.pm6 | 2 +-
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 "
],
"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;
}
--
cgit v1.1