Merge pull request #77 from doximity/zp-rails-6-compatibility

doximity · May 21, 2020 · 48ec0dc · 48ec0dc
2 parents 9d897c9 + 419d5ef
commit 48ec0dc
Show file tree

Hide file tree

Showing 28 changed files with 31 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [0.13.4] - 2020-05-20
+### Changed
+- Compatibility with Rails 6
+
 ## [0.13.3] - 2020-01-30
 ### Changed
 - Release on RubyGems using gem-publisher CircleCI Orb

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,47 +1,46 @@
 PATH
   remote: .
   specs:
-    es-elasticity (0.13.3)
-      activemodel (>= 4.0.0, < 6)
-      activerecord (>= 4.0.0, < 6)
-      activesupport (>= 4.0.0, < 6)
+    es-elasticity (0.13.4)
+      activemodel (>= 4.0.0, < 7)
+      activerecord (>= 4.0.0, < 7)
+      activesupport (>= 4.0.0, < 7)
       elasticsearch (>= 1.0)
 
 GEM
   remote: https://artifacts.dox.support/repository/gems/
   specs:
-    activemodel (5.2.4)
-      activesupport (= 5.2.4)
-    activerecord (5.2.4)
-      activemodel (= 5.2.4)
-      activesupport (= 5.2.4)
-      arel (>= 9.0)
-    activesupport (5.2.4)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
     byebug (11.0.1)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    elasticsearch (7.2.0)
-      elasticsearch-api (= 7.2.0)
-      elasticsearch-transport (= 7.2.0)
-    elasticsearch-api (7.2.0)
+    elasticsearch (7.7.0)
+      elasticsearch-api (= 7.7.0)
+      elasticsearch-transport (= 7.7.0)
+    elasticsearch-api (7.7.0)
       multi_json
-    elasticsearch-transport (7.2.0)
-      faraday
+    elasticsearch-transport (7.7.0)
+      faraday (~> 1)
       multi_json
-    faraday (0.17.1)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.13.0)
+    minitest (5.14.1)
     multi_json (1.14.1)
     multipart-post (2.1.1)
     oj (3.10.0)
@@ -70,8 +69,9 @@ GEM
     simplecov-html (0.7.1)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

diff --git a/es-elasticity.gemspec b/es-elasticity.gemspec
@@ -33,8 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.7.1"
   spec.add_development_dependency "timecop"
 
-  spec.add_dependency "activemodel",   ">= 4.0.0", "< 6"
-  spec.add_dependency "activerecord",   ">= 4.0.0", "< 6"
-  spec.add_dependency "activesupport", ">= 4.0.0", "< 6"
+  spec.add_dependency "activemodel",   ">= 4.0.0", "< 7"
+  spec.add_dependency "activerecord",   ">= 4.0.0", "< 7"
+  spec.add_dependency "activesupport", ">= 4.0.0", "< 7"
   spec.add_dependency "elasticsearch", ">= 1.0"
 end
diff --git a/lib/elasticity/version.rb b/lib/elasticity/version.rb
@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.13.3"
+  VERSION = "0.13.4"
 end
diff --git a/vendor/cache/activemodel-5.2.4.gem b/vendor/cache/activemodel-5.2.4.gem
diff --git a/vendor/cache/activemodel-6.0.3.1.gem b/vendor/cache/activemodel-6.0.3.1.gem
diff --git a/vendor/cache/activerecord-5.2.4.gem b/vendor/cache/activerecord-5.2.4.gem
diff --git a/vendor/cache/activerecord-6.0.3.1.gem b/vendor/cache/activerecord-6.0.3.1.gem
diff --git a/vendor/cache/activesupport-5.2.4.gem b/vendor/cache/activesupport-5.2.4.gem
diff --git a/vendor/cache/activesupport-6.0.3.1.gem b/vendor/cache/activesupport-6.0.3.1.gem
diff --git a/vendor/cache/arel-9.0.0.gem b/vendor/cache/arel-9.0.0.gem
diff --git a/vendor/cache/concurrent-ruby-1.1.5.gem b/vendor/cache/concurrent-ruby-1.1.5.gem
diff --git a/vendor/cache/concurrent-ruby-1.1.6.gem b/vendor/cache/concurrent-ruby-1.1.6.gem
diff --git a/vendor/cache/elasticsearch-7.2.0.gem b/vendor/cache/elasticsearch-7.2.0.gem
diff --git a/vendor/cache/elasticsearch-7.7.0.gem b/vendor/cache/elasticsearch-7.7.0.gem
diff --git a/vendor/cache/elasticsearch-api-7.2.0.gem b/vendor/cache/elasticsearch-api-7.2.0.gem
diff --git a/vendor/cache/elasticsearch-api-7.7.0.gem b/vendor/cache/elasticsearch-api-7.7.0.gem
diff --git a/vendor/cache/elasticsearch-transport-7.2.0.gem b/vendor/cache/elasticsearch-transport-7.2.0.gem
diff --git a/vendor/cache/elasticsearch-transport-7.7.0.gem b/vendor/cache/elasticsearch-transport-7.7.0.gem
diff --git a/vendor/cache/faraday-0.17.1.gem b/vendor/cache/faraday-0.17.1.gem
diff --git a/vendor/cache/faraday-1.0.1.gem b/vendor/cache/faraday-1.0.1.gem
diff --git a/vendor/cache/i18n-1.7.0.gem b/vendor/cache/i18n-1.7.0.gem
diff --git a/vendor/cache/i18n-1.8.2.gem b/vendor/cache/i18n-1.8.2.gem
diff --git a/vendor/cache/minitest-5.13.0.gem b/vendor/cache/minitest-5.13.0.gem
diff --git a/vendor/cache/minitest-5.14.1.gem b/vendor/cache/minitest-5.14.1.gem
diff --git a/vendor/cache/tzinfo-1.2.5.gem b/vendor/cache/tzinfo-1.2.5.gem
diff --git a/vendor/cache/tzinfo-1.2.7.gem b/vendor/cache/tzinfo-1.2.7.gem
diff --git a/vendor/cache/zeitwerk-2.3.0.gem b/vendor/cache/zeitwerk-2.3.0.gem