From de0a7a0a847cf658b57638af94496f037d34e288 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Sun, 22 Aug 2021 10:54:00 -0700 Subject: [PATCH] Fixed UnsupportedProductError - fixes #1509 --- Gemfile | 2 +- README.md | 6 ------ gemfiles/opensearch.gemfile | 1 - searchkick.gemspec | 2 +- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index ee9bb57..bb5a52c 100644 --- a/Gemfile +++ b/Gemfile @@ -13,5 +13,5 @@ gem "typhoeus" gem "redis" gem "connection_pool" gem "kaminari" -gem "elasticsearch-xpack", ">= 7.8.0" +gem "elasticsearch-xpack", ">= 7.8", "< 7.14" gem "parallel_tests" diff --git a/README.md b/README.md index 4e066de..ec57f8d 100644 --- a/README.md +++ b/README.md @@ -58,12 +58,6 @@ Add this line to your application’s Gemfile: gem 'searchkick' ``` -For OpenSearch, also add: - -```ruby -gem 'elasticsearch', '< 7.14' -``` - The latest version works with Elasticsearch 6 and 7 and OpenSearch 1. For Elasticsearch 5, use version 3.1.3 and [this readme](https://github.com/ankane/searchkick/blob/v3.1.3/README.md). Add searchkick to models you want to search. diff --git a/gemfiles/opensearch.gemfile b/gemfiles/opensearch.gemfile index a73a69f..4eea1cc 100644 --- a/gemfiles/opensearch.gemfile +++ b/gemfiles/opensearch.gemfile @@ -13,6 +13,5 @@ gem "typhoeus" gem "redis" gem "connection_pool" gem "kaminari" -gem "elasticsearch", "< 7.14" gem "elasticsearch-xpack", ">= 7.8", "< 7.14" gem "parallel_tests" diff --git a/searchkick.gemspec b/searchkick.gemspec index af0ee2d..b1b9600 100644 --- a/searchkick.gemspec +++ b/searchkick.gemspec @@ -16,6 +16,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.4" spec.add_dependency "activemodel", ">= 5" - spec.add_dependency "elasticsearch", ">= 6" + spec.add_dependency "elasticsearch", ">= 6", "< 7.14" spec.add_dependency "hashie" end -- libgit2 0.21.0