Fix Class::Accessor::Grouped and Hash::Merge dependencies

Both were pulled in by SQLA but still :)

diff --git a/Changes b/Changes
index d1b677f..36e413b 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for DBIx::Class
 
+    * Fixes
+        - Bump forgotten Class::Accessor::Grouped core dependency
+        - Promote forgotten Hash::Merge optdep to a hard requirement
+
 0.08125 2010-12-27 04:30 (UTC)
     * New Features / Changes
         - New method ResultSource columns_info method, returning multiple

diff --git a/Makefile.PL b/Makefile.PL
index 74c67b1..9a6fd20 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -57,13 +57,14 @@ my $test_requires = {
 
 my $runtime_requires = {
   'Carp::Clan'               => '6.0',
-  'Class::Accessor::Grouped' => '0.10000',
+  'Class::Accessor::Grouped' => '0.10002',
   'Class::C3::Componentised' => '1.0005',
   'Class::Inspector'         => '1.24',
   'Config::Any'              => '0.20',
   'Context::Preserve'        => '0.01',
   'Data::Dumper::Concise'    => '1.000',
   'Data::Page'               => '2.00',
+  'Hash::Merge'              => '0.12',
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
   'Path::Class'              => '0.18',
@@ -277,7 +278,10 @@ if ($Module::Install::AUTHOR && keys %removed_build_requires) {
 }
 
 # test that we really took things away (just in case, happened twice somehow)
-exit 0 unless -f 'META.yml';  # in case bizarro comes around
+if (! -f 'META.yml') {
+  warn "No META.yml generated?! aborting...\n";
+  exit 1;
+}
 my $meta = do { local @ARGV = 'META.yml'; local $/; <> };
 
 # this is safe as there is a fatal check earlier to make sure $opt_testdeps does

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index 1f353a3..082ce79 100644 (file)
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -22,7 +22,6 @@ my $moose_basic = {
 
 my $replicated = {
   %$moose_basic,
-  'Hash::Merge'                   => '0.12',
 };
 
 my $admin_basic = {