From fdea9a7df9b1b58a4c804eedc13afb402b8e459e Mon Sep 17 00:00:00 2001
From: Tom Molesworth <tom@deriv.com>
Date: Wed, 17 Jul 2024 13:53:45 +0800
Subject: [PATCH] No need for v2 yet on our internal classes

---
 lib/Myriad/Class.pm                              | 1 -
 lib/Myriad/Mutex.pm                              | 2 +-
 lib/Myriad/Service/Implementation.pm             | 2 +-
 lib/Myriad/Subscription/Implementation/Memory.pm | 2 +-
 lib/Myriad/Subscription/Implementation/Redis.pm  | 2 +-
 t/syntax.t                                       | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/Myriad/Class.pm b/lib/Myriad/Class.pm
index d38cffe5..5315527d 100644
--- a/lib/Myriad/Class.pm
+++ b/lib/Myriad/Class.pm
@@ -245,7 +245,6 @@ sub import {
         current_sub
         evalbytes
         fc
-        module_true
         postderef_qq
         state
         unicode_eval
diff --git a/lib/Myriad/Mutex.pm b/lib/Myriad/Mutex.pm
index 885dc64a..3e71e8e6 100644
--- a/lib/Myriad/Mutex.pm
+++ b/lib/Myriad/Mutex.pm
@@ -1,5 +1,5 @@
 package Myriad::Mutex;
-use Myriad::Class qw(:v2);
+use Myriad::Class;
 
 # VERSION
 # AUTHORITY
diff --git a/lib/Myriad/Service/Implementation.pm b/lib/Myriad/Service/Implementation.pm
index 6fbe1df5..5adf5011 100644
--- a/lib/Myriad/Service/Implementation.pm
+++ b/lib/Myriad/Service/Implementation.pm
@@ -1,6 +1,6 @@
 package Myriad::Service::Implementation;
 
-use Myriad::Class ':v2', extends => 'IO::Async::Notifier';
+use Myriad::Class extends => 'IO::Async::Notifier';
 
 # VERSION
 # AUTHORITY
diff --git a/lib/Myriad/Subscription/Implementation/Memory.pm b/lib/Myriad/Subscription/Implementation/Memory.pm
index 7cd59d0d..42d62222 100644
--- a/lib/Myriad/Subscription/Implementation/Memory.pm
+++ b/lib/Myriad/Subscription/Implementation/Memory.pm
@@ -1,6 +1,6 @@
 package Myriad::Subscription::Implementation::Memory;
 
-use Myriad::Class ':v2', extends => qw(IO::Async::Notifier), does => [
+use Myriad::Class extends => qw(IO::Async::Notifier), does => [
     'Myriad::Role::Subscription',
     'Myriad::Util::Defer'
 ];
diff --git a/lib/Myriad/Subscription/Implementation/Redis.pm b/lib/Myriad/Subscription/Implementation/Redis.pm
index 92ed2877..e972d8b4 100644
--- a/lib/Myriad/Subscription/Implementation/Redis.pm
+++ b/lib/Myriad/Subscription/Implementation/Redis.pm
@@ -1,6 +1,6 @@
 package Myriad::Subscription::Implementation::Redis;
 
-use Myriad::Class ':v2', extends => qw(IO::Async::Notifier), does => [
+use Myriad::Class extends => qw(IO::Async::Notifier), does => [
     'Myriad::Role::Subscription'
 ];
 
diff --git a/t/syntax.t b/t/syntax.t
index b784d32d..d4244378 100644
--- a/t/syntax.t
+++ b/t/syntax.t
@@ -172,6 +172,6 @@ subtest 'Myriad::Class :v2' => sub {
         $obj->checked('xx')
     }, qr/\Qsatisfying :Checked(NumGE(5))/, 'numeric check fails on invalid number');
     done_testing;
-};
+} if $^V >= 5.038;
 done_testing;