diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 16bf508..e38f016 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false matrix: ruby: ['2.7', '3.0'] - rails: ['6.1'] + rails: ['6.1', '7.1'] env: BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile' steps: diff --git a/Appraisals b/Appraisals index bc98696..7d9ee71 100644 --- a/Appraisals +++ b/Appraisals @@ -3,3 +3,7 @@ appraise 'rails-6.1' do gem 'railties', '~> 6.1.0' end + +appraise 'rails-7.1' do + gem 'railties', '~> 7.1.0' +end diff --git a/CHANGELOG.md b/CHANGELOG.md index 993fa8e..1f256f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### next -* TODO: Replace this bullet point with an actual description of a change. +* Added support for Rails 7.1 (#11) ### 3.8.1 (17 January 2025) diff --git a/Gemfile b/Gemfile index fe887da..868c6ad 100644 --- a/Gemfile +++ b/Gemfile @@ -20,5 +20,6 @@ gem 'rubocop', '~> 1.28' gem 'rubocop-rails', '~> 2.14' gem 'rubocop-rspec', '~> 2.10' gem 'simplecov', '>= 0.22' +gem 'sprockets-rails', '~> 3.5' gem 'yard', '>= 0.9.28' gem 'yard-activesupport-concern', '>= 0.0.1' diff --git a/Makefile b/Makefile index fd76f30..1683072 100644 --- a/Makefile +++ b/Makefile @@ -43,6 +43,7 @@ RUBY_VERSION := ruby-version GEMFILES ?= $(subst _,-,$(patsubst $(GEMFILES_DIR)/%.gemfile,%,\ $(wildcard $(GEMFILES_DIR)/*.gemfile))) TEST_GEMFILES := $(GEMFILES:%=test-%) +WATCH_GEMFILES := $(GEMFILES:%=watch-%) # Define a generic shell run wrapper # $1 - The command to run @@ -98,6 +99,11 @@ watch: install .interactive # Watch for code changes and rerun the test suite @$(call run-shell,$(BUNDLE) exec $(GUARD)) +$(WATCH_GEMFILES): GEMFILE=$(@:watch-%=%) +$(WATCH_GEMFILES): + # Watch for code changes and rerun the test suite ($(GEMFILE)) + @$(call run-shell,$(BUNDLE) exec $(APPRAISAL) $(GEMFILE) $(GUARD)) + test: \ test-specs \ test-style diff --git a/conversejs.gemspec b/conversejs.gemspec index 9f98a8d..ccaa884 100644 --- a/conversejs.gemspec +++ b/conversejs.gemspec @@ -33,6 +33,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.7' - spec.add_dependency 'railties', '>= 6.1', '< 7.0' + spec.add_dependency 'railties', '>= 6.1', '< 8.0' spec.add_dependency 'zeitwerk', '~> 2.6' end diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 411ea0b..ef850e9 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -14,6 +14,7 @@ gem "rubocop", "~> 1.28" gem "rubocop-rails", "~> 2.14" gem "rubocop-rspec", "~> 2.10" gem "simplecov", ">= 0.22" +gem "sprockets-rails", "~> 3.5" gem "yard", ">= 0.9.28" gem "yard-activesupport-concern", ">= 0.0.1" gem "railties", "~> 6.1.0" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile new file mode 100644 index 0000000..9350974 --- /dev/null +++ b/gemfiles/rails_7.1.gemfile @@ -0,0 +1,22 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal", "~> 2.4" +gem "bundler", "~> 2.3" +gem "countless", "~> 1.1" +gem "guard-rspec", "~> 4.7" +gem "rails", ">= 6.1" +gem "rake", "~> 13.0" +gem "rspec", "~> 3.12" +gem "rspec-rails", "~> 5.1" +gem "rubocop", "~> 1.28" +gem "rubocop-rails", "~> 2.14" +gem "rubocop-rspec", "~> 2.10" +gem "simplecov", ">= 0.22" +gem "sprockets-rails", "~> 3.5" +gem "yard", ">= 0.9.28" +gem "yard-activesupport-concern", ">= 0.0.1" +gem "railties", "~> 7.1.0" + +gemspec path: "../"