Skip to content

Commit

Permalink
Merge pull request #1091 from tagliala/chore/remove-legacy-checks
Browse files Browse the repository at this point in the history
Remove legacy Ruby version conditionals
  • Loading branch information
semmons99 authored Apr 15, 2024
2 parents 7ff3695 + 62652c8 commit 37e183a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby-version: ['3.1', '3.2', '3.3']
ruby-version: ['3.1', '3.2', '3.3', 'jruby-9.4']

steps:
- uses: actions/checkout@v4
Expand Down
12 changes: 2 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,7 @@ source 'https://rubygems.org'

gem 'pry', require: false

# JSON gem no longer supports ruby < 2.0.0
if defined?(JRUBY_VERSION)
gem 'json'
elsif RUBY_VERSION =~ /^1/
# Legacy gem locks for ruby 1.9.x
gem 'json', '~> 1.8.3'
gem 'tins', '~> 1.6.0'
gem 'term-ansicolor', '< 1.4'
end
gem 'i18n', '<= 1.2.0' if RUBY_VERSION < '2.3'
gem 'rbs', platforms: %i[mri mingw x64_mingw]
gem 'typeprof', platforms: %i[mri mingw x64_mingw]

gemspec
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ A Ruby Library for dealing with money and currency conversion.

- Your app must use UTF-8 to function with this library. There are a
number of non-ASCII currency attributes.
- This app requires JSON. If you're using JRuby < 1.7.0
you'll need to add `gem "json"` to your Gemfile or similar.

## Downloading

Expand Down Expand Up @@ -351,11 +349,11 @@ The following example implements a `Redis` store to save exchange rates to a red

class RedisRateStore
INDEX_KEY_SEPARATOR = '_TO_'.freeze

# Using second db of the redis instance
# because sidekiq uses the first db
REDIS_DATABASE = 1

# Using Hash to store rates data
REDIS_STORE_KEY = 'rates'

Expand Down
2 changes: 0 additions & 2 deletions money.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ Gem::Specification.new do |s|
s.add_development_dependency "rspec", "~> 3.4"
s.add_development_dependency "yard", "~> 0.9.11"
s.add_development_dependency "kramdown", "~> 2.3"
s.add_development_dependency "rbs" if RUBY_VERSION >= "2.7.0"
s.add_development_dependency "typeprof" if RUBY_VERSION >= "2.7.0"

s.required_ruby_version = '>= 3.1'

Expand Down

0 comments on commit 37e183a

Please sign in to comment.