X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=44462419a19f976b5178c4779612f85785fc9208;hb=2af2a5bf07340fd28fa153c347a9843210ac23a7;hp=fc26f9778778a590165ba3055c4133fa0e704fe7;hpb=cffa7f9e16e1cc4a23b3ad4d73fc38924f2d1309;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index fc26f97..4446241 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -57,11 +57,13 @@ test_requires 'Test::Exception';
 test_requires 'Test::More' => '0.88';
 
 # aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available
-if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.35_05')) {
-    author_requires('Test::Aggregate', '0.35_05');
+if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.364')) {
+    author_requires('Test::Aggregate', '0.364');
     author_requires('Test::Simple', '0.88');
+    open my $fh, '>', '.aggregating';
 }
 else {
+    unlink '.aggregating';
     tests join q{ },
         grep { $_ ne 't/aggregate.t' }
         map  { glob } qw[t/*.t t/aggregate/*.t];
@@ -121,6 +123,7 @@ my %conflicts = (
     'Catalyst::Plugin::ENV' => '9999', # This plugin is just stupid, full stop
                                        # should have been a core fix.
     'Catalyst::Plugin::Unicode::Encoding' => '0.2',
+    'Catalyst::Plugin::Authentication' => '0.10010', # _config accessor in ::Credential::Password
     'Catalyst::Authentication::Credential::HTTP' => '1.009',
     'Catalyst::Plugin::Session::Store::File' => '0.16',
     'Catalyst::Plugin::Session' => '0.21',