Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
activesupport: ['6.1', '7.0', '7.1', '7.2']
ruby: ['3.1', '3.2', '3.3']
ruby: ['3.1', '3.2', '3.3', '3.4']
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.3
3.4.2
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ group :development, :test do
gem 'simplecov', '~> 0.16'
end

# Required for combination of old activesupport (< 7.1) and new ruby (> 3.3)
gem 'base64'
gem 'bigdecimal'

if (version = ENV['ACTIVESUPPORT'])
gem 'activesupport', "~> #{version}.0"
end
3 changes: 2 additions & 1 deletion ja2r.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ Gem::Specification.new do |s|
s.homepage = 'https://github.com/mkon/ja2r'
s.summary = 'Simple JSON-API to ruby object conversion'
s.license = 'MIT'
s.required_ruby_version = '>= 3.1', '< 3.4'
s.required_ruby_version = '>= 3.1', '< 3.5'

s.files = Dir['{app,config,db,lib}/**/*', 'LICENSE', 'README.md']

s.add_dependency 'activesupport', '>= 6.1', '< 8.0'
s.add_dependency 'logger', '~> 1.6'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need logger as dependency? I did not find any use of logger. I removed it and tests worked just fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't look like it. I've pushed a commit to remove it.

Not sure what I was doing yesterday :)


s.metadata['rubygems_mfa_required'] = 'true'
end
2 changes: 2 additions & 0 deletions lib/ja2r.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require 'logger'

require 'active_support'
require 'active_support/core_ext/array'
require 'active_support/core_ext/hash'
Expand Down