diff options
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | Build.PL | 6 | ||||
| -rw-r--r-- | Changes | 2 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | bin/docknot | 4 | ||||
| -rw-r--r-- | docs/metadata/requirements | 2 | ||||
| -rw-r--r-- | lib/App/DocKnot.pm | 8 | ||||
| -rwxr-xr-x | t/api/basic.t | 2 | ||||
| -rwxr-xr-x | t/api/self.t | 4 | ||||
| -rw-r--r-- | t/data/docknot/output/thread | 2 | ||||
| -rw-r--r-- | t/data/perl.conf | 2 | ||||
| -rw-r--r-- | t/data/perlcriticrc | 9 | ||||
| -rwxr-xr-x | t/metadata/licenses.t | 8 |
14 files changed, 30 insertions, 30 deletions
diff --git a/.travis.yml b/.travis.yml index 2223f84..cf1ba3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,6 @@ language: perl perl: - "5.26" - "5.24" - - "5.22" - - "5.20" - - "5.18" env: AUTHOR_TESTING=1 before_install: @@ -21,7 +18,3 @@ before_install: # Fails with 5.22, 5.20, 5.12, 5.10 # - cpanm Test::Perl::Critic # - cpanm Test::MinimumVersion - -branches: - only: - - master @@ -2,7 +2,7 @@ # # Build script for the docknot application. # -# Copyright 2013, 2016 Russ Allbery <rra@cpan.org> +# Copyright 2013, 2016, 2018 Russ Allbery <rra@cpan.org> # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -24,7 +24,7 @@ # # SPDX-License-Identifier: MIT -use 5.018; +use 5.024; use autodie; use warnings; @@ -68,7 +68,7 @@ my $build = Module::Build->new( 'JSON' => 0, 'Perl6::Slurp' => 0, 'Template' => 0, - perl => '5.018', + perl => '5.024', }, ); @@ -6,6 +6,8 @@ DocKnot 1.05 (unreleased) thread development links if the vcs.travis key is set in metadata.json. + DocKnot now requires Perl 5.24 or later. + DocKnot 1.04 (2018-03-24) Fix SPDX test failure on Windows. @@ -50,7 +50,7 @@ DESCRIPTION REQUIREMENTS - Perl 5.18 or later and Module::Build are required to build this module. + Perl 5.24 or later and Module::Build are required to build this module. The following additional Perl modules are required to use it: * File::BaseDir @@ -51,7 +51,7 @@ web publishing framework, time permitting. ## Requirements -Perl 5.18 or later and Module::Build are required to build this module. +Perl 5.24 or later and Module::Build are required to build this module. The following additional Perl modules are required to use it: * File::BaseDir diff --git a/bin/docknot b/bin/docknot index 50c8b4a..6fa66a6 100755 --- a/bin/docknot +++ b/bin/docknot @@ -8,7 +8,7 @@ # # SPDX-License-Identifier: MIT -use 5.018; +use 5.024; use autodie; use warnings; @@ -107,7 +107,7 @@ Russ Allbery <rra@cpan.org> =head1 COPYRIGHT AND LICENSE -Copyright 2016 Russ Allbery <rra@cpan.org> +Copyright 2016, 2018 Russ Allbery <rra@cpan.org> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/docs/metadata/requirements b/docs/metadata/requirements index 260aef8..c44285c 100644 --- a/docs/metadata/requirements +++ b/docs/metadata/requirements @@ -1,4 +1,4 @@ -Perl 5.18 or later and Module::Build are required to build this module. +Perl 5.24 or later and Module::Build are required to build this module. The following additional Perl modules are required to use it: * File::BaseDir diff --git a/lib/App/DocKnot.pm b/lib/App/DocKnot.pm index 5978aef..7318f94 100644 --- a/lib/App/DocKnot.pm +++ b/lib/App/DocKnot.pm @@ -12,7 +12,7 @@ package App::DocKnot 1.04; -use 5.018; +use 5.024; use autodie; use warnings; @@ -74,7 +74,7 @@ sub _code_for_copyright { my ($indent, $lead) = @_; my $prefix = ($lead // q{}) . q{ } x $indent; my $notice; - for my $copyright (@{$copyrights_ref}) { + for my $copyright ($copyrights_ref->@*) { my $holder = $copyright->{holder}; my $years = $copyright->{years}; @@ -535,7 +535,7 @@ sub generate { # Load supplemental README sections. readme.sections will contain a list # of sections to add to the README file. - for my $section (@{ $data_ref->{readme}{sections} }) { + for my $section ($data_ref->{readme}{sections}->@*) { my $title = $section->{title}; # The file containing the section data will match the title, converted @@ -570,7 +570,7 @@ sub generate { die "Unknown license $license\n"; } my $license_text = slurp($self->_appdata_path('licenses', $license)); - $data_ref->{license} = { %{ $licenses_ref->{$license} } }; + $data_ref->{license} = { $licenses_ref->{$license}->%* }; $data_ref->{license}{full} = $license_text; # Load additional license notices if they exist. diff --git a/t/api/basic.t b/t/api/basic.t index f573ddd..079388f 100755 --- a/t/api/basic.t +++ b/t/api/basic.t @@ -6,7 +6,7 @@ # # SPDX-License-Identifier: MIT -use 5.018; +use 5.024; use autodie; use warnings; diff --git a/t/api/self.t b/t/api/self.t index c5b9939..b0a22eb 100755 --- a/t/api/self.t +++ b/t/api/self.t @@ -2,11 +2,11 @@ # # Test generated files against the files included in the package. # -# Copyright 2016 Russ Allbery <rra@cpan.org> +# Copyright 2016, 2018 Russ Allbery <rra@cpan.org> # # SPDX-License-Identifier: MIT -use 5.018; +use 5.024; use autodie; use warnings; diff --git a/t/data/docknot/output/thread b/t/data/docknot/output/thread index 3c05fb6..a01cd42 100644 --- a/t/data/docknot/output/thread +++ b/t/data/docknot/output/thread @@ -94,7 +94,7 @@ web publishing framework, time permitting. \h2[Requirements] -Perl 5.18 or later and Module::Build are required to build this module. +Perl 5.24 or later and Module::Build are required to build this module. The following additional Perl modules are required to use it: \bullet(packed)[File::BaseDir] diff --git a/t/data/perl.conf b/t/data/perl.conf index 6e46240..b06e3c7 100644 --- a/t/data/perl.conf +++ b/t/data/perl.conf @@ -8,7 +8,7 @@ $COVERAGE_LEVEL = 90; @COVERAGE_SKIP_TESTS = qw(examples); # Default minimum version requirement. -$MINIMUM_VERSION = '5.018'; +$MINIMUM_VERSION = '5.024'; # Additional regexes that match methods that should be considered private and # therefore don't have to be documented in POD coverage. diff --git a/t/data/perlcriticrc b/t/data/perlcriticrc index b5f8404..a261373 100644 --- a/t/data/perlcriticrc +++ b/t/data/perlcriticrc @@ -10,7 +10,7 @@ # which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>. # # Written by Russ Allbery <eagle@eyrie.org> -# Copyright 2011-2013 +# Copyright 2011-2013, 2018 # The Board of Trustees of the Leland Stanford Junior University # # Permission is hereby granted, free of charge, to any person obtaining a @@ -77,6 +77,10 @@ lines = 25 # off. [-RegularExpressions::ProhibitComplexRegexes] +# Produces false positives currently with postfix dereferencing (introduced in +# Perl 5.20). See https://github.com/Perl-Critic/Perl-Critic/issues/578. +[-References::ProhibitDoubleSigils] + # I generally don't want to require Readonly as a prerequisite for all my Perl # modules. [-ValuesAndExpressions::ProhibitConstantPragma] @@ -91,9 +95,10 @@ lines = 25 [ValuesAndExpressions::RequireNumberSeparators] min_value = 100000 +# IO::Uncompress::Gunzip puts the error message in a package variable. # Text::Wrap has a broken interface that requires use of package variables. [Variables::ProhibitPackageVars] -add_packages = Text::Wrap +add_packages = IO::Uncompress::Gunzip Text::Wrap # use English was one of the worst ideas in the history of Perl. It makes the # code slightly more readable for amateurs at the cost of confusing diff --git a/t/metadata/licenses.t b/t/metadata/licenses.t index 0e8dc67..e2fca45 100755 --- a/t/metadata/licenses.t +++ b/t/metadata/licenses.t @@ -2,11 +2,11 @@ # # Tests for license metadata. # -# Copyright 2017 Russ Allbery <rra@cpan.org> +# Copyright 2017-2018 Russ Allbery <rra@cpan.org> # # SPDX-License-Identifier: MIT -use 5.018; +use 5.024; use autodie; use warnings; @@ -26,11 +26,11 @@ $json->relaxed; my $licenses_ref = $json->decode(scalar(slurp($path))); # The number of tests will be one plus two times the number of licenses. -my $num_tests = 1 + 2 * keys(%{$licenses_ref}); +my $num_tests = 1 + 2 * keys($licenses_ref->%*); # Ensure that, for every license listed in this file, there is a summary and a # corresponding file containing license text. -for my $key (sort keys(%{$licenses_ref})) { +for my $key (sort keys($licenses_ref->%*)) { ok(defined($licenses_ref->{$key}{summary}), "summary for $key"); my $license = File::Spec->catfile('licenses', $key); eval { $path = module_file('App::DocKnot', $license) }; |