Skip to content

Commit

Permalink
Style fixes for Gemfile and .rubocop.yml (#315)
Browse files Browse the repository at this point in the history
* Minor cleanup of Gemfile

Signed-off-by: Cory Hutchison <cory.hutchison@shopify.com>

* Minor cleanup of .rubocop.yml

Signed-off-by: Cory Hutchison <cory.hutchison@shopify.com>
  • Loading branch information
mutecipher committed May 18, 2021
1 parent 8f04dd4 commit e680cc6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .rubocop.yml
Expand Up @@ -9,15 +9,15 @@ require:
AllCops:
TargetRubyVersion: 2.4
Exclude:
- 'vendor/**/*'
- "vendor/**/*"
- "spec/support/repo/bin/tapioca"

Style/CaseEquality:
Enabled: false

Style/ClassAndModuleChildren:
Exclude:
- spec/tapioca/**/*
- "spec/tapioca/**/*"

Sorbet:
Enabled: true
Expand Down
26 changes: 12 additions & 14 deletions Gemfile
Expand Up @@ -4,18 +4,18 @@ source("https://rubygems.org")

gemspec

gem 'rubocop-shopify', require: false

group(:deployment, :development) do
gem("rake")
end

gem("yard", "~> 0.9.25")
gem("pry-byebug")
gem("minitest")
gem("minitest-hooks")
gem("minitest-reporters")
gem("pry-byebug")
gem("rubocop-shopify", require: false)
gem("rubocop-sorbet", ">= 0.4.1")
gem("sorbet")
gem("yard", "~> 0.9.25")

group(:deployment, :development) do
gem("rake")
end

group(:development, :test) do
gem("smart_properties", ">= 1.15.0", require: false)
Expand All @@ -26,15 +26,13 @@ group(:development, :test) do
gem("activerecord-typedstore", "~> 1.3", require: false)
gem("sqlite3")
gem("identity_cache", "~> 1.0", require: false)
gem('cityhash', git: 'https://github.com/csfrancis/cityhash.git',
ref: '3cfc7d01f333c01811d5e834f1495eaa29f87c36', require: false)
gem("cityhash", git: "https://github.com/csfrancis/cityhash.git",
ref: "3cfc7d01f333c01811d5e834f1495eaa29f87c36", require: false)
gem("activemodel-serializers-xml", "~> 1.0", require: false)
gem("activeresource", "~> 5.1", require: false)
gem("google-protobuf", "~>3.12.0", require: false)
gem("google-protobuf", "~> 3.12.0", require: false)
# Fix version to 0.14.1 since it is the last version to support Ruby 2.4
gem("shopify-money", "= 0.14.1", require: false)
gem("sidekiq", "~>5.0", require: false) # Version 6 dropped support for Ruby 2.4
gem("sidekiq", "~> 5.0", require: false) # Version 6 dropped support for Ruby 2.4
gem("nokogiri", "1.10.10", require: false) # Lock to last supported for Ruby 2.4
end

gem "rubocop-sorbet", ">= 0.4.1"

0 comments on commit e680cc6

Please sign in to comment.