X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=3b31439f808bb59469b4095f47f708781b9d4a66;hb=ac2e31dde4e8c9141c77db63e23bff0f15b14311;hp=51b7148217e8c6cb44cd6bf3e66c7616b213ba65;hpb=4a8035cfddad21c3cb2fa01fb6c640f607fedab7;p=gitmo%2FMoose.git

diff --git a/Makefile.PL b/Makefile.PL
old mode 100755
new mode 100644
index 51b7148..3b31439
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,6 +1,8 @@
 use strict;
 use warnings;
-use inc::Module::Install;
+use inc::Module::Install 0.91;
+use Module::Install::ExtraTests;
+use Module::Install::AuthorRequires;
 use 5.008001;
 
 check_conflicts();
@@ -10,21 +12,31 @@ perl_version '5.008001';
 all_from 'lib/Moose.pm';
 license 'perl';
 
-# prereqs
-requires 'Scalar::Util'     => '1.19';
 requires 'Carp';
-requires 'Class::MOP'       => '0.76';
+requires 'Class::MOP'       => '0.98';
+requires 'Data::OptList'    => '0';
 requires 'List::MoreUtils'  => '0.12';
-requires 'Sub::Exporter'    => '0.972';
+requires 'Scalar::Util'     => '1.19';
+requires 'Sub::Exporter'    => '0.980';
+requires 'Sub::Name'        => '0';
 requires 'Task::Weaken'     => '0';
+requires 'Try::Tiny'        => '0.02';
 
-# only used by oose.pm, not Moose.pm :P
-requires 'Filter::Simple' => '0'; 
+test_requires 'Test::More'      => '0.88';
+test_requires 'Test::Exception' => '0.27';
 
-# things the tests need
-build_requires 'Test::More'      => '0.77';
-build_requires 'Test::Exception' => '0.21';
+author_requires 'Test::Inline';
+author_requires 'File::Find::Rule';
+author_requires 'Module::Info';
+author_requires 'Test::Spelling';
+author_requires 'Test::Pod::Coverage';
+author_requires 'Test::NoTabs';
+
+if ( $Module::Install::AUTHOR || $ENV{IS_MAINTAINER} ) {
+    system( $^X, 'author/extract-inline-tests' );
+}
 
+extra_tests();
 tests_recursive();
 
 WriteAll();
@@ -34,9 +46,22 @@ WriteAll();
 # before a release.
 sub check_conflicts {
     my %conflicts = (
-        'MooseX::Singleton'        => '0.12',
-        'MooseX::Params::Validate' => '0.05',
-        'Fey::ORM'                 => '0.12',
+        'Devel::REPL'                   => '1.003008',
+        'Fey::ORM'                      => '0.23',
+        'Catalyst'                      => '5.80017',
+        'MooseX::Aliases'               => '0.07',
+        'MooseX::AttributeHelpers'      => '0.22',
+        'MooseX::Attribute::Prototype'  => '0.10',
+        'MooseX::ClassAttribute'        => '0.09',
+        'MooseX::MethodAttributes'      => '0.18',
+        'MooseX::NonMoose'              => '0.05',
+        'MooseX::Params::Validate'      => '0.05',
+        'MooseX::Role::Cmd'             => '0.06',
+        'MooseX::Role::WithOverloading' => '0.04',
+        'MooseX::Singleton'             => '0.19',
+        'MooseX::StrictConstructor'     => '0.07',
+        'MooseX::Types'                 => '0.19',
+        'namespace::autoclean'          => '0.08',
     );
 
     my $found = 0;