X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=d53cc28969aac25169211dc7a789cfa0f42866d0;hb=2664a81bf9d84eff55bbc3cd33916297bacdbde4;hp=c0a1454b6e379348979f4dc7ff349d1f156c92dc;hpb=3e5e24e72e331f9e3c5e8754d74f52ac55de8642;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index c0a1454..d53cc28 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,4 @@
-use inc::Module::Install 0.64;
+use inc::Module::Install 0.87;
 
 perl_version '5.008001';
 
@@ -8,11 +8,11 @@ all_from 'lib/Catalyst/Runtime.pm';
 requires 'namespace::clean';
 requires 'Scope::Upper' => '0.06';
 requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00801';
-requires 'Moose' => '0.73';
-requires 'MooseX::MethodAttributes::Inheritable' => '0.06';
+requires 'Class::MOP' => '0.83';
+requires 'Moose' => '0.76';
+requires 'MooseX::MethodAttributes::Inheritable' => '0.09';
 requires 'Carp';
 requires 'Class::C3::Adopt::NEXT' => '0.07';
-requires 'Class::MOP' => '0.79';
 requires 'CGI::Simple::Cookie';
 requires 'Data::Dump';
 requires 'File::Modified';
@@ -21,7 +21,7 @@ requires 'HTTP::Body'    => '1.04'; # makes uploadtmp work
 requires 'HTTP::Headers' => '1.64';
 requires 'HTTP::Request';
 requires 'HTTP::Response';
-requires 'HTTP::Request::AsCGI' => '0.5';
+requires 'HTTP::Request::AsCGI' => '0.8';
 requires 'LWP::UserAgent';
 requires 'Module::Pluggable' => '3.01';
 requires 'Path::Class' => '0.09';
@@ -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
@@ -73,7 +72,7 @@ if ($Module::Install::AUTHOR) {
 
   # Strip out the author only build_requires from META.yml
   # Need to do this _after_ WriteAll else it looses track of them
-  strip_author_only_build_requires(@force_build_requires_if_author);
+  strip_author_only_build_requires(@force_build_requires_if_author, 'Test::Aggregate');
 
   Meta->{values}{resources} = [
     [ 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst' ],
@@ -107,6 +106,9 @@ EOF
 # NOTE - This is the version number of the _incompatible_ code,
 #        not the version number of the fixed version.
 my %conflicts = (
+    'Catalyst::Controller::AllowDisable' => '0.03',
+    'Reaction' => '0.001999',
+    'Catalyst::Plugin::Upload::Image::Magick' => '0.03',
     'Catalyst::Plugin::ConfigLoader'   => '0.22', # Older versions work but
                                                   # throw Data::Visitor warns
     'Catalyst::Devel'                  => '0.09',
@@ -118,6 +120,8 @@ my %conflicts = (
     'CatalystX::Imports'               => '0.03',
     'Catalyst::Plugin::HashedCookies'  => '1.03',
     'Catalyst::Action::REST'           => '0.67',
+    'CatalystX::CRUD'                  => '0.42',
+    'CatalystX::CRUD::Model::RDBO'     => '0.20',
 );
 check_conflicts(%conflicts);