Skip to content

Commit 2e59185

Browse files
authored
Merge pull request #37 from launchdarkly/update-java-and-faraday
Update json and faraday dependencies. Also generate Gemfile.lock separately for each ruby version.
2 parents 5ec608a + 7a1aa2d commit 2e59185

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

circle.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
machine:
22
environment:
3-
RUBIES: "ruby-2.4.1;ruby-2.2.3;ruby-2.1.7;ruby-2.0.0;ruby-1.9.3;jruby-1.7.22"
3+
RUBIES: "ruby-2.4.1;ruby-2.2.3;ruby-2.1.7;ruby-2.0.0;ruby-1.9.3;jruby-1.7.22"
44
services:
55
- redis
66

@@ -18,6 +18,7 @@ dependencies:
1818
gem install jruby-openssl; # required by bundler, no effect on Ruby MRI
1919
gem install bundler;
2020
bundle install;
21+
mv Gemfile.lock "Gemfile.lock.$i"
2122
done
2223
2324
test:
@@ -27,5 +28,6 @@ test:
2728
for i in "${rubiesArray[@]}";
2829
do
2930
rvm use $i;
31+
cp "Gemfile.lock.$i" Gemfile.lock;
3032
bundle exec rspec spec;
3133
done

ldclient-rb.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
2929
spec.add_development_dependency "connection_pool", ">= 2.1.2"
3030
spec.add_development_dependency "moneta", "~> 1.0.0"
3131

32-
spec.add_runtime_dependency "json", "~> 1.8"
33-
spec.add_runtime_dependency "faraday", "~> 0.9"
34-
spec.add_runtime_dependency "faraday-http-cache", "~> 1.3.0"
32+
spec.add_runtime_dependency "json", [">= 1.8", "< 3"]
33+
spec.add_runtime_dependency "faraday", [">= 0.9", "< 2"]
34+
spec.add_runtime_dependency "faraday-http-cache", [">= 1.3.0", "< 3"]
3535
spec.add_runtime_dependency "thread_safe", "~> 0.3"
3636
spec.add_runtime_dependency "net-http-persistent", "~> 2.9"
3737
spec.add_runtime_dependency "concurrent-ruby", "~> 1.0.4"

0 commit comments

Comments
 (0)