diff --git a/.circleci/config.yml b/.circleci/config.yml index 23fcf9e1..fcfbc059 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,35 +1,24 @@ -version: 2 +version: 2.1 jobs: - "Test against Ruby 2.4": + test: + parameters: + ruby_version: + type: string docker: - - image: circleci/ruby:2.4.9 - working_directory: ~/intercom-ruby + - image: cimg/ruby:<< parameters.ruby_version >> steps: - checkout - run: bundle install - run: bundle exec rake - "Test against Ruby 2.5": - docker: - - image: circleci/ruby:2.5.7 - working_directory: ~/intercom-ruby - steps: - - checkout - - run: bundle install - - run: bundle exec rake - "Test against Ruby 2.6": - docker: - - image: circleci/ruby:2.6.5 - working_directory: ~/intercom-ruby - steps: - - checkout - - run: bundle install - - run: bundle exec rake - workflows: - version: 2 build_and_test: jobs: - - "Test against Ruby 2.4" - - "Test against Ruby 2.5" - - "Test against Ruby 2.6" - + - test: + name: "Test against Ruby 3.1" + ruby_version: "3.1" + - test: + name: "Test against Ruby 3.2" + ruby_version: "3.2" + - test: + name: "Test against Ruby 3.3" + ruby_version: "3.3" diff --git a/intercom.gemspec b/intercom.gemspec index a6878d55..584f530d 100644 --- a/intercom.gemspec +++ b/intercom.gemspec @@ -18,9 +18,9 @@ Gem::Specification.new do |spec| spec.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_development_dependency 'minitest', '~> 5.4' + spec.add_development_dependency 'minitest', '~> 5.4', '< 5.19' spec.add_development_dependency "m", "~> 1.5.0" - spec.add_development_dependency 'rake', '~> 10.3' + spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'mocha', '~> 1.0' spec.add_development_dependency "fakeweb", ["~> 1.3"] spec.add_development_dependency "pry" diff --git a/lib/intercom/client.rb b/lib/intercom/client.rb index 5b3f607f..a72b1248 100644 --- a/lib/intercom/client.rb +++ b/lib/intercom/client.rb @@ -23,7 +23,7 @@ def set_timeouts(open_timeout: nil, read_timeout: nil) timeouts[:open_timeout] = open_timeout if open_timeout timeouts[:read_timeout] = read_timeout if read_timeout o.send(:timeouts=, timeouts) - proc { |_obj| set_timeouts(old_timeouts).call(o) } + proc { |_obj| set_timeouts(**old_timeouts).call(o) } end end end