From 7b66c7f49b1673649114931bf34b0b0ecb11dc5f Mon Sep 17 00:00:00 2001
From: James Wright <53626+tehmoth@users.noreply.github.com>
Date: Thu, 2 Jul 2020 20:50:34 -0400
Subject: [PATCH] Return to Moo, since CHI is on Moo now

---
 dist.ini                                             | 4 ++--
 lib/CHI/Driver/Memcached.pm                          | 4 +---
 lib/CHI/Driver/Memcached/Base.pm                     | 4 +---
 lib/CHI/Driver/Memcached/Fast.pm                     | 4 +---
 lib/CHI/Driver/Memcached/Test/Driver.pm              | 4 +---
 lib/CHI/Driver/Memcached/Test/Driver/Base.pm         | 2 +-
 lib/CHI/Driver/Memcached/Test/Driver/Fast.pm         | 3 +--
 lib/CHI/Driver/Memcached/Test/Driver/Memcached.pm    | 4 +---
 lib/CHI/Driver/Memcached/Test/Driver/libmemcached.pm | 3 +--
 lib/CHI/Driver/Memcached/libmemcached.pm             | 4 +---
 10 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/dist.ini b/dist.ini
index 16eadca..2aa0056 100644
--- a/dist.ini
+++ b/dist.ini
@@ -33,8 +33,8 @@ directory = lib/CHI/Driver/Memcached/Test
 [PruneCruft]
 
 [Prereqs / RuntimeRequires]
-CHI = 0.33
-Moose = 0.66
+CHI = 0.58
+Moo = 1.003
 
 [Prereqs / TestRequires]
 Test::Class = 0
diff --git a/lib/CHI/Driver/Memcached.pm b/lib/CHI/Driver/Memcached.pm
index 13990d3..75b57e9 100644
--- a/lib/CHI/Driver/Memcached.pm
+++ b/lib/CHI/Driver/Memcached.pm
@@ -1,6 +1,6 @@
 package CHI::Driver::Memcached;
 
-use Moose;
+use Moo;
 use strict;
 use warnings;
 
@@ -8,8 +8,6 @@ extends 'CHI::Driver::Memcached::Base';
 
 has '+memd_class' => ( default => 'Cache::Memcached' );
 
-__PACKAGE__->meta->make_immutable();
-
 1;
 
 __END__
diff --git a/lib/CHI/Driver/Memcached/Base.pm b/lib/CHI/Driver/Memcached/Base.pm
index 9903f32..bbbe6f7 100644
--- a/lib/CHI/Driver/Memcached/Base.pm
+++ b/lib/CHI/Driver/Memcached/Base.pm
@@ -3,7 +3,7 @@ package CHI::Driver::Memcached::Base;
 use CHI;
 use Carp;
 use Class::Load;
-use Moose;
+use Moo;
 use strict;
 use warnings;
 
@@ -18,8 +18,6 @@ extends 'CHI::Driver::Base::CacheContainer';
 __PACKAGE__->declare_unsupported_methods(
     qw(dump_as_hash get_keys get_namespaces is_empty clear purge));
 
-__PACKAGE__->meta->make_immutable();
-
 sub BUILD {
     my ( $self, $params ) = @_;
 
diff --git a/lib/CHI/Driver/Memcached/Fast.pm b/lib/CHI/Driver/Memcached/Fast.pm
index 3864366..4ed9d6e 100644
--- a/lib/CHI/Driver/Memcached/Fast.pm
+++ b/lib/CHI/Driver/Memcached/Fast.pm
@@ -1,6 +1,6 @@
 package CHI::Driver::Memcached::Fast;
 
-use Moose;
+use Moo;
 use strict;
 use warnings;
 
@@ -8,8 +8,6 @@ extends 'CHI::Driver::Memcached::Base';
 
 has '+memd_class' => ( default => 'Cache::Memcached::Fast' );
 
-__PACKAGE__->meta->make_immutable();
-
 1;
 
 __END__
diff --git a/lib/CHI/Driver/Memcached/Test/Driver.pm b/lib/CHI/Driver/Memcached/Test/Driver.pm
index afe38c5..5383e47 100644
--- a/lib/CHI/Driver/Memcached/Test/Driver.pm
+++ b/lib/CHI/Driver/Memcached/Test/Driver.pm
@@ -2,13 +2,11 @@ package CHI::Driver::Memcached::Test::Driver;
 
 use strict;
 use warnings;
-use Moose;
+use Moo;
 use CHI::t::Driver;
 use CHI::Driver::Memcached::t::CHIDriverTests;
 use base qw(CHI::Driver::Memcached);
 
-__PACKAGE__->meta->make_immutable;
-
 # Reverse declare_unsupported_methods
 #
 foreach my $method (qw(dump_as_hash is_empty purge)) {
diff --git a/lib/CHI/Driver/Memcached/Test/Driver/Base.pm b/lib/CHI/Driver/Memcached/Test/Driver/Base.pm
index 586f521..b75a6c5 100644
--- a/lib/CHI/Driver/Memcached/Test/Driver/Base.pm
+++ b/lib/CHI/Driver/Memcached/Test/Driver/Base.pm
@@ -2,7 +2,7 @@ package CHI::Driver::Memcached::Test::Driver::Base;
 
 use strict;
 use warnings;
-use Moose::Role;
+use Moo::Role;
 use CHI::t::Driver;
 use CHI::Driver::Memcached::t::CHIDriverTests::Base;
 
diff --git a/lib/CHI/Driver/Memcached/Test/Driver/Fast.pm b/lib/CHI/Driver/Memcached/Test/Driver/Fast.pm
index 6f64543..618b3e2 100644
--- a/lib/CHI/Driver/Memcached/Test/Driver/Fast.pm
+++ b/lib/CHI/Driver/Memcached/Test/Driver/Fast.pm
@@ -1,12 +1,11 @@
 package CHI::Driver::Memcached::Test::Driver::Fast;
 
-use Moose;
+use Moo;
 use strict;
 use warnings;
 
 extends 'CHI::Driver::Memcached::Fast';
 with 'CHI::Driver::Memcached::Test::Driver::Base';
 
-__PACKAGE__->meta->make_immutable();
 
 1;
diff --git a/lib/CHI/Driver/Memcached/Test/Driver/Memcached.pm b/lib/CHI/Driver/Memcached/Test/Driver/Memcached.pm
index f090c9a..8a830da 100644
--- a/lib/CHI/Driver/Memcached/Test/Driver/Memcached.pm
+++ b/lib/CHI/Driver/Memcached/Test/Driver/Memcached.pm
@@ -1,12 +1,10 @@
 package CHI::Driver::Memcached::Test::Driver::Memcached;
 
-use Moose;
+use Moo;
 use strict;
 use warnings;
 
 extends 'CHI::Driver::Memcached';
 with 'CHI::Driver::Memcached::Test::Driver::Base';
 
-__PACKAGE__->meta->make_immutable();
-
 1;
diff --git a/lib/CHI/Driver/Memcached/Test/Driver/libmemcached.pm b/lib/CHI/Driver/Memcached/Test/Driver/libmemcached.pm
index 69617e0..3a3e9e3 100644
--- a/lib/CHI/Driver/Memcached/Test/Driver/libmemcached.pm
+++ b/lib/CHI/Driver/Memcached/Test/Driver/libmemcached.pm
@@ -1,12 +1,11 @@
 package CHI::Driver::Memcached::Test::Driver::libmemcached;
 
-use Moose;
+use Moo;
 use strict;
 use warnings;
 
 extends 'CHI::Driver::Memcached::libmemcached';
 with 'CHI::Driver::Memcached::Test::Driver::Base';
 
-__PACKAGE__->meta->make_immutable();
 
 1;
diff --git a/lib/CHI/Driver/Memcached/libmemcached.pm b/lib/CHI/Driver/Memcached/libmemcached.pm
index 814665c..4108f7e 100644
--- a/lib/CHI/Driver/Memcached/libmemcached.pm
+++ b/lib/CHI/Driver/Memcached/libmemcached.pm
@@ -1,6 +1,6 @@
 package CHI::Driver::Memcached::libmemcached;
 
-use Moose;
+use Moo;
 use strict;
 use warnings;
 
@@ -8,8 +8,6 @@ extends 'CHI::Driver::Memcached::Base';
 
 has '+memd_class' => ( default => 'Cache::Memcached::libmemcached' );
 
-__PACKAGE__->meta->make_immutable();
-
 1;
 
 __END__