diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1978fc1..28f9e53 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,6 +15,7 @@ jobs: matrix: gemfile: - Gemfile + - gemfiles/rails-6-1.gemfile - gemfiles/rails-6-0.gemfile ruby: - '3.0' @@ -23,6 +24,8 @@ jobs: exclude: - ruby: '3.0' gemfile: gemfiles/rails-6-0.gemfile + - ruby: '2.6' + gemfile: Gemfile steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 diff --git a/Gemfile b/Gemfile index b007467..26d30cb 100644 --- a/Gemfile +++ b/Gemfile @@ -5,8 +5,9 @@ source 'https://rubygems.org' gemspec group :development do - gem 'sqlite3' + gem 'sqlite3', '~> 1.6.9' # supports Ruby 2.6 and above end -gem 'rails', '~> 6.1' +gem 'rails', '~> 7.0' gem 'simple_form', '~> 5.3.0' +gem 'sprockets-rails', require: 'sprockets/railtie' diff --git a/Gemfile.lock b/Gemfile.lock index cff9ab0..249ac1d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,71 +2,77 @@ PATH remote: . specs: simple_form-theme (0.1.2) - rails (>= 6.0, < 7.0) + rails (>= 6.0, < 7.1) simple_form (~> 5.3.0) GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.8) - actionpack (= 6.1.7.8) - activesupport (= 6.1.7.8) + actioncable (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.8) - actionpack (= 6.1.7.8) - activejob (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + 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) - actionmailer (6.1.7.8) - actionpack (= 6.1.7.8) - actionview (= 6.1.7.8) - activejob (= 6.1.7.8) - activesupport (= 6.1.7.8) + 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 (6.1.7.8) - actionview (= 6.1.7.8) - activesupport (= 6.1.7.8) - rack (~> 2.0, >= 2.0.9) + 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 (6.1.7.8) - actionpack (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + 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 (6.1.7.8) - activesupport (= 6.1.7.8) + 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 (6.1.7.8) - activesupport (= 6.1.7.8) + activejob (7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.3.6) - activemodel (6.1.7.8) - activesupport (= 6.1.7.8) - activerecord (6.1.7.8) - activemodel (= 6.1.7.8) - activesupport (= 6.1.7.8) - activestorage (6.1.7.8) - actionpack (= 6.1.7.8) - activejob (= 6.1.7.8) - activerecord (= 6.1.7.8) - activesupport (= 6.1.7.8) + 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 (6.1.7.8) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) builder (3.3.0) concurrent-ruby (1.3.3) crass (1.0.6) @@ -87,9 +93,8 @@ GEM marcel (1.0.4) method_source (1.1.0) mini_mime (1.1.5) - mini_portile2 (2.8.7) - minitest (5.23.1) - net-imap (0.3.7) + minitest (5.24.1) + net-imap (0.4.14) date net-protocol net-pop (0.1.2) @@ -99,39 +104,40 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.13.10-x86_64-linux) + nokogiri (1.15.6-x86_64-linux) racc (~> 1.4) racc (1.8.0) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.8) - actioncable (= 6.1.7.8) - actionmailbox (= 6.1.7.8) - actionmailer (= 6.1.7.8) - actionpack (= 6.1.7.8) - actiontext (= 6.1.7.8) - actionview (= 6.1.7.8) - activejob (= 6.1.7.8) - activemodel (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + 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 (= 6.1.7.8) - sprockets-rails (>= 2.0.0) + railties (= 7.0.8.4) 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.8) - actionpack (= 6.1.7.8) - activesupport (= 6.1.7.8) + 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) simple_form (5.3.1) actionpack (>= 5.2) @@ -143,8 +149,7 @@ GEM actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) - sqlite3 (1.6.9) - mini_portile2 (~> 2.8.0) + sqlite3 (1.6.9-x86_64-linux) thor (1.3.1) timeout (0.4.1) tzinfo (2.0.6) @@ -158,10 +163,11 @@ PLATFORMS x86_64-linux DEPENDENCIES - rails (~> 6.1) + rails (~> 7.0) simple_form (~> 5.3.0) simple_form-theme! - sqlite3 + sprockets-rails + sqlite3 (~> 1.6.9) BUNDLED WITH 2.4.22 diff --git a/gemfiles/rails-6-1.gemfile b/gemfiles/rails-6-1.gemfile new file mode 100644 index 0000000..ffc7fbf --- /dev/null +++ b/gemfiles/rails-6-1.gemfile @@ -0,0 +1,10 @@ +source 'https://rubygems.org' + +gemspec path: '..' + +group :development do + gem 'sqlite3', '~> 1.6.9' +end + +gem 'rails', '~> 6.1' +gem 'simple_form', '~> 5.3.0' diff --git a/simple_form-theme.gemspec b/simple_form-theme.gemspec index bbf07c8..4c87f2d 100644 --- a/simple_form-theme.gemspec +++ b/simple_form-theme.gemspec @@ -20,6 +20,6 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.6.0', '< 3.1' - s.add_dependency 'rails', '>= 6.0', '< 7.0' + s.add_dependency 'rails', '>= 6.0', '< 7.1' s.add_dependency 'simple_form', '~> 5.3.0' end