diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2acef30d..40670594 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,19 +10,14 @@ permissions: jobs: test: runs-on: ubuntu-latest - continue-on-error: ${{ matrix.experimental }} strategy: fail-fast: false matrix: - ruby: ['2.7', '3.0', '3.1', '3.2', 'head'] - rails: [ '6.0', '6.1', '7.0', 'edge' ] - script: [test] - experimental: [false] - include: - - ruby: '2.7' - rails: '7.0' - script: templates:test - experimental: true + ruby: ['3.2', 'head'] + rails: [ '8.0', '8.1', 'edge' ] + exclude: + - ruby: '3.2' + rails: 'edge' env: RAILS_VERSION: ${{ matrix.rails }} @@ -35,4 +30,4 @@ jobs: ruby-version: ${{ matrix.ruby }} bundler-cache: true - name: Run tests - run: bundle exec rake ${{ matrix.script }} + run: bundle exec rake test diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index 4bdbe788..3cd23ad8 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -2,6 +2,9 @@ ## main (unreleased) +* Drop Rails 7.2 support +* Drop Ruby 3.1 support + # 4.2.1 * Support to Rails 7.1 diff --git a/lib/web_console/source_location.rb b/lib/web_console/source_location.rb index c823efc9..5b98bc5f 100644 --- a/lib/web_console/source_location.rb +++ b/lib/web_console/source_location.rb @@ -6,12 +6,7 @@ def initialize(binding) @binding = binding end - if RUBY_VERSION >= "2.6" - def path() @binding.source_location.first end - def lineno() @binding.source_location.last end - else - def path() @binding.eval("__FILE__") end - def lineno() @binding.eval("__LINE__") end - end + def path() @binding.source_location.first end + def lineno() @binding.source_location.last end end end diff --git a/web-console.gemspec b/web-console.gemspec index d9bbba16..6131d153 100644 --- a/web-console.gemspec +++ b/web-console.gemspec @@ -15,9 +15,9 @@ Gem::Specification.new do |s| s.files = Dir["lib/**/*", "MIT-LICENSE", "Rakefile", "README.markdown", "CHANGELOG.markdown"] - s.required_ruby_version = ">= 2.5" + s.required_ruby_version = ">= 3.2" - rails_version = ">= 6.0.0" + rails_version = ">= 8.0.0" s.add_dependency "railties", rails_version s.add_dependency "actionview", rails_version