diff --git a/.github/workflows/ruby-ci.yml b/.github/workflows/ruby-ci.yml index be2264b..c6d2d50 100644 --- a/.github/workflows/ruby-ci.yml +++ b/.github/workflows/ruby-ci.yml @@ -14,8 +14,8 @@ jobs: strategy: fail-fast: true matrix: - ruby: ['3.3', '3.2', '3.1'] - gemfile: ['rails61', 'rails7', 'rails71'] + ruby: ['3.4', '3.3', '3.2'] + gemfile: ['rails71', 'rails8'] env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile diff --git a/Gemfile.lock b/Gemfile.lock index 1c71e66..9a3368e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,91 +2,134 @@ PATH remote: . specs: cognito_token_verifier (0.7.0) - activesupport (>= 6.1) + activesupport (>= 7.1) json-jwt (~> 1.11) rest-client (~> 2.0) GEM remote: https://rubygems.org/ specs: - actionpack (6.1.7.9) - actionview (= 6.1.7.9) - activesupport (= 6.1.7.9) - rack (~> 2.0, >= 2.0.9) + actionpack (8.0.2) + actionview (= 8.0.2) + activesupport (= 8.0.2) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.7.9) - activesupport (= 6.1.7.9) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actionview (8.0.2) + activesupport (= 8.0.2) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.7.9) - concurrent-ruby (~> 1.0, >= 1.0.2) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (8.0.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) aes_key_wrap (1.1.0) base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) bindata (2.5.0) builder (3.3.0) byebug (11.1.3) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) crass (1.0.6) - diff-lcs (1.5.1) + date (3.4.1) + diff-lcs (1.6.0) domain_name (0.6.20240107) - erubi (1.13.0) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) + drb (2.2.1) + erubi (1.13.1) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) - faraday-net_http (3.0.2) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.8) domain_name (~> 0.5) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) - json-jwt (1.16.6) + io-console (0.8.0) + irb (1.15.1) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + json (2.10.2) + json-jwt (1.16.7) activesupport (>= 4.2) aes_key_wrap base64 bindata faraday (~> 2.0) faraday-follow_redirects - loofah (2.22.0) + logger (1.6.6) + loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) - mime-types (3.5.2) + mime-types (3.6.1) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0206) - mini_portile2 (2.8.7) - minitest (5.25.1) + mime-types-data (3.2025.0318) + mini_portile2 (2.8.8) + minitest (5.25.5) + net-http (0.6.0) + uri netrc (0.11.0) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) + nokogiri (1.18.5) + mini_portile2 (~> 2.8.2) racc (~> 1.4) + pp (0.6.2) + prettyprint + prettyprint (0.2.0) + psych (5.2.3) + date + stringio racc (1.8.1) - rack (2.2.10) - rack-test (2.1.0) + rack (3.1.12) + rack-session (2.1.0) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rack-test (2.2.0) rack (>= 1.3) + rackup (2.2.1) + rack (>= 3) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) - railties (6.1.7.9) - actionpack (= 6.1.7.9) - activesupport (= 6.1.7.9) - method_source + rails-html-sanitizer (1.6.2) + loofah (~> 2.21) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (8.0.2) + actionpack (= 8.0.2) + activesupport (= 8.0.2) + irb (~> 1.13) + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - rake (13.1.0) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rake (13.2.1) + rdoc (6.12.0) + psych (>= 4.0.0) + reline (0.6.0) + io-console (~> 0.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -109,21 +152,24 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) - ruby2_keywords (0.0.5) - thor (1.3.1) + securerandom (0.4.1) + stringio (3.1.5) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.18) + uri (1.0.3) + useragent (0.16.11) + zeitwerk (2.7.2) PLATFORMS ruby DEPENDENCIES - actionpack (>= 6.1) + actionpack (>= 7.1) bundler (~> 2.0) byebug (~> 11.0) cognito_token_verifier! - rake (>= 10.0, < 14.0) + rake (>= 13.0, < 14.0) rspec-rails (~> 3.0) BUNDLED WITH diff --git a/cognito_token_verifier.gemspec b/cognito_token_verifier.gemspec index 4fc35a8..b353c0a 100644 --- a/cognito_token_verifier.gemspec +++ b/cognito_token_verifier.gemspec @@ -31,13 +31,13 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_runtime_dependency "activesupport", [">= 6.1"] + spec.add_runtime_dependency "activesupport", [">= 7.1"] spec.add_runtime_dependency "json-jwt", "~> 1.11" spec.add_runtime_dependency "rest-client", "~> 2.0" spec.add_development_dependency "byebug", "~> 11.0" spec.add_development_dependency "bundler", "~> 2.0" - spec.add_development_dependency "rake", [">= 10.0", "< 14.0"] + spec.add_development_dependency "rake", [">= 13.0", "< 14.0"] spec.add_development_dependency "rspec-rails", "~> 3.0" - spec.add_development_dependency "actionpack", [">= 6.1"] + spec.add_development_dependency "actionpack", [">= 7.1"] end diff --git a/gemfiles/rails7.gemfile b/gemfiles/rails7.gemfile deleted file mode 100644 index 72f2112..0000000 --- a/gemfiles/rails7.gemfile +++ /dev/null @@ -1,11 +0,0 @@ -source "https://rubygems.org" - -gem "activesupport", "~> 7.0.0" -gem "json-jwt", "~> 1.11" -gem "rest-client", "~> 2.0" - -gem "byebug" -gem "bundler", "~> 2.0" -gem "rake", "~> 12.0" -gem "rspec-rails", "~> 3.0" -gem "actionpack", "~> 7.0.0" diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails8.gemfile similarity index 73% rename from gemfiles/rails61.gemfile rename to gemfiles/rails8.gemfile index 2da42f3..fdd8b93 100644 --- a/gemfiles/rails61.gemfile +++ b/gemfiles/rails8.gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "activesupport", "~> 6.1.0" +gem "activesupport", "~> 8.0.0" gem "json-jwt", "~> 1.11" gem "rest-client", "~> 2.0" @@ -8,4 +8,4 @@ gem "byebug" gem "bundler", "~> 2.0" gem "rake", "~> 12.0" gem "rspec-rails", "~> 3.0" -gem "actionpack", "~> 6.1.0" +gem "actionpack", "~> 8.0.0"