Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for Rails 7.1. #11

Merged
merged 1 commit into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conversejs.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
22 changes: 22 additions & 0 deletions gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
@@ -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: "../"