X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=0949ab3816064bac9b07116f27be86c5dfeb821a;hb=6f94c802188d44415bafdd64422cecd24585a289;hp=3c5a90ee317c29beb919452edc2599babd327962;hpb=6fb58c0db65fc8e414028b359bb9a52016c4b402;p=gitmo%2FMoose.git

diff --git a/Makefile.PL b/Makefile.PL
index 3c5a90e..0949ab3 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,32 +1,32 @@
 use strict;
 use warnings;
 use inc::Module::Install;
+use 5.008001;
 
 check_conflicts();
 
 name 'Moose';
+perl_version '5.008001';
 all_from 'lib/Moose.pm';
 license 'perl';
 
-# Scalar::Util 1.18 doesn't work on Windows
-my $win32 = !! ( $^O eq 'Win32' or $^O eq 'cygwin' );
-
-# prereqs
-requires 'perl'             => '5.008';
-requires 'Scalar::Util' => $win32 ? '1.17' : '1.18';
+requires 'Scalar::Util'     => '1.19';
 requires 'Carp';
-requires 'Class::MOP'       => '0.67';
-requires 'List::MoreUtils';
-requires 'Sub::Exporter'    => '0.972';
-
-# only used by oose.pm, not Moose.pm :P
-requires 'Filter::Simple' => '0'; 
-
-# things the tests need
-build_requires 'Test::More'      => '0.62';
-build_requires 'Test::Exception' => '0.21';
-build_requires 'Test::LongString';
+requires 'Class::MOP'       => '0.89';
+requires 'List::MoreUtils'  => '0.12';
+requires 'Sub::Exporter'    => '0.980';
+requires 'Task::Weaken'     => '0';
+requires 'Data::OptList'    => '0';
+requires 'Sub::Name'        => '0';
+
+test_requires 'Test::More'      => '0.77';
+test_requires 'Test::Exception' => '0.27';
+
+if ( -d '.svn' || -d '.git' || $ENV{IS_MAINTAINER} ) {
+    system( $^X, 'author/extract-inline-tests' );
+}
 
+extra_tests();
 tests_recursive();
 
 WriteAll();
@@ -36,9 +36,11 @@ WriteAll();
 # before a release.
 sub check_conflicts {
     my %conflicts = (
-        'MooseX::Singleton'        => '0.11',
-        'MooseX::Params::Validate' => '0.05',
-        'Fey::ORM'                 => '0.10',
+        'MooseX::ClassAttribute'    => '0.07',
+        'MooseX::Singleton'         => '0.17',
+        'MooseX::StrictConstructor' => '0.07',
+        'MooseX::Params::Validate'  => '0.05',
+        'Fey::ORM'                  => '0.23',
     );
 
     my $found = 0;