diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index cced46c..53c968d 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -16,11 +16,16 @@ jobs: strategy: fail-fast: false matrix: - ruby: [3.3, 3.2, 3.1, '3.0'] + ruby: [3.2, 3.3, 3.4] gemfile: - Gemfile - - gemfiles/Gemfile-rails-6-0 - - gemfiles/Gemfile-rails-6-1 + - gemfiles/Gemfile-rails-7-2 + - gemfiles/Gemfile-rails-7-1 + - gemfiles/Gemfile-rails-7-0 + exclude: + - ruby: 3.4 + gemfile: gemfiles/Gemfile-rails-7-0 + env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} steps: diff --git a/Gemfile b/Gemfile index aa6e339..f37e64a 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gemspec -gem "actionview" +gem "actionview", "~> 8.0.0" gem "railties" gem "minitest" gem "mocha" diff --git a/Gemfile.lock b/Gemfile.lock index f48ce7b..163ad9b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,8 +2,8 @@ PATH remote: . specs: better_html (2.1.1) - actionview (>= 6.0) - activesupport (>= 6.0) + actionview (>= 7.0) + activesupport (>= 7.0) ast (~> 2.0) erubi (~> 1.4) parser (>= 2.4) @@ -166,7 +166,7 @@ PLATFORMS ruby DEPENDENCIES - actionview + actionview (~> 8.0.0) better_html! minitest mocha @@ -179,4 +179,4 @@ DEPENDENCIES ruby_memcheck BUNDLED WITH - 2.6.2 + 2.6.3 diff --git a/better_html.gemspec b/better_html.gemspec index 1337f33..efb0cf5 100644 --- a/better_html.gemspec +++ b/better_html.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.description = "Better HTML for Rails. Provides sane html helpers that make it easier to do the right thing." s.license = "MIT" - s.required_ruby_version = ">= 3.0.0" + s.required_ruby_version = ">= 3.2.0" s.metadata = { "bug_tracker_uri" => "https://github.com/Shopify/better-html/issues", @@ -29,8 +29,8 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib,ext}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"] s.require_paths = ["lib"] - s.add_dependency("actionview", ">= 6.0") - s.add_dependency("activesupport", ">= 6.0") + s.add_dependency("actionview", ">= 7.0") + s.add_dependency("activesupport", ">= 7.0") s.add_dependency("ast", "~> 2.0") s.add_dependency("erubi", "~> 1.4") s.add_dependency("parser", ">= 2.4") diff --git a/gemfiles/Gemfile-rails-6-0 b/gemfiles/Gemfile-rails-7-0 similarity index 90% rename from gemfiles/Gemfile-rails-6-0 rename to gemfiles/Gemfile-rails-7-0 index 7f7e8da..b0c977f 100644 --- a/gemfiles/Gemfile-rails-6-0 +++ b/gemfiles/Gemfile-rails-7-0 @@ -4,7 +4,7 @@ source "https://rubygems.org" gemspec path: ".." -gem "actionview", "~> 6.0.0" +gem "actionview", "~> 7.0.0" gem "railties" gem "rake-compiler" gem "minitest" diff --git a/gemfiles/Gemfile-rails-6-1 b/gemfiles/Gemfile-rails-7-1 similarity index 90% rename from gemfiles/Gemfile-rails-6-1 rename to gemfiles/Gemfile-rails-7-1 index 83dcbcc..b8d212f 100644 --- a/gemfiles/Gemfile-rails-6-1 +++ b/gemfiles/Gemfile-rails-7-1 @@ -4,7 +4,7 @@ source "https://rubygems.org" gemspec path: ".." -gem "actionview", "~> 6.1.0" +gem "actionview", "~> 7.1.0" gem "railties" gem "rake-compiler" gem "minitest" diff --git a/gemfiles/Gemfile-rails-7-2 b/gemfiles/Gemfile-rails-7-2 new file mode 100644 index 0000000..4fbd01f --- /dev/null +++ b/gemfiles/Gemfile-rails-7-2 @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gemspec path: ".." + +gem "actionview", "~> 7.2.0" +gem "railties" +gem "rake-compiler" +gem "minitest" +gem "mocha" +gem "ruby_memcheck" + +group :deployment, :test do + gem "pry-byebug" +end