X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=b564d98243a5afd8ee272d5816c02b51127c61e5;hb=e24229207cb1369e0c4ad27a3261effe20d986a8;hp=9682c9e488a5ae9d01e67b2a5bd1a0d0985e290b;hpb=93704c74741a43e78e336fe8f88be843174011f4;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index 9682c9e..b564d98 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -40,17 +40,16 @@ recommends 'B::Hooks::OP::Check::StashChange';
 test_requires 'Class::Data::Inheritable';
 test_requires 'Test::MockObject';
 
-# Run aggregate tests if AGGREGATE_TESTS environment = 1, but not if it = 0
-# Otherwise default to using Test::Aggregate if installed, but not requiring it.
-if (   ( exists $ENV{AGGREGATE_TESTS} && !$ENV{AGGREGATE_TESTS})
-    || (!exists $ENV{AGGREGATE_TESTS} && !can_use('Test::Aggregate', '0.34_01'))) {
+# aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate is available
+if ($ENV{AGGREGATE_TESTS} && can_use('Test::Aggregate', '0.34_01')) {
+    test_requires('Test::Aggregate', '0.34_01');
+}
+else {
     tests join q{ },
         grep { $_ ne 't/aggregate.t' }
         map  { glob } qw[t/*.t t/aggregate/*.t];
 }
-else {
-    test_requires('Test::Aggregate', '0.34_01');
-}
+
 my @force_build_requires_if_author = qw(
   Test::NoTabs
   Test::Pod
@@ -107,6 +106,8 @@ EOF
 # NOTE - This is the version number of the _incompatible_ code,
 #        not the version number of the fixed version.
 my %conflicts = (
+    'Catalyst::Plugin::ConfigLoader'   => '0.22', # Older versions work but
+                                                  # throw Data::Visitor warns
     'Catalyst::Devel'                  => '0.09',
     'Catalyst::Plugin::SmartURI'       => '0.029',
     'CatalystX::CRUD'                  => '0.37',
@@ -115,6 +116,7 @@ my %conflicts = (
     'Catalyst::Plugin::Authentication' => '0.100091',
     'CatalystX::Imports'               => '0.03',
     'Catalyst::Plugin::HashedCookies'  => '1.03',
+    'Catalyst::Action::REST'           => '0.67',
 );
 check_conflicts(%conflicts);