From 8623830967d615619bab8759b9390ab3b553603a Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 27 Mar 2017 13:38:56 -0700 Subject: [PATCH 1/4] rails 5.1 support --- CHANGELOG.md | 4 ++++ circle.yml | 2 +- ldclient-rb.gemspec | 2 +- lib/ldclient-rb/version.rb | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3f02bf2..e1589d20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the LaunchDarkly Ruby SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org). +## [2.1.1] - 2017-03-22 +## Changed +- Bumped nio4r to 2.0 + ## [2.0.6] - 2017-02-10 ## Changed - Improved handling of http status codes that may not be integers. diff --git a/circle.yml b/circle.yml index b9b92b98..6ab86988 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: environment: - RUBIES: "ruby-2.2.3;ruby-2.1.7;ruby-2.0.0;ruby-1.9.3;jruby-1.7.22" + RUBIES: "ruby-2.4.1;ruby-2.2.2;jruby-9.0.0.0" dependencies: cache_directories: diff --git a/ldclient-rb.gemspec b/ldclient-rb.gemspec index 65f70532..a01f8a70 100644 --- a/ldclient-rb.gemspec +++ b/ldclient-rb.gemspec @@ -33,7 +33,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "hashdiff", "~> 0.2" spec.add_runtime_dependency "ld-celluloid-eventsource", "~> 0.9.0" spec.add_runtime_dependency "celluloid", "~> 0.18.0.pre" # transitive dep; specified here for more control - spec.add_runtime_dependency "nio4r", "~> 1.1" # for maximum ruby version compatibility. + spec.add_runtime_dependency "nio4r", "~> 2.0" # for maximum ruby version compatibility. spec.add_runtime_dependency "waitutil", "0.2" end diff --git a/lib/ldclient-rb/version.rb b/lib/ldclient-rb/version.rb index cc6064e3..b8ba2b7c 100644 --- a/lib/ldclient-rb/version.rb +++ b/lib/ldclient-rb/version.rb @@ -1,3 +1,3 @@ module LaunchDarkly - VERSION = "2.1.0" + VERSION = "2.1.1" end From 011065d66a01b8c3585d595049799d9d4c86d7ef Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 27 Mar 2017 14:55:59 -0700 Subject: [PATCH 2/4] empty commit From 41577d6c68c1f5fd25148cbb09587d857051c66f Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 27 Mar 2017 15:27:57 -0700 Subject: [PATCH 3/4] noi4r based on version --- circle.yml | 2 +- ldclient-rb.gemspec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 6ab86988..cc2e0b85 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: environment: - RUBIES: "ruby-2.4.1;ruby-2.2.2;jruby-9.0.0.0" + 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" dependencies: cache_directories: diff --git a/ldclient-rb.gemspec b/ldclient-rb.gemspec index a01f8a70..00da26f9 100644 --- a/ldclient-rb.gemspec +++ b/ldclient-rb.gemspec @@ -33,7 +33,12 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "hashdiff", "~> 0.2" spec.add_runtime_dependency "ld-celluloid-eventsource", "~> 0.9.0" spec.add_runtime_dependency "celluloid", "~> 0.18.0.pre" # transitive dep; specified here for more control - spec.add_runtime_dependency "nio4r", "~> 2.0" # for maximum ruby version compatibility. + + if RUBY_VERSION >= '2.2.2' + spec.add_runtime_dependency "nio4r", "< 3" # for maximum ruby version compatibility. + else + spec.add_runtime_dependency "nio4r", "~> 1.1" # for maximum ruby version compatibility. + end spec.add_runtime_dependency "waitutil", "0.2" end From 03b89eacf460b66a1df1dff234a8817f32a359c7 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 28 Mar 2017 13:50:34 -0700 Subject: [PATCH 4/4] updating changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1589d20..d09bafa8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the LaunchDarkly Ruby SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org). -## [2.1.1] - 2017-03-22 +## [2.1.1] - 2017-03-28 ## Changed - Bumped nio4r to 2.0