diff options
Diffstat (limited to 'extensions/Bitly')
-rw-r--r-- | extensions/Bitly/Config.pm | 33 | ||||
-rw-r--r-- | extensions/Bitly/Extension.pm | 2 | ||||
-rw-r--r-- | extensions/Bitly/lib/WebService.pm | 1 |
3 files changed, 21 insertions, 15 deletions
diff --git a/extensions/Bitly/Config.pm b/extensions/Bitly/Config.pm index a07df0f1b..aff9d4b4b 100644 --- a/extensions/Bitly/Config.pm +++ b/extensions/Bitly/Config.pm @@ -6,21 +6,32 @@ # defined by the Mozilla Public License, v. 2.0. package Bugzilla::Extension::Bitly; - -use 5.10.1; use strict; -use warnings; + +use Bugzilla::Install::Util qw(vers_cmp); use constant NAME => 'Bitly'; sub REQUIRED_MODULES { - return [ - { - package => 'LWP', - module => 'LWP', - version => '5.835', - }, - ]; + my @required; + push @required, { + package => 'LWP', + module => 'LWP', + version => 5, + }; + # LWP 6 split https support into a separate package + if (Bugzilla::Install::Requirements::have_vers({ + package => 'LWP', + module => 'LWP', + version => 6, + })) { + push @required, { + package => 'LWP-Protocol-https', + module => 'LWP::Protocol::https', + version => 0 + }; + } + return \@required; } use constant OPTIONAL_MODULES => [ @@ -31,6 +42,4 @@ use constant OPTIONAL_MODULES => [ }, ]; -use constant API_VERSION_MAP => { '1_0' => '1_0' }; - __PACKAGE__->NAME; diff --git a/extensions/Bitly/Extension.pm b/extensions/Bitly/Extension.pm index 82f17bc2a..a368b20fe 100644 --- a/extensions/Bitly/Extension.pm +++ b/extensions/Bitly/Extension.pm @@ -6,8 +6,6 @@ # defined by the Mozilla Public License, v. 2.0. package Bugzilla::Extension::Bitly; - -use 5.10.1; use strict; use warnings; diff --git a/extensions/Bitly/lib/WebService.pm b/extensions/Bitly/lib/WebService.pm index b8ada56d2..b47accda6 100644 --- a/extensions/Bitly/lib/WebService.pm +++ b/extensions/Bitly/lib/WebService.pm @@ -7,7 +7,6 @@ package Bugzilla::Extension::Bitly::WebService; -use 5.10.1; use strict; use warnings; |