Skip to content

Commit 17e4260

Browse files
authored
Merge pull request #746 from lcreid/remove-6.1-7.0
Remove 6.1 7.0
2 parents b713120 + 0c32781 commit 17e4260

30 files changed

+200
-306
lines changed

.github/workflows/ruby.yml

+9-16
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
Lint:
1010
runs-on: ubuntu-latest
1111
env:
12-
BUNDLE_GEMFILE: gemfiles/6.1.gemfile
12+
BUNDLE_GEMFILE: gemfiles/7.1.gemfile
1313
steps:
1414
- uses: actions/checkout@v3
1515
with:
1616
fetch-depth: 0
1717
- uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: 3.0.6
19+
ruby-version: 3.2.7
2020
bundler-cache: true
2121
# Disabled since it requires access not granted by GitHub Actions for PRs
2222
# - name: Danger
@@ -32,15 +32,8 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
ruby-version: [ '3.3', '3.2', '3.1', '3.0', 'ruby-head' ]
36-
gemfile: [ '7.2', '7.1', '7.0', '6.1', 'edge' ]
37-
exclude:
38-
- ruby-version: '3.1'
39-
gemfile: 'edge'
40-
- ruby-version: '3.0'
41-
gemfile: 'edge'
42-
- ruby-version: '3.0'
43-
gemfile: '7.2'
35+
ruby-version: [ '3.4', '3.3', '3.2', 'ruby-head' ]
36+
gemfile: [ '7.2', '7.1', 'edge' ]
4437
env:
4538
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
4639
steps:
@@ -61,12 +54,12 @@ jobs:
6154
with:
6255
working-directory: demo
6356
bundler-cache: true
64-
ruby-version: 3.3.2
57+
ruby-version: 3.4.2
6558
- name: Run tests
6659
working-directory: demo
6760
run: bundle exec rake test:all
68-
- name: Commit changed screenshots and other files
69-
if: failure()
70-
working-directory: demo
71-
run: bundle exec rake commit
61+
# - name: Commit changed screenshots and other files
62+
# if: failure()
63+
# working-directory: demo
64+
# run: bundle exec rake commit
7265

.rubocop.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
require:
1+
plugins:
22
- rubocop-performance
33
- rubocop-rails
44

55
AllCops:
66
DisplayCopNames: true
77
DisplayStyleGuide: true
8-
TargetRubyVersion: 3.0
9-
TargetRailsVersion: 6.1
8+
TargetRubyVersion: 3.2
9+
TargetRailsVersion: 7.1
1010
NewCops: enable
1111
Exclude:
1212
- bin/*

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ Some other nice things that `bootstrap_form` does for you are:
2525

2626
`bootstrap_form` supports at a minimum the currently supported versions of Ruby and Rails:
2727

28-
* Ruby 3.0+ (https://www.ruby-lang.org/en/downloads/branches/)
29-
* Rails 6.1+ (https://guides.rubyonrails.org/maintenance_policy.html)
28+
* Ruby 3.2+ (https://www.ruby-lang.org/en/downloads/branches/)
29+
* Rails 7.1+ (https://guides.rubyonrails.org/maintenance_policy.html)
3030
* Bootstrap 5.0+
3131

3232
## Installation

bootstrap_form.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
2323
s.bindir = "exe"
2424
s.require_paths = ["lib"]
2525

26-
s.required_ruby_version = ">= 3.0"
26+
s.required_ruby_version = ">= 3.2"
2727

2828
s.add_dependency("actionpack", BootstrapForm::REQUIRED_RAILS_VERSION)
2929
s.add_dependency("activemodel", BootstrapForm::REQUIRED_RAILS_VERSION)

demo/.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-3.0.6
1+
ruby-3.2.7

0 commit comments

Comments
 (0)