From e963d2adba74804a6afa7dbd71f0238dc9135b17 Mon Sep 17 00:00:00 2001 From: Sarah Sunday <3252602+ssunday@users.noreply.github.com> Date: Mon, 24 Jun 2024 09:47:22 -0500 Subject: [PATCH 1/5] [CI] Drop old ruby/rails tests --- .github/workflows/ci.yml | 27 ++------------------------- gemfiles/rails-5.2.gemfile | 8 -------- gemfiles/rails-6.0.gemfile | 5 ----- gemfiles/rails-6.1.gemfile | 5 ----- test/test_helper.rb | 1 + 5 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 gemfiles/rails-5.2.gemfile delete mode 100644 gemfiles/rails-6.0.gemfile delete mode 100644 gemfiles/rails-6.1.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61af76cd..1af01163 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,33 +15,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2, 3.3, jruby-9.2, jruby-9.3, jruby-9.4] - gemfile: [rails-5.2.gemfile, rails-6.0.gemfile, rails-6.1.gemfile, rails-7.0.gemfile, rails-main.gemfile] + ruby: [2.7, '3.0', 3.1, 3.2, 3.3, jruby-9.2, jruby-9.3, jruby-9.4] + gemfile: [rails-7.0.gemfile, rails-main.gemfile] exclude: - # Rails 5 does not work with Ruby 3 - - gemfile: rails-5.2.gemfile - ruby: '3.0' - - gemfile: rails-5.2.gemfile - ruby: 3.1 - - gemfile: rails-5.2.gemfile - ruby: 3.2 - - gemfile: rails-5.2.gemfile - ruby: 3.3 - - gemfile: rails-5.2.gemfile - ruby: jruby-9.4 - - # Rails 7 requires Ruby >= 2.7 - - gemfile: rails-7.0.gemfile - ruby: 2.5 - - gemfile: rails-main.gemfile - ruby: 2.5 - - - gemfile: rails-7.0.gemfile - ruby: 2.6 - - gemfile: rails-main.gemfile - ruby: 2.6 - - gemfile: rails-7.0.gemfile ruby: jruby-9.2 - gemfile: rails-main.gemfile diff --git a/gemfiles/rails-5.2.gemfile b/gemfiles/rails-5.2.gemfile deleted file mode 100644 index cc79c559..00000000 --- a/gemfiles/rails-5.2.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -# https://github.com/flavorjones/loofah/issues/266 -gem 'loofah', '2.20.0' if RUBY_VERSION < '2.5' - -eval_gemfile '../Gemfile' - -gem 'rails', '~> 5.2.0' diff --git a/gemfiles/rails-6.0.gemfile b/gemfiles/rails-6.0.gemfile deleted file mode 100644 index 8a9e3b24..00000000 --- a/gemfiles/rails-6.0.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -eval_gemfile '../Gemfile' - -gem 'rails', '~> 6.0.0' diff --git a/gemfiles/rails-6.1.gemfile b/gemfiles/rails-6.1.gemfile deleted file mode 100644 index df7b23d0..00000000 --- a/gemfiles/rails-6.1.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -eval_gemfile '../Gemfile' - -gem 'rails', '~> 6.1.0' diff --git a/test/test_helper.rb b/test/test_helper.rb index bba02c52..c8d5fc61 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -7,6 +7,7 @@ require 'rspec/expectations/minitest_integration' ENV['RAILS_ENV'] = 'test' + require_relative 'dummy/config/application' Rails.application.initialize! From a222c5cb2719222d2adf0e296334dd6f345db88e Mon Sep 17 00:00:00 2001 From: Sarah Sunday <3252602+ssunday@users.noreply.github.com> Date: Mon, 24 Jun 2024 09:50:41 -0500 Subject: [PATCH 2/5] [VERSION] Set to 4.0.0 --- VERSION | 2 +- sample_app/Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 4eba2a62..fcdb2e10 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.13.0 +4.0.0 diff --git a/sample_app/Gemfile.lock b/sample_app/Gemfile.lock index 9744dbaf..0c40f473 100644 --- a/sample_app/Gemfile.lock +++ b/sample_app/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - aws-sdk-rails (3.12.0) + aws-sdk-rails (4.0.0) aws-record (~> 2) aws-sdk-ses (~> 1, >= 1.50.0) aws-sdk-sesv2 (~> 1, >= 1.34.0) From 0596a9a9da70b04f53c7fb177a770b2d86381952 Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 24 Jun 2024 11:26:25 -0400 Subject: [PATCH 3/5] PR feedback --- .github/workflows/ci.yml | 14 +- .gitignore | 3 +- VERSION | 2 +- gemfiles/rails-7.1.gemfile | 5 + sample_app/Gemfile.lock | 306 ------------------------------------- 5 files changed, 9 insertions(+), 321 deletions(-) create mode 100644 gemfiles/rails-7.1.gemfile delete mode 100644 sample_app/Gemfile.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1af01163..33d4c909 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,20 +15,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.7, '3.0', 3.1, 3.2, 3.3, jruby-9.2, jruby-9.3, jruby-9.4] - gemfile: [rails-7.0.gemfile, rails-main.gemfile] + ruby: [2.7, '3.0', 3.1, 3.2, 3.3, jruby-9.4] + gemfile: [rails-7.0.gemfile, rails-7.1.gemfile, rails-main.gemfile] exclude: - - gemfile: rails-7.0.gemfile - ruby: jruby-9.2 - - gemfile: rails-main.gemfile - ruby: jruby-9.2 - - - gemfile: rails-7.0.gemfile - ruby: jruby-9.3 - - gemfile: rails-main.gemfile - ruby: jruby-9.3 - # Rails 7.1 dropped support for older rubygems - gemfile: rails-main.gemfile ruby: 2.7 diff --git a/.gitignore b/.gitignore index 3ad92244..1054330e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,12 +3,11 @@ .yardoc .ruby-version *.gem -*.gemfile.lock coverage doc docs.zip Gemfile.lock -!/sample_app/Gemfile.lock +sample_app/Gemfile.lock test/dummy/db/migrate test/dummy/log/ test/dummy/tmp/ diff --git a/VERSION b/VERSION index fcdb2e10..92536a9e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.0 +3.12.0 diff --git a/gemfiles/rails-7.1.gemfile b/gemfiles/rails-7.1.gemfile new file mode 100644 index 00000000..babb65fd --- /dev/null +++ b/gemfiles/rails-7.1.gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +eval_gemfile '../Gemfile' + +gem 'rails', '~> 7.1.0' diff --git a/sample_app/Gemfile.lock b/sample_app/Gemfile.lock deleted file mode 100644 index 0c40f473..00000000 --- a/sample_app/Gemfile.lock +++ /dev/null @@ -1,306 +0,0 @@ -PATH - remote: .. - specs: - aws-sdk-rails (4.0.0) - aws-record (~> 2) - aws-sdk-ses (~> 1, >= 1.50.0) - aws-sdk-sesv2 (~> 1, >= 1.34.0) - aws-sdk-sqs (~> 1, >= 1.56.0) - aws-sessionstore-dynamodb (~> 2) - concurrent-ruby (>= 1.3.1) - railties (>= 5.2.0) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.0.8.4) - actionpack (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activesupport (= 7.0.8.4) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) - rack (~> 2.0, >= 2.2.4) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.4) - actionpack (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.4) - activesupport (= 7.0.8.4) - globalid (>= 0.3.6) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) - activestorage (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activesupport (= 7.0.8.4) - marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.4) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - aws-eventstream (1.3.0) - aws-partitions (1.909.0) - aws-record (2.13.0) - aws-sdk-dynamodb (~> 1, >= 1.85.0) - aws-sdk-core (3.191.6) - aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) - jmespath (~> 1, >= 1.6.1) - aws-sdk-dynamodb (1.106.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-kms (1.78.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.146.1) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.8) - aws-sdk-ses (1.59.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-sesv2 (1.45.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.70.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sessionstore-dynamodb (2.2.0) - aws-sdk-dynamodb (~> 1, >= 1.85.0) - rack (>= 2, < 4) - rack-session (>= 1, < 3) - aws-sigv4 (1.8.0) - aws-eventstream (~> 1, >= 1.0.2) - bindex (0.8.1) - bootsnap (1.18.3) - msgpack (~> 1.2) - builder (3.2.4) - byebug (11.1.3) - capybara (3.40.0) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.11) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - concurrent-ruby (1.3.1) - crass (1.0.6) - date (3.3.4) - erubi (1.12.0) - ffi (1.16.3) - globalid (1.2.1) - activesupport (>= 6.1) - i18n (1.14.5) - concurrent-ruby (~> 1.0) - jbuilder (2.11.5) - actionview (>= 5.0.0) - activesupport (>= 5.0.0) - jmespath (1.6.2) - listen (3.9.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - mail (2.8.1) - mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.0.4) - matrix (0.4.2) - method_source (1.0.0) - mini_mime (1.1.5) - mini_portile2 (2.8.7) - minitest (5.23.1) - msgpack (1.7.2) - net-imap (0.4.10) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.2.2) - timeout - net-smtp (0.5.0) - net-protocol - nio4r (2.7.1) - nokogiri (1.16.5) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - public_suffix (5.0.5) - puma (6.4.2) - nio4r (~> 2.0) - racc (1.8.0) - rack (2.2.9) - rack-mini-profiler (2.3.4) - rack (>= 1.2.0) - rack-proxy (0.7.7) - rack - rack-session (1.0.2) - rack (< 3) - rack-test (2.1.0) - rack (>= 1.3) - rails (7.0.8.4) - actioncable (= 7.0.8.4) - actionmailbox (= 7.0.8.4) - actionmailer (= 7.0.8.4) - actionpack (= 7.0.8.4) - actiontext (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activemodel (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) - bundler (>= 1.15.0) - railties (= 7.0.8.4) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) - method_source - rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) - rake (13.2.1) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - regexp_parser (2.9.0) - rexml (3.2.8) - strscan (>= 3.0.9) - rubyzip (2.3.2) - sass-rails (6.0.0) - sassc-rails (~> 2.1, >= 2.1.1) - sassc (2.4.0) - ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - selenium-webdriver (4.10.0) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2, < 3.0) - websocket (~> 1.0) - semantic_range (3.0.0) - spring (4.1.3) - sprockets (4.2.1) - concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - sqlite3 (1.7.3) - mini_portile2 (~> 2.8.0) - strscan (3.1.0) - thor (1.3.1) - tilt (2.3.0) - timeout (0.4.1) - turbolinks (5.2.1) - turbolinks-source (~> 5.2) - turbolinks-source (5.2.0) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - web-console (4.2.1) - actionview (>= 6.0.0) - activemodel (>= 6.0.0) - bindex (>= 0.4.0) - railties (>= 6.0.0) - webdrivers (5.3.1) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (~> 4.0, < 4.11) - webpacker (5.4.4) - activesupport (>= 5.2) - rack-proxy (>= 0.6.1) - railties (>= 5.2) - semantic_range (>= 2.3.0) - websocket (1.2.10) - websocket-driver (0.7.6) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - xpath (3.2.0) - nokogiri (~> 1.8) - zeitwerk (2.6.13) - -PLATFORMS - ruby - -DEPENDENCIES - aws-sdk-rails! - aws-sdk-s3 - bootsnap (>= 1.4.4) - byebug - capybara (>= 3.26) - jbuilder (~> 2.7) - listen (~> 3.3) - puma (~> 6.0) - rack-mini-profiler (~> 2.0) - rails (~> 7.0.0) - sass-rails (>= 6) - selenium-webdriver - spring - sprockets-rails - sqlite3 (~> 1.4) - turbolinks (~> 5) - tzinfo-data - web-console (>= 4.1.0) - webdrivers - webpacker (~> 5.0) - -BUNDLED WITH - 2.5.3 From f193e0f11ec19d3fe58f25fe864108bbbf234005 Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 24 Jun 2024 11:27:34 -0400 Subject: [PATCH 4/5] Wrong version was added --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 92536a9e..4eba2a62 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.12.0 +3.13.0 From 69aaa167187252449ddd142a4affcf9aab641e82 Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 24 Jun 2024 11:28:28 -0400 Subject: [PATCH 5/5] Update README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 482bbd0c..3719f12f 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ the latest version of [AWS SDK For Ruby](https://github.com/aws/aws-sdk-ruby). Add this gem to your Rails project's Gemfile: ```ruby -gem 'aws-sdk-rails' +gem 'aws-sdk-rails', '~> 4' ``` This gem also brings in the following AWS gems: @@ -28,7 +28,7 @@ If you want to use other services (such as S3), you will still need to add them Gemfile: ```ruby -gem 'aws-sdk-rails', '~> 3' +gem 'aws-sdk-rails', '~> 4' gem 'aws-sdk-s3', '~> 1' ```