From: Charles McGarvey <chazmcgarvey@brokenzipper.com>
Date: Fri, 23 Nov 2018 05:46:54 +0000 (-0700)
Subject: Version 0.009
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=3d2c8852527c184ec5f65468e4c732e81bdaff90;p=chaz%2Fp5-Dist-Zilla-PluginBundle-Author-CCM

Version 0.009
---

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 68c32c5..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-sudo: false
-language: perl
-perl:
-   - '5.24'
-   - '5.22'
-   - '5.20'
-   - '5.18'
-   - '5.16'
-   - '5.14'
-matrix:
-   fast_finish: true
-branches:
-   only: /^(dist|build\/.*)$/
-before_install:
-   - rm .travis.yml
-   - export AUTHOR_TESTING=0
-install:
-   - cpanm --installdeps --verbose  .
diff --git a/Changes b/Changes
index e705cf8..892750b 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for Dist-Zilla-PluginBundle-Author-CCM.
 
+0.009     2018-11-22 22:46:42-07:00 MST7MDT
+
+  * Remove use of DZP::TravisYML and DZP::ReversionOnRelease
+
 0.008001  2017-08-25 22:00:56-06:00 MST7MDT
 
   * Declare new dependency on Perl::Version
diff --git a/MANIFEST b/MANIFEST
index 67c2e0e..1c61b11 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,5 +1,4 @@
-# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.010.
-.travis.yml
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.012.
 Changes
 LICENSE
 MANIFEST
@@ -16,6 +15,7 @@ t/01-basic.t
 xt/author/clean-namespaces.t
 xt/author/critic.t
 xt/author/eol.t
+xt/author/minimum-version.t
 xt/author/no-tabs.t
 xt/author/pod-coverage.t
 xt/author/pod-no404s.t
@@ -23,4 +23,3 @@ xt/author/pod-syntax.t
 xt/author/portability.t
 xt/release/cpan-changes.t
 xt/release/distmeta.t
-xt/release/minimum-version.t
diff --git a/META.json b/META.json
index 9eaa6d3..d0371a1 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
       "Charles McGarvey <chazmcgarvey@brokenzipper.com>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 6.010, CPAN::Meta::Converter version 2.150005",
+   "generated_by" : "Dist::Zilla version 6.012, CPAN::Meta::Converter version 2.150010",
    "keywords" : [
       "dzil",
       "author",
@@ -41,7 +41,6 @@
             "Dist::Zilla::Plugin::Bootstrap::lib" : "0",
             "Dist::Zilla::Plugin::Prereqs" : "0",
             "Dist::Zilla::PluginBundle::Author::CCM" : "0",
-            "English" : "0",
             "Pod::Coverage::TrustPod" : "0",
             "Software::License::Perl_5" : "0",
             "Test::CPAN::Changes" : "0.19",
@@ -51,6 +50,7 @@
             "Test::MinimumVersion" : "0",
             "Test::More" : "0.96",
             "Test::NoTabs" : "0",
+            "Test::Perl::Critic" : "0",
             "Test::Pod" : "1.41",
             "Test::Pod::Coverage" : "1.08",
             "Test::Pod::No404s" : "0",
@@ -100,7 +100,6 @@
             "Dist::Zilla::Plugin::PruneCruft" : "0",
             "Dist::Zilla::Plugin::PruneFiles" : "0",
             "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0",
-            "Dist::Zilla::Plugin::ReversionOnRelease" : "0",
             "Dist::Zilla::Plugin::RunExtraTests" : "0",
             "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0",
             "Dist::Zilla::Plugin::Test::CleanNamespaces" : "0",
@@ -113,7 +112,6 @@
             "Dist::Zilla::Plugin::Test::Portability" : "0",
             "Dist::Zilla::Plugin::Test::ReportPrereqs" : "0",
             "Dist::Zilla::Plugin::TestRelease" : "0",
-            "Dist::Zilla::Plugin::TravisYML" : "0",
             "Dist::Zilla::Plugin::UploadToCPAN" : "0",
             "Dist::Zilla::Role::PluginBundle::Config::Slicer" : "0",
             "Dist::Zilla::Role::PluginBundle::Easy" : "0",
@@ -153,19 +151,18 @@
             "File::Spec" : "0",
             "IO::Handle" : "0",
             "IPC::Open3" : "0",
-            "Test::More" : "0",
-            "blib" : "1.01"
+            "Test::More" : "0"
          }
       }
    },
    "provides" : {
       "Dist::Zilla::PluginBundle::Author::CCM" : {
          "file" : "lib/Dist/Zilla/PluginBundle/Author/CCM.pm",
-         "version" : "0.008001"
+         "version" : "0.009"
       },
       "Pod::Weaver::PluginBundle::Author::CCM" : {
          "file" : "lib/Pod/Weaver/PluginBundle/Author/CCM.pm",
-         "version" : "0.008001"
+         "version" : "0.009"
       }
    },
    "release_status" : "stable",
@@ -180,8 +177,9 @@
          "web" : "https://github.com/chazmcgarvey/Dist-Zilla-PluginBundle-Author-CCM"
       }
    },
-   "version" : "0.008001",
+   "version" : "0.009",
    "x_authority" : "cpan:CCM",
-   "x_serialization_backend" : "Cpanel::JSON::XS version 3.0225"
+   "x_generated_by_perl" : "v5.28.0",
+   "x_serialization_backend" : "Cpanel::JSON::XS version 4.07"
 }
 
diff --git a/META.yml b/META.yml
index 5197d1f..9a1faf3 100644
--- a/META.yml
+++ b/META.yml
@@ -8,11 +8,10 @@ build_requires:
   IO::Handle: '0'
   IPC::Open3: '0'
   Test::More: '0'
-  blib: '1.01'
 configure_requires:
   ExtUtils::MakeMaker: '0'
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 6.010, CPAN::Meta::Converter version 2.150005'
+generated_by: 'Dist::Zilla version 6.012, CPAN::Meta::Converter version 2.150010'
 keywords:
   - dzil
   - author
@@ -34,10 +33,10 @@ no_index:
 provides:
   Dist::Zilla::PluginBundle::Author::CCM:
     file: lib/Dist/Zilla/PluginBundle/Author/CCM.pm
-    version: '0.008001'
+    version: '0.009'
   Pod::Weaver::PluginBundle::Author::CCM:
     file: lib/Pod/Weaver/PluginBundle/Author/CCM.pm
-    version: '0.008001'
+    version: '0.009'
 recommends:
   Dist::Zilla::Plugin::FakeRelease: '0'
   Dist::Zilla::Plugin::Prereqs::FromCPANfile: '0'
@@ -79,7 +78,6 @@ requires:
   Dist::Zilla::Plugin::PruneCruft: '0'
   Dist::Zilla::Plugin::PruneFiles: '0'
   Dist::Zilla::Plugin::ReadmeAnyFromPod: '0'
-  Dist::Zilla::Plugin::ReversionOnRelease: '0'
   Dist::Zilla::Plugin::RunExtraTests: '0'
   Dist::Zilla::Plugin::Test::CPAN::Changes: '0'
   Dist::Zilla::Plugin::Test::CleanNamespaces: '0'
@@ -92,7 +90,6 @@ requires:
   Dist::Zilla::Plugin::Test::Portability: '0'
   Dist::Zilla::Plugin::Test::ReportPrereqs: '0'
   Dist::Zilla::Plugin::TestRelease: '0'
-  Dist::Zilla::Plugin::TravisYML: '0'
   Dist::Zilla::Plugin::UploadToCPAN: '0'
   Dist::Zilla::Role::PluginBundle::Config::Slicer: '0'
   Dist::Zilla::Role::PluginBundle::Easy: '0'
@@ -125,6 +122,7 @@ resources:
   bugtracker: https://github.com/chazmcgarvey/Dist-Zilla-PluginBundle-Author-CCM/issues
   homepage: https://github.com/chazmcgarvey/Dist-Zilla-PluginBundle-Author-CCM
   repository: https://github.com/chazmcgarvey/Dist-Zilla-PluginBundle-Author-CCM.git
-version: '0.008001'
+version: '0.009'
 x_authority: cpan:CCM
-x_serialization_backend: 'YAML::Tiny version 1.70'
+x_generated_by_perl: v5.28.0
+x_serialization_backend: 'YAML::Tiny version 1.73'
diff --git a/Makefile.PL b/Makefile.PL
index 0085113..e188eac 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,4 @@
-# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.010.
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.012.
 use strict;
 use warnings;
 
@@ -54,7 +54,6 @@ my %WriteMakefileArgs = (
     "Dist::Zilla::Plugin::PruneCruft" => 0,
     "Dist::Zilla::Plugin::PruneFiles" => 0,
     "Dist::Zilla::Plugin::ReadmeAnyFromPod" => 0,
-    "Dist::Zilla::Plugin::ReversionOnRelease" => 0,
     "Dist::Zilla::Plugin::RunExtraTests" => 0,
     "Dist::Zilla::Plugin::Test::CPAN::Changes" => 0,
     "Dist::Zilla::Plugin::Test::CleanNamespaces" => 0,
@@ -67,7 +66,6 @@ my %WriteMakefileArgs = (
     "Dist::Zilla::Plugin::Test::Portability" => 0,
     "Dist::Zilla::Plugin::Test::ReportPrereqs" => 0,
     "Dist::Zilla::Plugin::TestRelease" => 0,
-    "Dist::Zilla::Plugin::TravisYML" => 0,
     "Dist::Zilla::Plugin::UploadToCPAN" => 0,
     "Dist::Zilla::Role::PluginBundle::Config::Slicer" => 0,
     "Dist::Zilla::Role::PluginBundle::Easy" => 0,
@@ -101,10 +99,9 @@ my %WriteMakefileArgs = (
     "File::Spec" => 0,
     "IO::Handle" => 0,
     "IPC::Open3" => 0,
-    "Test::More" => 0,
-    "blib" => "1.01"
+    "Test::More" => 0
   },
-  "VERSION" => "0.008001",
+  "VERSION" => "0.009",
   "test" => {
     "TESTS" => "t/*.t"
   }
@@ -149,7 +146,6 @@ my %FallbackPrereqs = (
   "Dist::Zilla::Plugin::PruneCruft" => 0,
   "Dist::Zilla::Plugin::PruneFiles" => 0,
   "Dist::Zilla::Plugin::ReadmeAnyFromPod" => 0,
-  "Dist::Zilla::Plugin::ReversionOnRelease" => 0,
   "Dist::Zilla::Plugin::RunExtraTests" => 0,
   "Dist::Zilla::Plugin::Test::CPAN::Changes" => 0,
   "Dist::Zilla::Plugin::Test::CleanNamespaces" => 0,
@@ -162,7 +158,6 @@ my %FallbackPrereqs = (
   "Dist::Zilla::Plugin::Test::Portability" => 0,
   "Dist::Zilla::Plugin::Test::ReportPrereqs" => 0,
   "Dist::Zilla::Plugin::TestRelease" => 0,
-  "Dist::Zilla::Plugin::TravisYML" => 0,
   "Dist::Zilla::Plugin::UploadToCPAN" => 0,
   "Dist::Zilla::Role::PluginBundle::Config::Slicer" => 0,
   "Dist::Zilla::Role::PluginBundle::Easy" => 0,
@@ -192,7 +187,6 @@ my %FallbackPrereqs = (
   "Pod::Weaver::Section::Version" => 0,
   "Test::CPAN::Meta" => 0,
   "Test::More" => 0,
-  "blib" => "1.01",
   "namespace::autoclean" => 0,
   "strict" => 0,
   "warnings" => 0
diff --git a/README b/README
index 04046fc..a79958f 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ NAME
 
 VERSION
 
-    version 0.008001
+    version 0.009
 
 SYNOPSIS
 
@@ -18,8 +18,6 @@ DESCRIPTION
 
         ; VERSION
         [Git::NextVersion]
-        [ReversionOnRelease]
-        prompt              = 1
     
         ; GATHER
         [Git::GatherDir]
@@ -88,8 +86,6 @@ DESCRIPTION
         filename            = README
         location            = build
         type                = text
-        [TravisYML]
-        build_branch        = /^(dist|build\/.*)$/
         [Manifest]
         [ManifestSkip]
     
diff --git a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm
index 806a6e1..9fab751 100644
--- a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm
+++ b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm
@@ -7,7 +7,7 @@ use 5.014;
 use warnings;
 use strict;
 
-our $VERSION = '0.008001'; # VERSION
+our $VERSION = '0.009'; # VERSION
 
 use Dist::Zilla::Util;
 use Moose;
@@ -69,42 +69,19 @@ sub configure {
     my @gather_exclude      = (@copy_from_build, qw(README.md));
     my @gather_prune        = qw(dist.ini);
     my @no_index            = qw(eg share shares t xt);
-    my @allow_dirty         = (@copy_from_build, qw(.travis.yml Changes LICENSE README.md));
+    my @allow_dirty         = (@copy_from_build, qw(Changes LICENSE README.md));
     my @git_remotes         = qw(github origin);
     my @check_files         = qw(:InstallModules :ExecFiles :TestFiles :ExtraTestFiles);
     my $perl_version_target = $self->max_target_perl;
-    my ($perl_version, $perl_version_build) = $self->_travis_perl_versions($perl_version_target);
 
     if ($self->no_upload) {
         say '[@Author::CCM] WARNING! WARNING! WARNING! *** You are in no_upload mode!! ***';
     }
 
-    if (!$self->payload->{'TravisYML.support_builddir'}) {
-        # swap perl_version and perl_version_build because DZP::TravisYML got it backwards!
-        # https://github.com/SineSwiper/Dist-Zilla-TravisCI/pull/40
-
-        my $tmp = $self->payload->{'TravisYML.perl_version_build'};
-        if (defined $self->payload->{'TravisYML.perl_version'}) {
-            $self->payload->{'TravisYML.perl_version_build'} = $self->payload->{'TravisYML.perl_version'}
-        }
-        else {
-            delete $self->payload->{'TravisYML.perl_version_build'};
-        }
-        if (defined $tmp) {
-            $self->payload->{'TravisYML.perl_version'} = $tmp;
-        }
-        else {
-            delete $self->payload->{'TravisYML.perl_version'};
-        }
-
-        ($perl_version, $perl_version_build) = ($perl_version_build, $perl_version);
-    }
-
     my @plugins = (
 
         # VERSION
         ['Git::NextVersion'],
-        ['ReversionOnRelease' => {prompt => 1}],
 
         # GATHER
         ['Git::GatherDir' => {exclude_filename  => [@gather_exclude]}],
@@ -152,7 +129,6 @@ sub configure {
         ['License'],
         ['ReadmeAnyFromPod' => 'RepoReadme' => {filename => 'README.md', location => 'root', type => 'markdown', phase => 'release'}],
         ['ReadmeAnyFromPod' => 'DistReadme' => {filename => 'README', location => 'build', type => 'text'}],
-        ['TravisYML' => {build_branch => '/^(dist|build\/.*)$/', perl_version => $perl_version, perl_version_build => $perl_version_build}],
         ['Manifest'],
         ['ManifestSkip'],
 
@@ -185,29 +161,6 @@ sub configure {
     $self->add_plugins(@plugins);
 }
 
-sub _travis_perl_versions {
-    my $self = shift;
-
-    my $perl_version_target = Perl::Version->new(shift or die 'Missing target version');
-    my $min_version         = Perl::Version->new('5.14');
-    my $min_version_build   = Perl::Version->new($perl_version_target);
-    $min_version_build->subversion(0);
-
-    my @versions;
-    my @versions_build;
-
-    for my $v (qw{5.26 5.24 5.22 5.20 5.18 5.16 5.14 5.12 5.10 5.8}) {
-        my $version = Perl::Version->new($v);
-        push @versions,       "$version" if $version >= $min_version_build && $version >= $min_version;
-        push @versions_build, "$version" if $version >= $min_version_build;
-    }
-
-    my $perl_version       = join(' ', @versions);
-    my $perl_version_build = join(' ', @versions_build);
-
-    return ($perl_version, $perl_version_build);
-}
-
 with 'Dist::Zilla::Role::PluginBundle::Easy';
 with 'Dist::Zilla::Role::PluginBundle::PluginRemover';
 with 'Dist::Zilla::Role::PluginBundle::Config::Slicer';
@@ -227,7 +180,7 @@ Dist::Zilla::PluginBundle::Author::CCM - A plugin bundle for distributions built
 
 =head1 VERSION
 
-version 0.008001
+version 0.009
 
 =head1 SYNOPSIS
 
@@ -240,8 +193,6 @@ You probably don't want to use this.
 
     ; VERSION
     [Git::NextVersion]
-    [ReversionOnRelease]
-    prompt              = 1
 
     ; GATHER
     [Git::GatherDir]
@@ -310,8 +261,6 @@ You probably don't want to use this.
     filename            = README
     location            = build
     type                = text
-    [TravisYML]
-    build_branch        = /^(dist|build\/.*)$/
     [Manifest]
     [ManifestSkip]
 
diff --git a/lib/Pod/Weaver/PluginBundle/Author/CCM.pm b/lib/Pod/Weaver/PluginBundle/Author/CCM.pm
index 69a3136..e355c61 100644
--- a/lib/Pod/Weaver/PluginBundle/Author/CCM.pm
+++ b/lib/Pod/Weaver/PluginBundle/Author/CCM.pm
@@ -6,7 +6,7 @@ use 5.008;
 use warnings;
 use strict;
 
-our $VERSION = '0.008001'; # VERSION
+our $VERSION = '0.009'; # VERSION
 
 use Pod::Weaver::Config::Assembler;
 use namespace::autoclean;
@@ -105,7 +105,7 @@ Pod::Weaver::PluginBundle::Author::CCM - A plugin bundle for pod woven by CCM
 
 =head1 VERSION
 
-version 0.008001
+version 0.009
 
 =head1 SYNOPSIS
 
diff --git a/t/00-compile.t b/t/00-compile.t
index 5205532..19fc8e9 100644
--- a/t/00-compile.t
+++ b/t/00-compile.t
@@ -2,7 +2,7 @@ use 5.006;
 use strict;
 use warnings;
 
-# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.056
+# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.058
 
 use Test::More;
 
@@ -44,7 +44,7 @@ for my $lib (@module_files)
     is($?, 0, "$lib loaded ok");
 
     shift @_warnings if @_warnings and $_warnings[0] =~ /^Using .*\bblib/
-        and not eval { require blib; blib->VERSION('1.01') };
+        and not eval { +require blib; blib->VERSION('1.01') };
 
     if (@_warnings)
     {
diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd
index 711e466..a1d4e4d 100644
--- a/t/00-report-prereqs.dd
+++ b/t/00-report-prereqs.dd
@@ -10,7 +10,6 @@ do { my $x = {
                                       'Dist::Zilla::Plugin::Bootstrap::lib' => '0',
                                       'Dist::Zilla::Plugin::Prereqs' => '0',
                                       'Dist::Zilla::PluginBundle::Author::CCM' => '0',
-                                      'English' => '0',
                                       'Pod::Coverage::TrustPod' => '0',
                                       'Software::License::Perl_5' => '0',
                                       'Test::CPAN::Changes' => '0.19',
@@ -20,6 +19,7 @@ do { my $x = {
                                       'Test::MinimumVersion' => '0',
                                       'Test::More' => '0.96',
                                       'Test::NoTabs' => '0',
+                                      'Test::Perl::Critic' => '0',
                                       'Test::Pod' => '1.41',
                                       'Test::Pod::Coverage' => '1.08',
                                       'Test::Pod::No404s' => '0',
@@ -69,7 +69,6 @@ do { my $x = {
                                       'Dist::Zilla::Plugin::PruneCruft' => '0',
                                       'Dist::Zilla::Plugin::PruneFiles' => '0',
                                       'Dist::Zilla::Plugin::ReadmeAnyFromPod' => '0',
-                                      'Dist::Zilla::Plugin::ReversionOnRelease' => '0',
                                       'Dist::Zilla::Plugin::RunExtraTests' => '0',
                                       'Dist::Zilla::Plugin::Test::CPAN::Changes' => '0',
                                       'Dist::Zilla::Plugin::Test::CleanNamespaces' => '0',
@@ -82,7 +81,6 @@ do { my $x = {
                                       'Dist::Zilla::Plugin::Test::Portability' => '0',
                                       'Dist::Zilla::Plugin::Test::ReportPrereqs' => '0',
                                       'Dist::Zilla::Plugin::TestRelease' => '0',
-                                      'Dist::Zilla::Plugin::TravisYML' => '0',
                                       'Dist::Zilla::Plugin::UploadToCPAN' => '0',
                                       'Dist::Zilla::Role::PluginBundle::Config::Slicer' => '0',
                                       'Dist::Zilla::Role::PluginBundle::Easy' => '0',
@@ -122,8 +120,7 @@ do { my $x = {
                                    'File::Spec' => '0',
                                    'IO::Handle' => '0',
                                    'IPC::Open3' => '0',
-                                   'Test::More' => '0',
-                                   'blib' => '1.01'
+                                   'Test::More' => '0'
                                  }
                  }
      };
diff --git a/t/00-report-prereqs.t b/t/00-report-prereqs.t
index e338372..c72183a 100644
--- a/t/00-report-prereqs.t
+++ b/t/00-report-prereqs.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.025
+# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.027
 
 use Test::More tests => 1;
 
@@ -68,7 +68,7 @@ my @exclude = qw(
 );
 
 # Add static prereqs to the included modules list
-my $static_prereqs = do 't/00-report-prereqs.dd';
+my $static_prereqs = do './t/00-report-prereqs.dd';
 
 # Merge all prereqs (either with ::Prereqs or a hashref)
 my $full_prereqs = _merge_prereqs(
@@ -78,12 +78,14 @@ my $full_prereqs = _merge_prereqs(
 
 # Add dynamic prereqs to the included modules list (if we can)
 my ($source) = grep { -f } 'MYMETA.json', 'MYMETA.yml';
+my $cpan_meta_error;
 if ( $source && $HAS_CPAN_META
     && (my $meta = eval { CPAN::Meta->load_file($source) } )
 ) {
     $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs);
 }
 else {
+    $cpan_meta_error = $@;    # capture error from CPAN::Meta->load_file($source)
     $source = 'static metadata';
 }
 
@@ -169,10 +171,18 @@ if ( @full_reports ) {
     diag "\nVersions for all modules listed in $source (including optional ones):\n\n", @full_reports;
 }
 
+if ( $cpan_meta_error || @dep_errors ) {
+    diag "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n";
+}
+
+if ( $cpan_meta_error ) {
+    my ($orig_source) = grep { -f } 'MYMETA.json', 'MYMETA.yml';
+    diag "\nCPAN::Meta->load_file('$orig_source') failed with: $cpan_meta_error\n";
+}
+
 if ( @dep_errors ) {
     diag join("\n",
-        "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n",
-        "The following REQUIRED prerequisites were not satisfied:\n",
+        "\nThe following REQUIRED prerequisites were not satisfied:\n",
         @dep_errors,
         "\n"
     );
diff --git a/xt/author/critic.t b/xt/author/critic.t
index d5b4c96..80ccdad 100644
--- a/xt/author/critic.t
+++ b/xt/author/critic.t
@@ -3,10 +3,5 @@
 use strict;
 use warnings;
 
-use Test::More;
-use English qw(-no_match_vars);
-
-eval "use Test::Perl::Critic";
-plan skip_all => 'Test::Perl::Critic required to criticise code' if $@;
-Test::Perl::Critic->import( -profile => "perlcritic.rc" ) if -e "perlcritic.rc";
+use Test::Perl::Critic (-profile => "perlcritic.rc") x!! -e "perlcritic.rc";
 all_critic_ok();
diff --git a/xt/author/eol.t b/xt/author/eol.t
index 585faf1..e0960ee 100644
--- a/xt/author/eol.t
+++ b/xt/author/eol.t
@@ -16,14 +16,14 @@ my @files = (
     'xt/author/clean-namespaces.t',
     'xt/author/critic.t',
     'xt/author/eol.t',
+    'xt/author/minimum-version.t',
     'xt/author/no-tabs.t',
     'xt/author/pod-coverage.t',
     'xt/author/pod-no404s.t',
     'xt/author/pod-syntax.t',
     'xt/author/portability.t',
     'xt/release/cpan-changes.t',
-    'xt/release/distmeta.t',
-    'xt/release/minimum-version.t'
+    'xt/release/distmeta.t'
 );
 
 eol_unix_ok($_, { trailing_whitespace => 1 }) foreach @files;
diff --git a/xt/author/minimum-version.t b/xt/author/minimum-version.t
new file mode 100644
index 0000000..2b484b2
--- /dev/null
+++ b/xt/author/minimum-version.t
@@ -0,0 +1,6 @@
+#!perl
+
+use Test::More;
+
+use Test::MinimumVersion;
+all_minimum_version_ok( qq{5.14.0} );
diff --git a/xt/author/no-tabs.t b/xt/author/no-tabs.t
index e76ce83..41ea6ff 100644
--- a/xt/author/no-tabs.t
+++ b/xt/author/no-tabs.t
@@ -16,14 +16,14 @@ my @files = (
     'xt/author/clean-namespaces.t',
     'xt/author/critic.t',
     'xt/author/eol.t',
+    'xt/author/minimum-version.t',
     'xt/author/no-tabs.t',
     'xt/author/pod-coverage.t',
     'xt/author/pod-no404s.t',
     'xt/author/pod-syntax.t',
     'xt/author/portability.t',
     'xt/release/cpan-changes.t',
-    'xt/release/distmeta.t',
-    'xt/release/minimum-version.t'
+    'xt/release/distmeta.t'
 );
 
 notabs_ok($_) foreach @files;
diff --git a/xt/release/minimum-version.t b/xt/release/minimum-version.t
deleted file mode 100644
index 24bd4de..0000000
--- a/xt/release/minimum-version.t
+++ /dev/null
@@ -1,8 +0,0 @@
-#!perl
-
-use Test::More;
-
-eval "use Test::MinimumVersion";
-plan skip_all => "Test::MinimumVersion required for testing minimum versions"
-  if $@;
-all_minimum_version_ok( qq{5.14.0} );