Merge branch 'update-rails-dependency'

nulogy · Nov 3, 2020 · eb37a28 · eb37a28
2 parents d9d734b + 1d27ea4
commit eb37a28
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 40 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,7 +1,10 @@
-require: rubocop-rspec
+require:
+  - rubocop-performance
+  - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5
+  NewCops: enable
+  TargetRubyVersion: 2.6
 
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## master (unreleased)
 
+## 0.0.3 (2020-11-03)
+
+* Support Rails 6.0
+* Bump development dependencies
+
 ## 0.0.2 (2020-05-30)
 
 * Add CHANGELOG

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    normalize_line_endings (0.0.2)
-      activesupport (~> 5.2.4.3, < 6.0)
+    normalize_line_endings (0.0.3)
+      activesupport (~> 5.2.4.3, < 6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -14,45 +14,49 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    ast (2.4.0)
+    ast (2.4.1)
     concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     minitest (5.14.1)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (1.8.2)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.84.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    rubocop-performance (1.6.0)
-      rubocop (>= 0.71.0)
-    rubocop-rspec (1.39.0)
-      rubocop (>= 0.68.1)
+    rubocop-ast (1.1.0)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.8.1)
+      rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
     ruby-progressbar (1.10.1)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
@@ -66,10 +70,10 @@ DEPENDENCIES
   activemodel (~> 5.2.4.3, < 6.0)
   normalize_line_endings!
   rake (~> 13.0)
-  rspec (~> 3.9)
-  rubocop (~> 0.84)
-  rubocop-performance (~> 1.6)
-  rubocop-rspec (~> 1.39)
+  rspec (~> 3.10)
+  rubocop (~> 0.93)
+  rubocop-performance (~> 1.8)
+  rubocop-rspec (~> 1.44)
 
 BUNDLED WITH
    2.1.4
diff --git a/lib/normalize_line_endings/version.rb b/lib/normalize_line_endings/version.rb
@@ -1,3 +1,3 @@
 module NormalizeLineEndings
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end
diff --git a/normalize_line_endings.gemspec b/normalize_line_endings.gemspec
@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "normalize_line_endings/version"
 
@@ -27,13 +27,14 @@ Gem::Specification.new do |spec|
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.6"
 
-  spec.add_dependency "activesupport", "~> 5.2.4.3", "< 6.0"
+  spec.add_dependency "activesupport", "~> 5.2.4.3", "< 6.1"
 
   spec.add_development_dependency "activemodel", "~> 5.2.4.3", "< 6.0"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.9"
-  spec.add_development_dependency "rubocop", "~> 0.84"
-  spec.add_development_dependency "rubocop-performance", "~> 1.6"
-  spec.add_development_dependency "rubocop-rspec", "~> 1.39"
+  spec.add_development_dependency "rspec", "~> 3.10"
+  spec.add_development_dependency "rubocop", "~> 0.93"
+  spec.add_development_dependency "rubocop-performance", "~> 1.8"
+  spec.add_development_dependency "rubocop-rspec", "~> 1.44"
 end