Skip to content

Commit

Permalink
Drop Ruby 2.4 and 2.5 (#2951)
Browse files Browse the repository at this point in the history
  • Loading branch information
mullermp authored Nov 22, 2023
1 parent 9934e39 commit dca0f17
Show file tree
Hide file tree
Showing 28 changed files with 41 additions and 32 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, 3.2, jruby-9.1, jruby-9.2, jruby-9.3, jruby-9.4]
ruby: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2, jruby-9.2, jruby-9.3, jruby-9.4]
env: [KITCHEN_SINK, CRT]
exclude:
# CRT supports Ruby >= 2.5
- ruby: 2.3
env: CRT
- ruby: 2.4
env: CRT
- ruby: jruby-9.1
env: CRT

steps:
- name: Setup Ruby
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
AllCops:
TargetRubyVersion: 2.3
TargetRubyVersion: 2.5
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ group :repl do
end

group :development do
gem 'rubocop', '0.81.0'
gem 'rubocop', '1.28.0'
end

group :benchmark do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
spec.add_dependency('{{gem}}', '{{&version}}')
{{/dependencies}}

spec.required_ruby_version = '>= 2.3'
spec.required_ruby_version = '>= 2.5'
{{#deprecated?}}
spec.post_install_message = '*** {{gem_name}} is deprecated ***'
{{/deprecated?}}
Expand Down
4 changes: 2 additions & 2 deletions build_tools/services.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ class ServiceEnumerator
MANIFEST_PATH = File.expand_path('../../services.json', __FILE__)

# Minimum `aws-sdk-core` version for new gem builds
MINIMUM_CORE_VERSION = "3.184.0"
MINIMUM_CORE_VERSION = "3.188.0"

# Minimum `aws-sdk-core` version for new S3 gem builds
MINIMUM_CORE_VERSION_S3 = "3.181.0"
MINIMUM_CORE_VERSION_S3 = "3.188.0"

EVENTSTREAM_PLUGIN = "Aws::Plugins::EventStreamConfiguration"

Expand Down
2 changes: 2 additions & 0 deletions gems/aws-eventstream/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Unreleased Changes
------------------

* Feature - AWS SDK for Ruby no longer supports Ruby runtime versions 2.3 and 2.4.

1.2.0 (2021-09-01)
------------------

Expand Down
2 changes: 1 addition & 1 deletion gems/aws-eventstream/aws-eventstream.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ Gem::Specification.new do |spec|
'changelog_uri' => 'https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-eventstream/CHANGELOG.md'
}

spec.required_ruby_version = '>= 2.3'
spec.required_ruby_version = '>= 2.5'
end
2 changes: 2 additions & 0 deletions gems/aws-partitions/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Unreleased Changes
------------------

* Feature - AWS SDK for Ruby no longer supports Ruby runtime versions 2.3 and 2.4.

1.855.0 (2023-11-21)
------------------

Expand Down
2 changes: 1 addition & 1 deletion gems/aws-partitions/aws-partitions.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ Gem::Specification.new do |spec|
'changelog_uri' => 'https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-partitions/CHANGELOG.md',
}

spec.required_ruby_version = '>= 2.3'
spec.required_ruby_version = '>= 2.5'
end
2 changes: 2 additions & 0 deletions gems/aws-sdk-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Unreleased Changes
------------------

* Feature - AWS SDK for Ruby no longer supports Ruby runtime versions 2.3 and 2.4.

* Feature - Support `AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE` in `ECSCredentials` and also allow for ECS and EKS link-local http addresses.

3.187.1 (2023-11-20)
Expand Down
2 changes: 1 addition & 1 deletion gems/aws-sdk-core/aws-sdk-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
'changelog_uri' => 'https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-core/CHANGELOG.md'
}

spec.required_ruby_version = '>= 2.3'
spec.required_ruby_version = '>= 2.5'
end
2 changes: 1 addition & 1 deletion gems/aws-sdk-core/lib/aws-sdk-sts/presigner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def initialize(options = {})
# )
#
# This can be easily converted to a token used by the EKS service:
# {https://ruby-doc.org/stdlib-2.3.1/libdoc/base64/rdoc/Base64.html#method-i-encode64}
# {https://docs.ruby-lang.org/en/3.2/Base64.html#method-i-encode64}
# "k8s-aws-v1." + Base64.urlsafe_encode64(url).chomp("==")
def get_caller_identity_presigned_url(options = {})
req = @client.build_request(:get_caller_identity, {})
Expand Down
5 changes: 1 addition & 4 deletions gems/aws-sdk-core/lib/seahorse/client/net_http/patches.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,9 @@ module Patches

def self.apply!
Net::HTTPGenericRequest.prepend(PatchDefaultContentType)
return unless RUBY_VERSION < '2.5'

Net::HTTP::IDEMPOTENT_METHODS_.clear
end

# For requests with bodys, Net::HTTP sets a default content type of:
# For requests with bodies, Net::HTTP sets a default content type of:
# 'application/x-www-form-urlencoded'
# There are cases where we should not send content type at all.
# Even when no body is supplied, Net::HTTP uses a default empty body
Expand Down
6 changes: 3 additions & 3 deletions gems/aws-sdk-core/lib/seahorse/client/plugins/h2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ class H2 < Plugin
DOCS

option(:enable_alpn, default: false, doc_type: 'Boolean', docstring: <<-DOCS)
Setting to `true` to enable ALPN in HTTP2 over TLS, requires Ruby version >= 2.3 and
Openssl version >= 1.0.2. Defaults to false. Note: not all service HTTP2 operations
supports ALPN on server side, please refer to service documentation.
Set to `true` to enable ALPN in HTTP2 over TLS. Requires Openssl version >= 1.0.2.
Defaults to false. Note: not all service HTTP2 operations supports ALPN on server
side, please refer to service documentation.
DOCS

option(:logger)
Expand Down
2 changes: 2 additions & 0 deletions gems/aws-sdk-resources/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Unreleased Changes
------------------

* Feature - AWS SDK for Ruby no longer supports Ruby runtime versions 2.3 and 2.4.

3.176.0 (2023-11-21)
------------------

Expand Down
2 changes: 1 addition & 1 deletion gems/aws-sdk-resources/aws-sdk-resources.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -381,5 +381,5 @@ Gem::Specification.new do |spec|
'changelog_uri' => 'https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-resources/CHANGELOG.md'
}

spec.required_ruby_version = '>= 2.3'
spec.required_ruby_version = '>= 2.5'
end
2 changes: 2 additions & 0 deletions gems/aws-sdk-sso/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Unreleased Changes
------------------

* Feature - AWS SDK for Ruby no longer supports Ruby runtime versions 2.3 and 2.4.

1.11.0 (2022-08-30)
------------------

Expand Down
2 changes: 1 addition & 1 deletion gems/aws-sdk-sso/aws-sdk-sso.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
spec.add_dependency('aws-sdk-core', '~> 3', '>= 3.105.0')
spec.add_dependency('aws-sigv4', '~> 1.1')

spec.required_ruby_version = '>= 2.3'
spec.required_ruby_version = '>= 2.5'
end
2 changes: 2 additions & 0 deletions gems/aws-sdk-ssooidc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Unreleased Changes
------------------

* Feature - AWS SDK for Ruby no longer supports Ruby runtime versions 2.3 and 2.4.

1.23.0 (2022-09-30)
------------------

Expand Down
2 changes: 1 addition & 1 deletion gems/aws-sdk-ssooidc/aws-sdk-ssooidc.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
spec.add_dependency('aws-sdk-core', '~> 3', '>= 3.131.0')
spec.add_dependency('aws-sigv4', '~> 1.1')

spec.required_ruby_version = '>= 2.3'
spec.required_ruby_version = '>= 2.5'
end
2 changes: 2 additions & 0 deletions gems/aws-sdk-sts/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Unreleased Changes
------------------

* Feature - AWS SDK for Ruby no longer supports Ruby runtime versions 2.3 and 2.4.

1.10.0 (2023-05-08)
------------------

Expand Down
2 changes: 1 addition & 1 deletion gems/aws-sdk-sts/aws-sdk-sts.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
spec.add_dependency('aws-sdk-core', '~> 3', '>= 3.110.0')
spec.add_dependency('aws-sigv4', '~> 1.1')

spec.required_ruby_version = '>= 2.3'
spec.required_ruby_version = '>= 2.5'
end
2 changes: 2 additions & 0 deletions gems/aws-sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Unreleased Changes
------------------

* Feature - AWS SDK for Ruby no longer supports Ruby runtime versions 2.3 and 2.4.

3.1.0 (2021-09-01)
------------------

Expand Down
2 changes: 1 addition & 1 deletion gems/aws-sdk/aws-sdk.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
'changelog_uri' => 'https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk/CHANGELOG.md'
}

spec.required_ruby_version = '>= 2.3'
spec.required_ruby_version = '>= 2.5'
end
2 changes: 2 additions & 0 deletions gems/aws-sigv2/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Unreleased Changes
------------------

* Feature - AWS SDK for Ruby no longer supports Ruby runtime versions 2.3 and 2.4.

1.1.0 (2021-09-01)
------------------

Expand Down
2 changes: 1 addition & 1 deletion gems/aws-sigv2/aws-sigv2.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ Gem::Specification.new do |spec|
'changelog_uri' => 'https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sigv2/CHANGELOG.md'
}

spec.required_ruby_version = '>= 2.3'
spec.required_ruby_version = '>= 2.5'
end
2 changes: 2 additions & 0 deletions gems/aws-sigv4/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Unreleased Changes
------------------

* Feature - AWS SDK for Ruby no longer supports Ruby runtime versions 2.3 and 2.4.

1.6.1 (2023-10-25)
------------------

Expand Down
2 changes: 1 addition & 1 deletion gems/aws-sigv4/aws-sigv4.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ Gem::Specification.new do |spec|
'changelog_uri' => 'https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sigv4/CHANGELOG.md'
}

spec.required_ruby_version = '>= 2.3'
spec.required_ruby_version = '>= 2.5'
end

0 comments on commit dca0f17

Please sign in to comment.