Skip to content

Commit e3fcfa0

Browse files
committed
Use local as source for gem dependencies when possible
1 parent 2139ca3 commit e3fcfa0

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

elasticsearch-persistence/Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ source 'https://rubygems.org'
33
# Specify your gem's dependencies in elasticsearch-persistence.gemspec
44
gemspec
55

6+
gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => false
67

78
gem 'virtus'

elasticsearch-persistence/elasticsearch-persistence.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
2323

2424
s.required_ruby_version = ">= 1.9.3"
2525

26-
s.add_dependency "elasticsearch", '~> 5'
27-
s.add_dependency "elasticsearch-model", '~> 5'
26+
s.add_dependency "elasticsearch", '~> 6'
27+
s.add_dependency "elasticsearch-model", '~> 6'
2828
s.add_dependency "activesupport", '> 4'
2929
s.add_dependency "activemodel", '> 4'
3030
s.add_dependency "hashie"

elasticsearch-rails/Gemfile

+5
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,8 @@ gemspec
77
# if File.exists? File.expand_path("../../elasticsearch-model", __FILE__)
88
# gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => true
99
# end
10+
11+
12+
13+
gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => false
14+
gem 'elasticsearch-persistence', :path => File.expand_path("../../elasticsearch-persistence", __FILE__), :require => false

elasticsearch-rails/elasticsearch-rails.gemspec

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
2727
s.add_development_dependency "rake", "~> 11.1"
2828

2929
s.add_development_dependency "elasticsearch-extensions"
30-
s.add_development_dependency "elasticsearch-model"
3130

3231
s.add_development_dependency "rails", ">= 3.1"
3332

0 commit comments

Comments
 (0)