X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=5d066826ab3ae33b2e4a15b98a06f1736942d43d;hb=e3858b427294bfbe5f63f51d5dd9956631b6e82c;hp=c743eb026d5dc6829fd92227615617e0c1f172bd;hpb=3d28060bff897ed3b13e11ed6993a9a699b1972a;p=gitmo%2FMoose.git

diff --git a/Makefile.PL b/Makefile.PL
old mode 100755
new mode 100644
index c743eb0..5d06682
--- 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,18 +12,28 @@ 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.97_01';
+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';
+
+test_requires 'Test::More'      => '0.88';
+test_requires 'Test::Exception' => '0.27';
 
-# things the tests need
-test_requires 'Test::More'      => '0.77';
-test_requires 'Test::Exception' => '0.21';
+author_requires 'Test::Inline';
+author_requires 'File::Find::Rule';
+author_requires 'Module::Info';
+
+if ( $Module::Install::AUTHOR || $ENV{IS_MAINTAINER} ) {
+    system( $^X, 'author/extract-inline-tests' );
+}
 
+extra_tests();
 tests_recursive();
 
 WriteAll();
@@ -31,9 +43,19 @@ WriteAll();
 # before a release.
 sub check_conflicts {
     my %conflicts = (
-        'MooseX::Singleton'        => '0.12',
-        'MooseX::Params::Validate' => '0.05',
-        'Fey::ORM'                 => '0.12',
+        'Fey::ORM'                      => '0.23',
+        'MooseX::Aliases'               => '0.07',
+        'MooseX::AttributeHelpers'      => '0.22',
+        '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;