Merge pull request #1038 from rgroux/development

upgrade/update a number of dependencies.

.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.1.1
+  - 2.2.2
   - jruby-19mode
 before_install:
  - sudo apt-get update

gollum.gemspec

@@ -25,16 +25,17 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md LICENSE]
 
   s.add_dependency 'gollum-lib', '~> 4.0', '>= 4.0.1'
-  s.add_dependency 'kramdown', '~> 1.6.0'
+  s.add_dependency 'kramdown', '~> 1.8.0'
   s.add_dependency 'sinatra', '~> 1.4', '>= 1.4.4'
   s.add_dependency 'mustache', ['>= 0.99.5', '< 1.0.0']
-  s.add_dependency 'useragent', '~> 0.10.0'
+  s.add_dependency 'useragent', '~> 0.14.0'
 
   s.add_development_dependency 'rack-test', '~> 0.6.2'
   s.add_development_dependency 'shoulda', '~> 3.5.0'
   s.add_development_dependency 'minitest-reporters', '~> 0.14.16'
-  s.add_development_dependency 'twitter_cldr', '~> 2.4.2'
-  s.add_development_dependency 'mocha', '~> 1.0.0'
+  s.add_development_dependency 'twitter_cldr', '~> 3.2.0'
+  s.add_development_dependency 'mocha', '~> 1.1.0'
+  s.add_development_dependency 'test-unit', '~> 3.1.0' if RUBY_VERSION =~ /^2.2/
 
   # = MANIFEST =
   s.files = %w[

test/test_app.rb

@@ -64,7 +64,7 @@ context "Frontend" do
   end
 
   def nfd utf8
-    TwitterCldr::Normalization::NFD.normalize utf8
+    TwitterCldr::Normalization.normalize(utf8, using: :nfd)
   end
 
   test "UTF-8 headers href preserved" do