diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0c3ee90..27280fff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,11 +14,11 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['2.7', '3.0', '3.1', '3.2'] + ruby: ['2.7.6', '3.3.6'] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Ruby uses: ruby/setup-ruby@v1 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 63379645..78223768 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.tool-versions b/.tool-versions index 9e83a384..33a8789f 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 2.7.3 +ruby 2.7.7 diff --git a/Gemfile b/Gemfile index 9e979e06..4d7cf902 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' ruby '>= 2.7.6' -gem 'activerecord', '>= 4.2.5', '< 8', require: false +gem 'activerecord', '>= 4.2.5', require: false gem 'rake', require: false group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 66de42c3..e4d98dc6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,76 +1,47 @@ GEM remote: https://rubygems.org/ specs: - activemodel (5.2.8.1) - activesupport (= 5.2.8.1) - activerecord (5.2.8.1) - activemodel (= 5.2.8.1) - activesupport (= 5.2.8.1) - arel (>= 9.0) - activesupport (5.2.8.1) + activemodel (7.1.5.1) + activesupport (= 7.1.5.1) + activerecord (7.1.5.1) + activemodel (= 7.1.5.1) + activesupport (= 7.1.5.1) + timeout (>= 0.4.0) + activesupport (7.1.5.1) + base64 + benchmark (>= 0.3) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) - arel (9.0.0) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) + tzinfo (~> 2.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) bump (0.10.0) byebug (11.1.3) - childprocess (4.1.0) - codeclimate-test-reporter (1.0.7) - simplecov + childprocess (5.1.0) + logger (~> 1.5) coderay (1.1.3) - concurrent-ruby (1.1.10) - coveralls (0.8.23) - json (>= 1.8, < 3) - simplecov (~> 0.16.1) - term-ansicolor (~> 1.3) - thor (>= 0.19.4, < 2.0) - tins (~> 1.6) - diff-lcs (1.5.0) - docile (1.4.0) - faraday (1.10.2) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) - ffi (1.15.5) - files (0.4.0) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) + diff-lcs (1.5.1) + docile (1.4.1) + drb (2.2.1) + ffi (1.17.0) formatador (1.1.0) - gh (0.18.0) - activesupport (~> 5.0) - addressable (~> 2.4) - faraday (~> 1.0) - faraday_middleware (~> 1.0) - multi_json (~> 1.0) - net-http-persistent (~> 2.9) - net-http-pipeline - git (1.13.0) + git (1.19.1) addressable (~> 2.8) rchardet (~> 1.8) - guard (2.18.0) + guard (2.19.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -84,148 +55,126 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - highline (2.0.3) - i18n (1.12.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) iniparse (1.5.0) - json (2.6.3) - json_pure (2.6.3) - launchy (2.4.3) - addressable (~> 2.3) - listen (3.7.1) + json (2.9.1) + language_server-protocol (3.17.0.3) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - lumberjack (1.2.8) - method_source (1.0.0) + logger (1.6.4) + lumberjack (1.2.10) + method_source (1.1.0) mg (0.0.8) rake - minitest (5.16.3) - multi_json (1.15.0) - multipart-post (2.2.3) + minitest (5.25.4) + mutex_m (0.3.0) nenv (0.3.0) - net-http-persistent (2.9.4) - net-http-pipeline (1.0.1) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - overcommit (0.59.1) - childprocess (>= 0.6.3, < 5) + overcommit (0.64.1) + childprocess (>= 0.6.3, < 6) iniparse (~> 1.4) - rexml (~> 3.2) - parallel (1.22.1) - parser (3.1.3.0) + rexml (>= 3.3.9) + parallel (1.26.3) + parser (3.3.6.0) ast (~> 2.4.1) - pry (0.14.1) + racc + pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.10.1) + pry-byebug (3.8.0) byebug (~> 11.0) - pry (>= 0.13, < 0.15) - public_suffix (5.0.1) - pusher-client (0.6.2) - json - websocket (~> 1.0) + pry (~> 0.10) + public_suffix (5.1.1) + racc (1.8.1) rainbow (3.1.1) - rake (13.0.6) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rchardet (1.8.0) - regexp_parser (2.6.1) - rexml (3.2.5) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.0) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.1) + regexp_parser (2.10.0) + rexml (3.4.0) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.0) - rubocop (1.12.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.2) + rubocop (1.59.0) + json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.24.0) - parser (>= 3.1.1.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.37.0) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.26.0) + rubocop (~> 1.41) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.2.0) - rubocop (~> 1.0) - rubocop-ast (>= 1.1.0) - ruby-progressbar (1.11.0) - ruby2_keywords (0.0.5) - ruby_dep (1.5.0) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + securerandom (0.3.2) shellany (0.0.1) - simplecov (0.16.1) + simplecov (0.22.0) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - sync (0.5.0) - term-ansicolor (1.7.1) - tins (~> 1.0) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.1) + simplecov_json_formatter (0.1.4) terminal-notifier-guard (1.7.0) - thor (1.2.1) - thread_safe (0.3.6) - tins (1.32.1) - sync - travis (1.11.1) - faraday (~> 1.0) - faraday_middleware (~> 1.0) - gh (~> 0.13) - highline (~> 2.0) - json_pure (~> 2.3) - launchy (~> 2.1, < 2.5.0) - pusher-client (~> 0.4) - tzinfo (1.2.10) - thread_safe (~> 0.1) - unicode-display_width (2.3.0) - webrick (1.7.0) - websocket (1.2.9) - yard (0.9.28) - webrick (~> 1.7.0) + thor (1.3.2) + timeout (0.4.3) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.6.0) + yard (0.9.37) PLATFORMS - arm64-darwin-21 - arm64-darwin-22 - x86_64-linux + ruby DEPENDENCIES - activerecord (>= 4.2.5, < 6) + activerecord (>= 4.2.5) bump byebug - codeclimate-test-reporter - coveralls - files git guard-rspec mg overcommit pry pry-byebug - rake (>= 13.0.6) + rake rspec - rubocop (~> 1.12.0) + rubocop (~> 1.59.0) rubocop-rake - rubocop-rspec (~> 2.2.0) - ruby_dep (= 1.5.0) + rubocop-rspec (~> 2.25.0) simplecov terminal-notifier-guard - travis yard RUBY VERSION - ruby 2.7.6p219 + ruby 2.7.7p221 BUNDLED WITH - 2.4.1 + 2.1.4 diff --git a/annotate.gemspec b/annotate.gemspec index 8eb20eb7..f04a0ff4 100644 --- a/annotate.gemspec +++ b/annotate.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.summary = 'Annotates Rails Models, routes, fixtures, and others based on the database schema.' s.add_runtime_dependency(%q, '>= 10.4', '< 14.0') - s.add_runtime_dependency(%q, ['>= 3.2', '< 8.0']) + s.add_runtime_dependency(%q, ['>= 3.2']) s.metadata = { "bug_tracker_uri" => "https://github.com/ctran/annotate_models/issues/",