Require new MX::MethodAttributes. Mark retardo plugin as always being retardo

diff --git a/Changes b/Changes
index 52fad5b..7b9ffb6 100644 (file)
--- a/Changes
+++ b/Changes
@@ -13,8 +13,10 @@
         - Also fix $c->engine->env in Catalyst::Test tests (kmx)
           - Tests for this (t0m)
 
-   New features:      
+   New features:
         - Add $c->req->remote_user to disambiguate from $c->req->user (dwc)
+        - Require MooseX::MethodAttributes 0.12 so that action methods
+          (with attributes) can be used in / composed from Moose roles.
 
 5.80004 2009-05-18 17:03:23
         - Rename the actions attribute in Catalyt::Controller to

diff --git a/Makefile.PL b/Makefile.PL
index a8d1cf2..29eb95a 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -10,7 +10,7 @@ requires 'B::Hooks::EndOfScope' => '0.08';
 requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00801';
 requires 'Class::MOP' => '0.83';
 requires 'Moose' => '0.78';
-requires 'MooseX::MethodAttributes::Inheritable' => '0.10';
+requires 'MooseX::MethodAttributes::Inheritable' => '0.12';
 requires 'Carp';
 requires 'Class::C3::Adopt::NEXT' => '0.07';
 requires 'CGI::Simple::Cookie';
@@ -108,6 +108,9 @@ EOF
 # NOTE - This is the version number of the _incompatible_ code,
 #        not the version number of the fixed version.
 my %conflicts = (
+    'Catalyst::Plugin::ENV' => '9999', # This plugin is just stupid, full stop
+                                       # should have been a core fix.
+    'Catalyst::Plugin::Unicode::Encoding' => '0.1',
     'Catalyst::Authentication::Credential::HTTP' => '1.009',
     'Catalyst::Plugin::Session::Store::File' => '0.16',
     'Catalyst::Plugin::Session' => '0.21',