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
10 changes: 8 additions & 2 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,17 @@ inputs:
runs:
using: composite
steps:
# JRuby 10 requires Java 21. The runner image defaults to an older Java.
- uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
if: ${{ startsWith(inputs.version, 'jruby') }}
with:
distribution: temurin
java-version: "21"

- uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
with:
ruby-version: ${{ inputs.version }}
# The Gemfile cooldown needs Bundler 4, which requires Ruby 3.2 or later.
bundler: ${{ startsWith(inputs.version, 'jruby-9') && '2' || '4.0.19' }}
bundler: "4.0.19"

- name: Install dependencies
if: ${{ inputs.install-dependencies == 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
version:
description: "The version of ruby to build against"
type: string
default: "3.2"
default: "3.4"
upload-artifact:
description: "Whether to upload the gem as an artifact"
type: boolean
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ["3.2", "3.4", "jruby-9.4"]
version: ["3.4", "4.0", "jruby-10.0"]
with:
version: ${{ matrix.version }}

Expand All @@ -27,7 +27,7 @@ jobs:

- uses: ./.github/actions/setup
with:
version: "3.2"
version: "3.4"

- uses: ./.github/actions/build-docs

Expand All @@ -46,7 +46,7 @@ jobs:

- uses: ./.github/actions/setup
with:
version: "3.2"
version: "3.4"

- name: Run tests
run: bundle exec rspec spec
2 changes: 1 addition & 1 deletion .github/workflows/manual-publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

- uses: ./.github/actions/setup
with:
version: "3.2"
version: "3.4"
install-dependencies: false

- uses: ./.github/actions/build-docs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/manual-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
build-ruby-gem:
uses: ./.github/workflows/build-gem.yml
with:
version: "3.2"
version: "3.4"

build-jruby-gem:
uses: ./.github/workflows/build-gem.yml
with:
version: "jruby-9.4"
version: "jruby-10.0"

publish:
runs-on: ubuntu-latest
Expand All @@ -32,7 +32,7 @@ jobs:

- uses: ./.github/actions/setup
with:
version: "3.2"
version: "3.4"
install-dependencies: false

- uses: launchdarkly/gh-actions/actions/release-secrets@release-secrets-v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ jobs:
if: ${{ needs.release-package.outputs.release-created == 'true' }}
uses: ./.github/workflows/build-gem.yml
with:
version: "3.2"
version: "3.4"

build-jruby-gem:
needs: ["release-package"]
if: ${{ needs.release-package.outputs.release-created == 'true' }}
uses: ./.github/workflows/build-gem.yml
with:
version: "jruby-9.4"
version: "jruby-10.0"

publish:
runs-on: ubuntu-latest
Expand All @@ -49,7 +49,7 @@ jobs:

- uses: ./.github/actions/setup
with:
version: "3.2"
version: "3.4"
install-dependencies: false

- uses: launchdarkly/gh-actions/actions/release-secrets@release-secrets-v1
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins:
- rubocop-performance

AllCops:
TargetRubyVersion: 3.1
TargetRubyVersion: 3.4
Include:
- lib/**/*.rb
- spec/**/*.rb
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 3.1.0.
This version of the LaunchDarkly SDK has a minimum Ruby version of 3.4.0. On JRuby, the minimum is JRuby 10.0, which requires Java 21.

Getting started
-----------
Expand Down
2 changes: 1 addition & 1 deletion launchdarkly-server-sdk.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
spec.files = Dir["lib/**/*.rb", "README.md", "LICENSE.txt"]
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]
spec.required_ruby_version = ">= 3.1.0"
spec.required_ruby_version = ">= 3.4.0"

spec.add_development_dependency "aws-sdk-dynamodb", "~> 1.57"
spec.add_development_dependency "bigdecimal", "~> 3.1.1" # Neccessary for aws-sdk-dynamodb https://github.com/aws/aws-sdk-ruby/issues/3271
Expand Down
Loading