Merge branch 'master' into feature/windows-ci

metricfu · Nov 3, 2016 · 7222a36 · 7222a36
2 parents ee8a570 + 563c7aa
commit 7222a36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -37,7 +37,7 @@ gemspec path: File.expand_path("..", __FILE__)
 
 platform :jruby do
   group :jruby do
-    gem "jruby-openssl", "~> 0.8.5"
+    gem "jruby-openssl", "~> 0.9.17"
   end
 end
 
@@ -65,6 +65,5 @@ group :guard do
 
   # notification handling
   gem "libnotify",               "~> 0.8.0", require: false
-  gem "rb-notifu",               "~> 0.0.4", require: false
   gem "terminal-notifier-guard", "~> 1.5.3", require: false
 end
diff --git a/metric_fu.gemspec b/metric_fu.gemspec
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "cane",                  [">= 2.5.2",  "~> 2.5"]
   s.add_runtime_dependency "rails_best_practices",  [">= 1.14.3", "~> 1.14"]
   s.add_runtime_dependency "metric_fu-Saikuro",     [">= 1.1.3",  "~> 1.1"]
-  s.add_runtime_dependency "roodi",                 ["~> 3.1"]
+  s.add_runtime_dependency "roodi",                 ["~> 5.0.0"]
   s.add_runtime_dependency "code_metrics",          ["~> 0.1"]
 
   # other dependencies