Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/check/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ runs:

- name: Run tests
shell: bash
run: bundle _2.2.33_ exec rspec spec $SPEC_TAGS
run: bundle exec rspec spec $SPEC_TAGS

- name: Run RuboCop
shell: bash
Expand Down
3 changes: 1 addition & 2 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ runs:
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ inputs.version }}
bundler: 2.2.33

- name: Install dependencies
if: ${{ inputs.install-dependencies == 'true' }}
shell: bash
run: bundle _2.2.33_ install
run: bundle install
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ jobs:
version: '3.0'

- name: Run tests
run: bundle _2.2.33_ exec rspec spec
run: bundle exec rspec spec
4 changes: 2 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require:
plugins:
- rubocop-performance

AllCops:
Expand Down Expand Up @@ -289,7 +289,7 @@ Style/PerlBackrefs:
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers'
Enabled: false

Naming/PredicateName:
Naming/PredicatePrefix:
Description: 'Check the names of predicate methods.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark'
ForbiddenPrefixes:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ TEMP_TEST_OUTPUT=/tmp/contract-test-service.log
TEST_HARNESS_PARAMS=

build-contract-tests:
@cd contract-tests && bundle _2.2.33_ install
@cd contract-tests && bundle install

start-contract-test-service:
@cd contract-tests && bundle _2.2.33_ exec ruby service.rb
@cd contract-tests && bundle exec ruby service.rb

start-contract-test-service-bg:
@echo "Test service output will be captured in $(TEMP_TEST_OUTPUT)"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ LaunchDarkly overview
Supported Ruby versions
-----------------------

This version of the LaunchDarkly SDK has a minimum Ruby version of 2.5.0, or 9.2.0 for JRuby.
This version of the LaunchDarkly SDK has a minimum Ruby version of 3.0.0, or 9.3.0 for JRuby.

Getting started
-----------
Expand Down
20 changes: 10 additions & 10 deletions launchdarkly-server-sdk.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,28 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = ">= 3.0.0"

spec.add_development_dependency "aws-sdk-dynamodb", "~> 1.57"
spec.add_development_dependency "rexml", "~> 3.3", ">= 3.3.7"
spec.add_development_dependency "bundler", "2.2.33"
spec.add_development_dependency "simplecov", "~> 0.21"
spec.add_development_dependency "rspec", "~> 3.10"
spec.add_development_dependency "bundler", "~> 2.2", ">= 2.2.3"
spec.add_development_dependency "connection_pool", "~> 2.3"
spec.add_development_dependency "diplomat", "~> 2.6"
spec.add_development_dependency "listen", "~> 3.3" # see file_data_source.rb
spec.add_development_dependency "redis", "~> 5.0"
spec.add_development_dependency "connection_pool", "~> 2.3"
spec.add_development_dependency "rexml", "~> 3.3", ">= 3.3.7"
spec.add_development_dependency "rspec", "~> 3.10"
spec.add_development_dependency "rspec_junit_formatter", "~> 0.4"
spec.add_development_dependency "rubocop", "~> 1.76"
spec.add_development_dependency "rubocop-performance", "~> 1.25"
spec.add_development_dependency "simplecov", "~> 0.21"
spec.add_development_dependency "timecop", "~> 0.9"
spec.add_development_dependency "listen", "~> 3.3" # see file_data_source.rb
spec.add_development_dependency "webrick", "~> 1.7"
spec.add_development_dependency "rubocop", "~> 1.37"
spec.add_development_dependency "rubocop-performance", "~> 1.15"

spec.add_runtime_dependency "semantic", "~> 1.6"
spec.add_runtime_dependency "concurrent-ruby", "~> 1.1"
spec.add_runtime_dependency "ld-eventsource", "2.2.3"
spec.add_runtime_dependency "observer", "~> 0.1.2"
spec.add_runtime_dependency "semantic", "~> 1.6"
spec.add_runtime_dependency "zlib", "~> 3.1" unless RUBY_PLATFORM == "java"
# Please keep ld-eventsource dependency as an exact version so that bugfixes to
# that LD library are always associated with a new SDK version.

spec.add_runtime_dependency "json", "~> 2.3"
spec.add_runtime_dependency "http", ">= 4.4.0", "< 6.0.0"
spec.add_runtime_dependency "json", "~> 2.3"
end
4 changes: 2 additions & 2 deletions spec/impl/repeating_task_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def null_logger
3.times do
time = queue.pop
unless last.nil?
expect(time.to_f - last.to_f).to be >=(0.05)
expect(time.to_f - last.to_f).to be >= 0.05
end
last = time
end
Expand All @@ -50,7 +50,7 @@ def null_logger
2.times do
begin
time = queue.pop(true)
expect(time.to_f).to be <=(stopped_time.to_f)
expect(time.to_f).to be <= stopped_time.to_f
rescue ThreadError
no_more_items = true
break
Expand Down
4 changes: 2 additions & 2 deletions spec/launchdarkly-server-sdk_spec_autoloadtest.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require "bundler/setup"
require "bundler/inline"

gemfile do
gem "launchdarkly-server-sdk", path: "."
# Inline gemfiles don't appear to load the gemspec so we are loading it explicitly
gemspec
end

Bundler.require(:development)
Expand Down