Stop aggregated tests from failing by using the latest Scope::Upper api.

Also bump the dependency version.

diff --git a/Makefile.PL b/Makefile.PL
index 60ba43f..650c947 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,7 +6,7 @@ name 'Catalyst-Runtime';
 all_from 'lib/Catalyst/Runtime.pm';
 
 requires 'namespace::clean';
-requires 'Scope::Upper';
+requires 'Scope::Upper' => '0.06';
 requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00700';
 requires 'Moose' => '0.64';
 requires 'Carp';

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 56eb46e..e581ba1 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1045,7 +1045,7 @@ EOF
     Scope::Upper::reap(sub {
         my $meta = Class::MOP::get_metaclass_by_name($class);
         $meta->make_immutable unless $meta->is_immutable;
-    }, 1);
+    }, Scope::Upper::SCOPE(1));
 
     $class->setup_finished(1);
 }