Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update required Ruby version to 3.2.0 #5341

Merged
merged 1 commit into from
Dec 11, 2024
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/workflows/ruby-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
version:
- 3.1
- 3.2
gemfile:
- gemfiles/Gemfile.rails50
- gemfiles/Gemfile.rails51
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ AllCops:
- "lib/active_merchant/billing/gateways/paypal_express.rb"
- "vendor/**/*"
ExtraDetails: false
TargetRubyVersion: 3.1
TargetRubyVersion: 3.2

# Active Merchant gateways are not amenable to length restrictions
Metrics/ClassLength:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
* Worldpay: Fix stored credentials unscheduled reason type [Buitragox] #5352
* Worldpay: Worldpay: Idempotency key fix [jherreraa] #5359
* Hi Pay: Don't add 3ds when :three_ds_2 is missing [Buitragox] #5355
* Update required Ruby version to 3.2.0 [almalee24] #5341

== Version 1.137.0 (August 2, 2024)
* Unlock dependency on `rexml` to allow fixing a CVE (#5181).
Expand Down
2 changes: 1 addition & 1 deletion activemerchant.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Gem::Specification.new do |s|
s.email = '[email protected]'
s.homepage = 'http://activemerchant.org/'

s.required_ruby_version = '>= 3.1'
s.required_ruby_version = '>= 3.2'

s.files = Dir['CHANGELOG', 'README.md', 'MIT-LICENSE', 'CONTRIBUTORS', 'lib/**/*', 'vendor/**/*']
s.require_path = 'lib'
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
machine:
ruby:
version: '3.1.0'
version: '3.2.0'

dependencies:
cache_directories:
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/Gemfile.rails_master
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
eval_gemfile '../Gemfile'

gem 'activesupport', '~>7.2.1'
gem 'activesupport', github: 'rails/rails'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Moving it back to what it used to be

4 changes: 2 additions & 2 deletions test/unit/gateways/braintree_token_nonce_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def test_build_nonce_request_for_credit_card_without_address
end

def test_token_from
credit_card = credit_card(number: 4111111111111111)
credit_card = credit_card('4111111111111111')
c_token = @generator.send(:token_from, credit_card, token_credit_response)
assert_match(/tokencc_/, c_token)

Expand All @@ -95,7 +95,7 @@ def test_token_from
end

def test_nil_token_from
credit_card = credit_card(number: 4111111111111111)
credit_card = credit_card('4111111111111111')
c_token = @generator.send(:token_from, credit_card, token_bank_response)
assert_nil c_token

Expand Down
2 changes: 1 addition & 1 deletion test/unit/gateways/versa_pay_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def test_parse_invalid_json

assert_equal({ 'errors' => '{"key1": "value1", "key2": "value2"',
'status' => 'Unable to parse JSON response',
'message' => "859: unexpected token at '{\"key1\": \"value1\", \"key2\": \"value2\"'" },
'message' => "unexpected token at '{\"key1\": \"value1\", \"key2\": \"value2\"'" },
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This test is failing in master

@gateway.send(:parse, body))
end

Expand Down
Loading