Bump Moose dep to fix tests, bump %conflicts for things which we used to break but...

diff --git a/Changes b/Changes
index e0d7e21..58e415a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -14,6 +14,7 @@
           passed into $c->uri_for as Args/CaptureArgs (t0m)
         - Fix development server so that $c->engine->env returns the correct
           environment (t0m)
+        - Require Moose 0.78 to fix metaclass incompatibility issues (t0m)
 
 5.80003 2009-04-29 16:23:53
         - Various POD tweaks. (hdp, dandv)

diff --git a/Makefile.PL b/Makefile.PL
index 4017b18..13cb35c 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,7 +9,7 @@ requires 'namespace::clean';
 requires 'B::Hooks::EndOfScope' => '0.08';
 requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00801';
 requires 'Class::MOP' => '0.83';
-requires 'Moose' => '0.76';
+requires 'Moose' => '0.78';
 requires 'MooseX::MethodAttributes::Inheritable' => '0.09';
 requires 'Carp';
 requires 'Class::C3::Adopt::NEXT' => '0.07';
@@ -106,16 +106,17 @@ EOF
 # NOTE - This is the version number of the _incompatible_ code,
 #        not the version number of the fixed version.
 my %conflicts = (
+    'Catalyst::Plugin::Session::Store::File' => '0.16',
     'Catalyst::Plugin::Session' => '0.21',
     'Catalyst::Plugin::Session::State::Cookie' => '0.10',
-    'Catalyst-Plugin-Session-Store-FastMmap' => '0.09',
+    'Catalyst::Plugin::Session::Store::FastMmap' => '0.09',
     'Catalyst::Controller::AllowDisable' => '0.03',
     'Reaction' => '0.001999',
     'Catalyst::Plugin::Upload::Image::Magick' => '0.03',
     'Catalyst::Plugin::ConfigLoader'   => '0.22', # Older versions work but
                                                   # throw Data::Visitor warns
     'Catalyst::Devel'                  => '0.09',
-    'Catalyst::Plugin::SmartURI'       => '0.029',
+    'Catalyst::Plugin::SmartURI'       => '0.032',
     'CatalystX::CRUD'                  => '0.37',
     'Catalyst::Action::RenderView'     => '0.07',
     'Catalyst::Plugin::DebugCookie'    => '0.999002',

diff --git a/TODO b/TODO
index cc83150..2dc0bfd 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,12 +6,9 @@ Pre 0004:
      This is now fixed, by moving back to B::Hooks::EndOfScope, but this (used
      to) cause issues with the following modules:
 
-     - Catalyst-Plugin-Session-PerUser
-     - Catalyst-Plugin-Session-Store-File
      - Catalyst-Authentication-Credential-HTTP
-     - Catalyst-Plugin-SmartURI
-
-     according to comments in r8991. Retest these before shipping anything..
+     
+      according to comments in r8991. Retest these before shipping anything..
 
      - Document method modifiers called on things before setup not working in your app class.