X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=16408b070b7c69a29f2cf712e69e6f3b7d4b2cdb;hb=e0a78010dd2d2d12cf8a693b9e0e42bc62e422cc;hp=a25ad50fbeb592a3c6f503822b8cfb23932b4cbf;hpb=54f4bfeffdb580af3e4668d31c855bccb1e0623a;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index a25ad50..16408b0 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,9 +6,9 @@ name 'Catalyst-Runtime';
 all_from 'lib/Catalyst/Runtime.pm';
 
 requires 'namespace::clean';
-requires 'B::Hooks::EndOfScope';
-requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00700';
-requires 'Moose' => '0.59';
+requires 'Scope::Upper' => '0.06';
+requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00800';
+requires 'Moose' => '0.64';
 requires 'Carp';
 requires 'Class::C3::Adopt::NEXT' => '0.05';
 requires 'Class::MOP';
@@ -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'))) {
@@ -119,3 +120,52 @@ print <<"EOF";
 
  Have fun!
 EOF
+
+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::SmartURI'       => '0.029',
+        '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)";
+        next if $@;
+
+        my $installed = $mod->VERSION();
+        if ( $installed le $conflicts{$mod} ) {
+
+            print <<"EOF";
+
+***
+    This version of Catalyst conflicts with the version of
+    $mod ($installed) you have installed.
+
+    You will need to upgrade $mod after installing
+    this version of Catalyst.
+***
+
+EOF
+
+            $found = 1;
+        }
+    }
+
+    return unless $found;
+
+    # More or less copied from Module::Build
+    return if $ENV{PERL_MM_USE_DEFAULT};
+    return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT));
+
+    sleep 4;
+}