Skip to content

Commit fda02c3

Browse files
authored
Merge pull request #9031 from mhashizume/maint/main/fast_gettext
(maint) Sync gemspec and packaging file
2 parents bd4ccaf + 2707fd8 commit fda02c3

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.gemspec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
# Please see the [packaging
1111
# repository](https://github.com/puppetlabs/packaging) for information on how
1212
# to build the Puppet gem package.
13+
#
14+
# Make sure these gem requirements are in sync with ext/project_data.yaml and
15+
# the Gemfile
1316

1417
Gem::Specification.new do |s|
1518
s.name = "puppet"
@@ -37,6 +40,7 @@ Gem::Specification.new do |s|
3740
s.add_runtime_dependency(%q<fast_gettext>, ">= 2.1", "< 3")
3841
s.add_runtime_dependency(%q<locale>, "~> 2.1")
3942
s.add_runtime_dependency(%q<multi_json>, "~> 1.13")
43+
s.add_runtime_dependency(%q<puppet-resource_api>, "~> 1.5")
4044
s.add_runtime_dependency(%q<concurrent-ruby>, ["~> 1.0", "< 1.2.0"])
4145
s.add_runtime_dependency(%q<deep_merge>, "~> 1.0")
4246
s.add_runtime_dependency(%q<scanf>, "~> 1.0")

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ def location_for(place, fake_version = nil)
1212
end
1313
end
1414

15+
# Make sure these gem requirements are in sync with the gempspec and ext/project_data.yaml
16+
1517
gem "facter", *location_for(ENV['FACTER_LOCATION'] || ["~> 4.3"])
1618
gem "semantic_puppet", *location_for(ENV['SEMANTIC_PUPPET_LOCATION'] || ["~> 1.0"])
1719
gem "puppet-resource_api", *location_for(ENV['RESOURCE_API_LOCATION'] || ["~> 1.5"])

ext/project_data.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description: 'Puppet, an automated configuration management tool'
88
version_file: 'lib/puppet/version.rb'
99
# files and gem_files are space separated lists
1010
files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec locales'
11-
# The gem specification bits only work on Puppet >= 3.0rc, NOT 2.7.x and earlier
11+
# Make sure these gem requirements are in sync with the gempspec and Gemfile
1212
gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec locales'
1313
gem_test_files: 'spec/**/*'
1414
gem_executables: 'puppet'
@@ -20,9 +20,9 @@ gem_required_rubygems_version: '> 1.3.1'
2020
gem_runtime_dependencies:
2121
facter: ['>= 4.3.0', '< 5']
2222
semantic_puppet: '~> 1.0'
23-
fast_gettext: ['>= 1.1', '< 3']
23+
fast_gettext: ['>= 2.1', '< 3']
2424
locale: '~> 2.1'
25-
multi_json: '~> 1.10'
25+
multi_json: '~> 1.13'
2626
puppet-resource_api: '~>1.5'
2727
concurrent-ruby: ["~> 1.0", "< 1.2.0"]
2828
deep_merge: '~> 1.0'

0 commit comments

Comments
 (0)