Skip to content
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
45 changes: 17 additions & 28 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,39 @@ jobs:
gemfile:
- Gemfile
- gemfiles/Gemfile-rails-main
- gemfiles/Gemfile-rails-8-0
- gemfiles/Gemfile-rails-7-2
- gemfiles/Gemfile-rails-7-1
- gemfiles/Gemfile-rails-7-0
- gemfiles/Gemfile-rails-6-1
- gemfiles/Gemfile-rails-6-0
- gemfiles/Gemfile-rails-5-2
ruby:
- '3.4'
- '3.3'
- '3.2'
- '3.1'
- '3.0'
- '2.7'
- '2.6'
- '2.5'
exclude:
- gemfile: Gemfile
ruby: '2.6'
ruby: '3.1'
- gemfile: Gemfile
ruby: '2.5'
- gemfile: gemfiles/Gemfile-rails-main
ruby: '3.0'
- gemfile: gemfiles/Gemfile-rails-main
- gemfile: Gemfile
ruby: '2.7'
- gemfile: gemfiles/Gemfile-rails-main
ruby: '2.6'
- gemfile: gemfiles/Gemfile-rails-main
ruby: '2.5'
- gemfile: gemfiles/Gemfile-rails-7-0
ruby: '2.6'
- gemfile: gemfiles/Gemfile-rails-7-0
ruby: '2.5'
- gemfile: gemfiles/Gemfile-rails-6-0
ruby: '3.3'
- gemfile: gemfiles/Gemfile-rails-6-0
ruby: '3.2'
- gemfile: gemfiles/Gemfile-rails-6-0
ruby: '3.1'
- gemfile: gemfiles/Gemfile-rails-5-2
ruby: '3.3'
- gemfile: gemfiles/Gemfile-rails-5-2
ruby: '3.2'
- gemfile: gemfiles/Gemfile-rails-5-2
- gemfile: gemfiles/Gemfile-rails-main
ruby: '3.0'
- gemfile: gemfiles/Gemfile-rails-main
ruby: '2.7'
- gemfile: gemfiles/Gemfile-rails-8-0
ruby: '3.1'
- gemfile: gemfiles/Gemfile-rails-5-2
- gemfile: gemfiles/Gemfile-rails-8-0
ruby: '3.0'
- gemfile: gemfiles/Gemfile-rails-8-0
ruby: '2.7'
- gemfile: gemfiles/Gemfile-rails-7-2
ruby: '3.0'
- gemfile: gemfiles/Gemfile-rails-5-2
- gemfile: gemfiles/Gemfile-rails-7-2
ruby: '2.7'
runs-on: ubuntu-latest
env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Unreleased

* Add support for Ruby 3.4 and Rails 7.2/8.0/8.1. (no changes required)
* Drop support for Rails < 7 and Ruby < 2.7.
* Remove redundant `aria-required` attribute for required fields. [@aduth](https://github.com/aduth)
* Add `weekday` input. [@nashby](https://github.com/nashby)

Expand Down
10 changes: 4 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
source 'https://rubygems.org'
source "https://rubygems.org"

gemspec

gem 'country_select'
gem 'activemodel', '~> 7.1.0'
gem 'actionpack', '~> 7.1.0'
gem 'railties', '~> 7.1.0'
gem 'rake'
gem "activemodel", "~> 8.1.0.beta1"
gem "actionpack", "~> 8.1.0.beta1"
gem "railties", "~> 8.1.0.beta1"
130 changes: 73 additions & 57 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,114 +2,130 @@ PATH
remote: .
specs:
simple_form (5.3.1)
actionpack (>= 5.2)
activemodel (>= 5.2)
actionpack (>= 7.0)
activemodel (>= 7.0)

GEM
remote: https://rubygems.org/
specs:
actionpack (7.1.3.2)
actionview (= 7.1.3.2)
activesupport (= 7.1.3.2)
actionpack (8.1.0.beta1)
actionview (= 8.1.0.beta1)
activesupport (= 8.1.0.beta1)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actionview (7.1.3.2)
activesupport (= 7.1.3.2)
useragent (~> 0.16)
actionview (8.1.0.beta1)
activesupport (= 8.1.0.beta1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activemodel (7.1.3.2)
activesupport (= 7.1.3.2)
activesupport (7.1.3.2)
activemodel (8.1.0.beta1)
activesupport (= 8.1.0.beta1)
activesupport (8.1.0.beta1)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
base64 (0.2.0)
bigdecimal (3.1.7)
builder (3.2.4)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
countries (5.7.2)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
base64 (0.3.0)
benchmark (0.4.1)
bigdecimal (3.2.3)
builder (3.3.0)
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
countries (8.0.4)
unaccent (~> 0.3)
country_select (8.0.3)
countries (~> 5.0)
country_select (11.0.0)
countries (> 6.0, < 9.0)
crass (1.0.6)
drb (2.2.1)
erubi (1.12.0)
i18n (1.14.4)
date (3.4.1)
drb (2.2.3)
erb (5.0.2)
erubi (1.13.1)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.12.0)
rdoc
io-console (0.8.1)
irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
loofah (2.22.0)
logger (1.7.0)
loofah (2.24.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mini_portile2 (2.8.5)
minitest (5.22.3)
mutex_m (0.2.0)
nokogiri (1.15.6)
mini_portile2 (2.8.9)
minitest (5.25.5)
nokogiri (1.18.10)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
psych (5.1.2)
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
psych (5.2.6)
date
stringio
racc (1.7.3)
rack (3.0.10)
rack-session (2.0.0)
racc (1.8.1)
rack (3.2.1)
rack-session (2.1.1)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack-test (2.2.0)
rack (>= 1.3)
rackup (2.1.0)
rackup (2.2.1)
rack (>= 3)
webrick (~> 1.8)
rails-dom-testing (2.2.0)
rails-dom-testing (2.3.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.1.3.2)
actionpack (= 7.1.3.2)
activesupport (= 7.1.3.2)
irb
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
railties (8.1.0.beta1)
actionpack (= 8.1.0.beta1)
activesupport (= 8.1.0.beta1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
tsort (>= 0.2)
zeitwerk (~> 2.6)
rake (13.2.1)
rdoc (6.6.3.1)
rake (13.3.0)
rdoc (6.14.2)
erb
psych (>= 4.0.0)
reline (0.5.1)
reline (0.6.2)
io-console (~> 0.5)
stringio (3.1.0)
thor (1.3.1)
securerandom (0.4.1)
stringio (3.1.7)
thor (1.4.0)
tsort (0.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unaccent (0.4.0)
webrick (1.8.1)
zeitwerk (2.6.13)
uri (1.0.3)
useragent (0.16.11)
zeitwerk (2.7.3)

PLATFORMS
ruby

DEPENDENCIES
actionpack (~> 7.1.0)
activemodel (~> 7.1.0)
actionpack (~> 8.1.0.beta1)
activemodel (~> 8.1.0.beta1)
country_select
railties (~> 7.1.0)
railties (~> 8.1.0.beta1)
rake
simple_form!

Expand Down
10 changes: 0 additions & 10 deletions gemfiles/Gemfile-rails-5-2

This file was deleted.

10 changes: 0 additions & 10 deletions gemfiles/Gemfile-rails-6-0

This file was deleted.

10 changes: 0 additions & 10 deletions gemfiles/Gemfile-rails-6-1

This file was deleted.

12 changes: 5 additions & 7 deletions gemfiles/Gemfile-rails-7-0
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
source 'https://rubygems.org'
source "https://rubygems.org"

gemspec path: '..'
gemspec path: ".."

gem 'country_select'
gem 'activemodel', '~> 7.0.0'
gem 'actionpack', '~> 7.0.0'
gem 'railties', '~> 7.0.0'
gem 'rake'
gem "activemodel", "~> 7.0.0", github: "rails/rails", branch: "7-0-stable"
gem "actionpack", "~> 7.0.0", github: "rails/rails", branch: "7-0-stable"
gem "railties", "~> 7.0.0", github: "rails/rails", branch: "7-0-stable"
7 changes: 7 additions & 0 deletions gemfiles/Gemfile-rails-7-1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
source "https://rubygems.org"

gemspec path: ".."

gem "activemodel", "~> 7.1.0"
gem "actionpack", "~> 7.1.0"
gem "railties", "~> 7.1.0"
7 changes: 7 additions & 0 deletions gemfiles/Gemfile-rails-7-2
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
source "https://rubygems.org"

gemspec path: ".."

gem "activemodel", "~> 7.2.0"
gem "actionpack", "~> 7.2.0"
gem "railties", "~> 7.2.0"
7 changes: 7 additions & 0 deletions gemfiles/Gemfile-rails-8-0
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
source "https://rubygems.org"

gemspec path: ".."

gem "activemodel", "~> 8.0.0"
gem "actionpack", "~> 8.0.0"
gem "railties", "~> 8.0.0"
14 changes: 6 additions & 8 deletions gemfiles/Gemfile-rails-main
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
source 'https://rubygems.org'
source "https://rubygems.org"

gemspec path: '..'
gemspec path: ".."

gem 'country_select'
gem 'railties', github: 'rails/rails', branch: 'main'
gem 'activemodel', github: 'rails/rails', branch: 'main'
gem 'actionpack', github: 'rails/rails', branch: 'main'
gem 'rake'
gem 'tzinfo'
gem "railties", github: "rails/rails", branch: "main"
gem "activemodel", github: "rails/rails", branch: "main"
gem "actionpack", github: "rails/rails", branch: "main"
gem "tzinfo"
9 changes: 6 additions & 3 deletions simple_form.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ Gem::Specification.new do |s|
s.files = Dir["CHANGELOG.md", "MIT-LICENSE", "README.md", "lib/**/*"]
s.require_paths = ["lib"]

s.required_ruby_version = '>= 2.5.0'
s.required_ruby_version = ">= 2.7.0"

s.add_dependency('activemodel', '>= 5.2')
s.add_dependency('actionpack', '>= 5.2')
s.add_dependency "activemodel", ">= 7.0"
s.add_dependency "actionpack", ">= 7.0"

s.add_development_dependency "country_select"
s.add_development_dependency "rake"
end
Loading