remove ExtraTests and require Dist::Zilla 5.038

diff --git a/cpanfile b/cpanfile
index bde24ebe47790ebc23aeab65577e019305744e7c..ba07b62ac26a286f18d1996d3f9f2753fd57ffdd 100644 (file)
--- a/cpanfile
+++ b/cpanfile
@@ -2,6 +2,7 @@
 # requires 'Badge::Depot::Plugin::Perl';
 # requires 'Badge::Depot::Plugin::Travis';
 # requires 'Pod::Weaver::Section::Badges';
+requires 'Dist::Zilla', '5.038';
 requires 'Dist::Zilla::Plugin::Authority';
 requires 'Dist::Zilla::Plugin::AutoPrereqs';
 requires 'Dist::Zilla::Plugin::BlockRelease';
@@ -10,7 +11,6 @@ requires 'Dist::Zilla::Plugin::ConfirmRelease';
 requires 'Dist::Zilla::Plugin::CopyFilesFromBuild';
 requires 'Dist::Zilla::Plugin::Encoding';
 requires 'Dist::Zilla::Plugin::ExecDir';
-requires 'Dist::Zilla::Plugin::ExtraTests';
 requires 'Dist::Zilla::Plugin::FakeRelease';
 requires 'Dist::Zilla::Plugin::Git::Check';
 requires 'Dist::Zilla::Plugin::Git::Commit';
@@ -42,6 +42,7 @@ requires 'Dist::Zilla::Plugin::PruneCruft';
 requires 'Dist::Zilla::Plugin::PruneFiles';
 requires 'Dist::Zilla::Plugin::ReadmeAnyFromPod';
 requires 'Dist::Zilla::Plugin::ReversionOnRelease';
+requires 'Dist::Zilla::Plugin::RunExtraTests';
 requires 'Dist::Zilla::Plugin::Test::CPAN::Changes';
 requires 'Dist::Zilla::Plugin::Test::CleanNamespaces';
 requires 'Dist::Zilla::Plugin::Test::Compile';

diff --git a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm
index 3cdcea1d5e751a36035f4cc18b07acbcf37dee91..58fc17dccb20ebd3b739b33e47beb0003b604fda 100644 (file)
--- a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm
+++ b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm
@@ -17,9 +17,6 @@ You probably don't want to use this.
     [ReversionOnRelease]
     prompt              = 1
 
-    [ExecDir]
-    [ExtraTests]
-
     ; GATHER
     [Git::GatherDir]
     exclude_filename    = LICENSE
@@ -30,6 +27,7 @@ You probably don't want to use this.
 
     [CopyFilesFromBuild]
     copy                = LICENSE
+    [ExecDir]
 
     ; PREREQS
     [AutoPrereqs]
@@ -93,6 +91,7 @@ You probably don't want to use this.
     ; RELEASE
     [CheckChangesHasContent]
     [Git::Check]
+    [RunExtraTests]
     [TestRelease]
     [ConfirmRelease]
     [UploadToCPAN]              ; disable with the "no_upload" attribute
@@ -197,15 +196,13 @@ sub configure {
         ['NextRelease'],
         ['ReversionOnRelease' => {prompt => 1}],
 
-        ['ExecDir'],
-        ['ExtraTests'],
-
         # GATHER
         ['Git::GatherDir' => {exclude_filename  => [@gather_exclude]}],
         ['PruneCruft'],
         ['PruneFiles' => {filename => [@gather_prune]}],
 
         ['CopyFilesFromBuild' => {copy => [@copy_from_build]}],
+        ['ExecDir'],
 
         # PREREQS
         ['AutoPrereqs'],
@@ -253,6 +250,7 @@ sub configure {
         # RELEASE
         ['CheckChangesHasContent'],
         ['Git::Check' => {allow_dirty => [@allow_dirty], untracked_files => 'ignore'}],
+        ['RunExtraTests'],
         ['TestRelease'],
         # ['ConfirmRelease'],
         $self->no_upload ? ['FakeRelease'] : ['UploadToCPAN'],