Skip to content

Commit

Permalink
Merge pull request #11 from charitywater/upgrade-maji-snss-to-use-bun…
Browse files Browse the repository at this point in the history
…dler-2-0-1-166913897

Upgrade Ruby & Bundler, add rubocop-rails
  • Loading branch information
jasdeepgosal committed Aug 26, 2019
2 parents 603beb3 + 35ed638 commit 73d0f6d
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
2.3.3
2.6.3
5 changes: 3 additions & 2 deletions cw-style.gemspec
Expand Up @@ -28,10 +28,11 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "rubocop", ">= 0.53.0"
spec.add_dependency "rubocop", ">= 0.74.0"
spec.add_dependency "rubocop-rspec-focused", "= 0.0.3"
spec.add_dependency "rubocop-thread_safety"
spec.add_development_dependency "bundler", "~> 1.15"
spec.add_dependency "rubocop-rails"
spec.add_development_dependency "bundler", "~> 2.0.2"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "rspec"
spec.add_development_dependency "debugger-ruby_core_source"
Expand Down
3 changes: 2 additions & 1 deletion default.yml
@@ -1,12 +1,13 @@
require:
- rubocop/rspec/focused
- rubocop-thread_safety
- rubocop-rails
- ./lib/unless_with_multiple_conditions
- ./lib/private_attribute_accessors
- ./lib/update_not_update_attributes

AllCops:
TargetRubyVersion: 2.3
TargetRubyVersion: 2.6
Exclude:
- '*.gemspec'

Expand Down
2 changes: 1 addition & 1 deletion lib/charity_water/style/version.rb
@@ -1,5 +1,5 @@
module CharityWater
module Style
VERSION = '2.2.0'.freeze
VERSION = '3.0.0'.freeze
end
end
2 changes: 1 addition & 1 deletion spec/private_attribute_accessors_spec.rb
Expand Up @@ -25,7 +25,7 @@ def parse_source(source, file = nil)
file = file.path
end

RuboCop::ProcessedSource.new(source, 2.3, file)
RuboCop::ProcessedSource.new(source, 2.6, file)
end

def _investigate(cop, processed_source)
Expand Down
2 changes: 1 addition & 1 deletion spec/unless_with_multiple_conditions_spec.rb
Expand Up @@ -23,7 +23,7 @@ def parse_source(source, file = nil)
file = file.path
end

RuboCop::ProcessedSource.new(source, 2.3, file)
RuboCop::ProcessedSource.new(source, 2.6, file)
end

def _investigate(cop, processed_source)
Expand Down
2 changes: 1 addition & 1 deletion spec/update_not_update_attributes_spec.rb
Expand Up @@ -23,7 +23,7 @@ def parse_source(source, file = nil)
file = file.path
end

RuboCop::ProcessedSource.new(source, 2.3, file)
RuboCop::ProcessedSource.new(source, 2.6, file)
end

def _investigate(cop, processed_source)
Expand Down

0 comments on commit 73d0f6d

Please sign in to comment.