X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=ac0cb58c22352428b1457a112b72cb17f35c1927;hb=951bab6b95918d35bdcff6eec312db114ae1f6d8;hp=de27fe1cbc4788e03607a301aa308d39115df8c3;hpb=6b2a933b5b3820e494f9b5804c7c2eb6083bcf09;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index de27fe1..ac0cb58 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,7 +6,7 @@ name 'Catalyst-Runtime';
 all_from 'lib/Catalyst/Runtime.pm';
 
 requires 'namespace::clean';
-requires 'Scope::Upper';
+requires 'Scope::Upper' => '0.06';
 requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00700';
 requires 'Moose' => '0.64';
 requires 'Carp';
@@ -35,6 +35,7 @@ requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
 requires 'MRO::Compat';
 
 test_requires 'Class::Data::Inheritable';
+test_requires 'Test::MockObject';
 
 if (   ( exists $ENV{AGGREGATE_TESTS} && !$ENV{AGGREGATE_TESTS})
     || (!exists $ENV{AGGREGATE_TESTS} && !can_use('Test::Aggregate', '0.34_01'))) {
@@ -124,13 +125,20 @@ check_conflicts();
 
 # Nicked straight from Moose!
 sub check_conflicts {
+    # NOTE - This is the version number of the _incompatible_ code, 
+    #        not the version number of the fixed version.
     my %conflicts = (
-        'Catalyst::Plugin::Authentication' => '0.100092',
+        'CatalystX::CRUD'                  => '0.37',
+        'Catalyst::Action::RenderView'     => '0.07',
+        'Catalyst::Plugin::DebugCookie'    => '0.999002',
+        'Catalyst::Plugin::Authentication' => '0.100091',
+        'CatalystX::Imports'               => '0.03',
+        'Catalyst::Plugin::HashedCookies'  => '1.03',
     );
 
     my $found = 0;
     for my $mod ( sort keys %conflicts ) {
-        eval "require $mod";
+        eval "require($mod)";
         next if $@;
 
         my $installed = $mod->VERSION();