Skip to content

Commit

Permalink
Allow activesupport 6.1.x and test against it
Browse files Browse the repository at this point in the history
  • Loading branch information
@deivid-rodriguez
deivid-rodriguez committed Nov 12, 2020
1 parent fb8d5aa commit e796aad
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 66 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Master (unreleased)

* Allow activesupport 6.1 prereleases. [#242][] by [@deivid-rodriguez][]

## 1.3.0 [☰](https://github.com/activeadmin/arbre/compare/v1.2.1...v1.3.0)

* Drop ruby 2.3 support. [#152][] by [@deivid-rodriguez][]
Expand Down Expand Up @@ -93,6 +95,7 @@ Initial release and extraction from Active Admin
[#177]: https://github.com/activeadmin/arbre/pull/177
[#202]: https://github.com/activeadmin/arbre/pull/202
[#205]: https://github.com/activeadmin/arbre/pull/205
[#242]: https://github.com/activeadmin/arbre/pull/242

[@aramvisser]: https://github.com/aramvisser
[@LTe]: https://github.com/LTe
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ group :release do
end

group :rails do
gem 'rails', '~> 6.0.3'
gem 'rails', '~> 6.1.a'
gem 'rspec-rails'
gem 'combustion'
gem 'capybara'
Expand Down
130 changes: 66 additions & 64 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,67 +2,71 @@ PATH
remote: .
specs:
arbre (1.3.0)
activesupport (>= 3.0.0, < 6.1)
activesupport (>= 3.0.0, < 6.2)
ruby2_keywords (>= 0.0.2, < 1.0)

GEM
remote: http://rubygems.org/
specs:
actioncable (6.0.3.4)
actionpack (= 6.0.3.4)
actioncable (6.1.0.rc1)
actionpack (= 6.1.0.rc1)
activesupport (= 6.1.0.rc1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.4)
actionpack (= 6.0.3.4)
activejob (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
actionmailbox (6.1.0.rc1)
actionpack (= 6.1.0.rc1)
activejob (= 6.1.0.rc1)
activerecord (= 6.1.0.rc1)
activestorage (= 6.1.0.rc1)
activesupport (= 6.1.0.rc1)
mail (>= 2.7.1)
actionmailer (6.0.3.4)
actionpack (= 6.0.3.4)
actionview (= 6.0.3.4)
activejob (= 6.0.3.4)
actionmailer (6.1.0.rc1)
actionpack (= 6.1.0.rc1)
actionview (= 6.1.0.rc1)
activejob (= 6.1.0.rc1)
activesupport (= 6.1.0.rc1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.3.4)
actionview (= 6.0.3.4)
activesupport (= 6.0.3.4)
rack (~> 2.0, >= 2.0.8)
actionpack (6.1.0.rc1)
actionview (= 6.1.0.rc1)
activesupport (= 6.1.0.rc1)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.3.4)
actionpack (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
actiontext (6.1.0.rc1)
actionpack (= 6.1.0.rc1)
activerecord (= 6.1.0.rc1)
activestorage (= 6.1.0.rc1)
activesupport (= 6.1.0.rc1)
nokogiri (>= 1.8.5)
actionview (6.0.3.4)
activesupport (= 6.0.3.4)
actionview (6.1.0.rc1)
activesupport (= 6.1.0.rc1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.4)
activesupport (= 6.0.3.4)
activejob (6.1.0.rc1)
activesupport (= 6.1.0.rc1)
globalid (>= 0.3.6)
activemodel (6.0.3.4)
activesupport (= 6.0.3.4)
activerecord (6.0.3.4)
activemodel (= 6.0.3.4)
activesupport (= 6.0.3.4)
activestorage (6.0.3.4)
actionpack (= 6.0.3.4)
activejob (= 6.0.3.4)
activerecord (= 6.0.3.4)
activemodel (6.1.0.rc1)
activesupport (= 6.1.0.rc1)
activerecord (6.1.0.rc1)
activemodel (= 6.1.0.rc1)
activesupport (= 6.1.0.rc1)
activestorage (6.1.0.rc1)
actionpack (= 6.1.0.rc1)
activejob (= 6.1.0.rc1)
activerecord (= 6.1.0.rc1)
activesupport (= 6.1.0.rc1)
marcel (~> 0.3.1)
activesupport (6.0.3.4)
mimemagic (~> 0.3.2)
activesupport (6.1.0.rc1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ast (2.4.1)
Expand Down Expand Up @@ -129,32 +133,32 @@ GEM
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.3.4)
actioncable (= 6.0.3.4)
actionmailbox (= 6.0.3.4)
actionmailer (= 6.0.3.4)
actionpack (= 6.0.3.4)
actiontext (= 6.0.3.4)
actionview (= 6.0.3.4)
activejob (= 6.0.3.4)
activemodel (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
bundler (>= 1.3.0)
railties (= 6.0.3.4)
rails (6.1.0.rc1)
actioncable (= 6.1.0.rc1)
actionmailbox (= 6.1.0.rc1)
actionmailer (= 6.1.0.rc1)
actionpack (= 6.1.0.rc1)
actiontext (= 6.1.0.rc1)
actionview (= 6.1.0.rc1)
activejob (= 6.1.0.rc1)
activemodel (= 6.1.0.rc1)
activerecord (= 6.1.0.rc1)
activestorage (= 6.1.0.rc1)
activesupport (= 6.1.0.rc1)
bundler (>= 1.15.0)
railties (= 6.1.0.rc1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.0.3.4)
actionpack (= 6.0.3.4)
activesupport (= 6.0.3.4)
railties (6.1.0.rc1)
actionpack (= 6.1.0.rc1)
activesupport (= 6.1.0.rc1)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
thor (~> 1.0)
rainbow (3.0.0)
rake (13.0.1)
regexp_parser (1.8.2)
Expand Down Expand Up @@ -208,10 +212,8 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (1.0.1)
thread_safe (0.3.6)
thread_safe (0.3.6-java)
tzinfo (1.2.7)
thread_safe (~> 0.1)
tzinfo (2.0.3)
concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
Expand All @@ -220,7 +222,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.4.0)
zeitwerk (2.4.1)

PLATFORMS
java
Expand All @@ -232,7 +234,7 @@ DEPENDENCIES
chandler
combustion
pry
rails (~> 6.0.3)
rails (~> 6.1.a)
rake
rspec
rspec-rails
Expand Down
2 changes: 1 addition & 1 deletion arbre.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ Gem::Specification.new do |s|

s.required_ruby_version = '>= 2.5'

s.add_dependency("activesupport", ">= 3.0.0", "< 6.1")
s.add_dependency("activesupport", ">= 3.0.0", "< 6.2")
s.add_dependency("ruby2_keywords", ">= 0.0.2", "< 1.0")
end

0 comments on commit e796aad

Please sign in to comment.