Skip to content

Commit

Permalink
Merge pull request #1325 from puppetlabs/ruby32
Browse files Browse the repository at this point in the history
(maint) Allow gettext-setup < 2
  • Loading branch information
mwaggett committed Dec 8, 2022
2 parents 2ab3be0 + 1bdc030 commit cb0a346
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Unreleased
----------

- Fix dirty working copy debug logging [#1321](https://github.com/puppetlabs/r10k/pull/1321)
- Allow gettext-setup < 2 for compatibility with Ruby 3.2 and Puppet 8 [#1325](https://github.com/puppetlabs/r10k/pull/1325)

3.15.2
------
Expand Down
2 changes: 1 addition & 1 deletion r10k.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Gem::Specification.new do |s|

s.add_dependency 'puppet_forge', '>= 2.3.0'

s.add_dependency 'gettext-setup', '~>0.24'
s.add_dependency 'gettext-setup', ['>=0.24', '< 2.0.0']
s.add_dependency 'fast_gettext', ['>= 1.1.0', '< 3.0.0']
s.add_dependency 'gettext', ['>= 3.0.2', '< 4.0.0']

Expand Down

0 comments on commit cb0a346

Please sign in to comment.