From: Peter Rabbitson <ribasushi@cpan.org>
Date: Wed, 4 Dec 2013 03:19:28 +0000 (+0100)
Subject: Better specification of the JSON::* optdeps
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3ade80ee0d69cbb8f8d3d104c1e778c714c54b1e;p=dbsrgits%2FDBIx-Class-Historic.git

Better specification of the JSON::* optdeps
---

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index e312c72..fda633a 100644
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -11,9 +11,15 @@ use Carp ();
 # POD is generated automatically by calling _gen_pod from the
 # Makefile.PL in $AUTHOR mode
 
-my $json_any = {
+# NOTE: the rationale for 2 JSON::Any versions is that
+# we need the newer only to work around JSON::XS, which
+# itself is an optional dep
+my $min_json_any = {
   'JSON::Any'                     => '1.23',
 };
+my $test_and_dist_json_any = {
+  'JSON::Any'                     => '1.31',
+};
 
 my $moose_basic = {
   'Moose'                         => '0.98',
@@ -27,7 +33,7 @@ my $replicated = {
 
 my $admin_basic = {
   %$moose_basic,
-  %$json_any,
+  %$min_json_any,
   'MooseX::Types::Path::Class'    => '0.05',
   'MooseX::Types::JSON'           => '0.02',
   'namespace::autoclean'          => '0.09',
@@ -190,13 +196,13 @@ my $reqs = {
   },
 
   test_prettydebug => {
-    req => $json_any,
+    req => $min_json_any,
   },
 
   test_admin_script => {
     req => {
       %$admin_script,
-      'JSON::Any' => '1.30',
+      %$test_and_dist_json_any,
       'JSON' => 0,
       'JSON::PP' => 0,
       'Cpanel::JSON::XS' => 0,
@@ -615,6 +621,7 @@ my $reqs = {
 
   dist_dir => {
     req => {
+      %$test_and_dist_json_any,
       'ExtUtils::MakeMaker' => '6.64',
       'Pod::Inherit'        => '0.90',
       'Pod::Tree'           => '0',