Skip to content

Commit

Permalink
Merge branch 'hotfix/v1.1.4' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
genaromadrid committed Jul 7, 2017
2 parents c3499a7 + 270d35a commit 28f0208
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ rubocop.html
.ruby-gemset
.ruby-version
*.sublime-workspace
vendor
1 change: 1 addition & 0 deletions lib/mifiel/document.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'open3'
require 'api-auth'

module Mifiel
class Document < Mifiel::Base
Expand Down
2 changes: 1 addition & 1 deletion lib/mifiel/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Mifiel
VERSION = '1.1.3'.freeze
VERSION = '1.1.4'.freeze
end
10 changes: 6 additions & 4 deletions mifiel.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@ Gem::Specification.new do |spec|

spec.add_runtime_dependency 'rest-client', '~> 1.7'
spec.add_runtime_dependency 'json', '> 0'
spec.add_runtime_dependency 'api-auth', '> 1.4'
spec.add_runtime_dependency 'api-auth', '~> 1.4'
# Use Gem::Version to parse the Ruby version for reliable comparison
# ActiveSupport 5+ requires Ruby 2.2.2
if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.2.2')
spec.add_runtime_dependency 'activesupport'
else
spec.add_runtime_dependency 'activesupport', '~> 4.2.7'
spec.add_runtime_dependency 'activesupport', '< 5.0.0'
end
spec.add_runtime_dependency 'flexirest'
spec.add_runtime_dependency 'flexirest', '~> 1.3.35'

spec.add_development_dependency 'bundler', '~> 1.6'
spec.add_development_dependency 'rake', '~> 10.0'
Expand All @@ -37,6 +39,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'bump', '~> 0.5', '>= 0.5.3'
spec.add_development_dependency 'webmock', '~> 1.22', '>= 1.22.2'
spec.add_development_dependency 'sinatra', '~> 1.4', '>= 1.4.7'
spec.add_development_dependency 'rubocop', '~> 0.36'
spec.add_development_dependency 'rubocop', '0.47.1'
spec.add_development_dependency 'simplecov', '~> 0.11'
end

0 comments on commit 28f0208

Please sign in to comment.