diff options
| -rw-r--r-- | .rubocop.yml | 5 | ||||
| -rw-r--r-- | Rakefile | 4 | ||||
| -rwxr-xr-x | bin/rubocop | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 03f007416e..24360fcb3f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,6 +2,7 @@ inherit_from: - .rubocop_todo.yml AllCops: + TargetRubyVersion: 1.9 Exclude: - tmp/**/* - lib/bundler/vendor/**/* @@ -57,7 +58,7 @@ Style/StringLiteralsInInterpolation: # Having these make it easier to *not* forget to add one when adding a new # value and you can simply copy the previous line. -Style/TrailingComma: +Style/TrailingCommaInLiteral: EnforcedStyleForMultiline: comma Style/TrailingUnderscoreVariable: @@ -84,7 +85,7 @@ Style/EachWithObject: Style/SpecialGlobalVars: Enabled: false -Style/TrailingComma: +Style/TrailingCommaInArguments: Enabled: false Performance/FlatMap: @@ -33,7 +33,7 @@ namespace :spec do deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d| [d.name, d.requirement.to_s] end] - deps["rubocop"] ||= "= 0.35.1" if RUBY_VERSION >= "1.9.3" # can't go in the gemspec because of the ruby version requirement + deps["rubocop"] ||= "= 0.36.0" if RUBY_VERSION >= "1.9.3" # can't go in the gemspec because of the ruby version requirement # JRuby can't build ronn or rdiscount, so we skip that if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby" @@ -87,7 +87,7 @@ begin if RUBY_VERSION >= "1.9.3" # can't go in the gemspec because of the ruby version requirement - gem "rubocop", "= 0.35.1" + gem "rubocop", "= 0.36.0" require "rubocop/rake_task" RuboCop::RakeTask.new end diff --git a/bin/rubocop b/bin/rubocop index 8142053393..b0a3d74dbd 100755 --- a/bin/rubocop +++ b/bin/rubocop @@ -7,7 +7,7 @@ bundler_spec.dependencies.each do |dep| gem dep.name, dep.requirement.to_s end -gem "rubocop", "= 0.35.1" +gem "rubocop", "= 0.36.0" Gem::Specification.unresolved_deps.each do |_name, dep| gem dep.name, *dep.requirement |