Merge pull request #1176 from puppetlabs/fix/IAC-889/GetFastText_init_conflict

(IAC-889) Set FastGettext.default_text_domain in Rakefile

Author: daianamezdrea

.sync.yml

@@ -42,6 +42,8 @@ Gemfile:
       ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
       condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 Rakefile:
+  extras:
+    "FastGettext.default_text_domain = 'default-text-domain'"
   changelog_user: puppetlabs
 spec/spec_helper.rb:
   mock_with: ":rspec"

Gemfile

@@ -29,8 +29,6 @@ group :development do
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
-  gem 'ed25519', '>= 1.2', '< 2.0'
-  gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

Rakefile

@@ -86,3 +86,4 @@ EOM
   end
 end
 
+FastGettext.default_text_domain = 'default-text-domain'

metadata.json

@@ -87,7 +87,7 @@
       "version_requirement": ">= 5.5.10 < 7.0.0"
     }
   ],
-  "pdk-version": "1.17.0",
+  "pdk-version": "1.18.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g88b05c7"
+  "template-ref": "heads/master-0-g9c14433"
 }