Add change for bug fix.

[gitmo/Moose.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
old mode 100644 (file)
new mode 100755 (executable)
index 31a07a9..05a2cf2
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,33 +1,31 @@
 use strict;
 use warnings;
 use inc::Module::Install;
+use 5.008;
 
 check_conflicts();
 
 name 'Moose';
+perl_version '5.008';
 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.65';
-requires 'List::MoreUtils';
+requires 'Class::MOP'       => '0.75';
+requires 'List::MoreUtils'  => '0.12';
 requires 'Sub::Exporter'    => '0.972';
+requires 'Task::Weaken'     => '0';
 
 # 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::More'      => '0.77';
 build_requires 'Test::Exception' => '0.21';
-build_requires 'Test::LongString';
 
-tests_recursive;
+tests_recursive();
 
 WriteAll();
 
@@ -36,9 +34,9 @@ WriteAll();
 # before a release.
 sub check_conflicts {
     my %conflicts = (
-        'MooseX::Singleton'        => '0.11',
+        'MooseX::Singleton'        => '0.12',
         'MooseX::Params::Validate' => '0.05',
-        'Fey::ORM'                 => '0.10',
+        'Fey::ORM'                 => '0.12',
     );
 
     my $found = 0;
@@ -65,9 +63,11 @@ EOF
         }
     }
 
+    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 if $found;
+    sleep 4;
 }