diff --git a/CHANGELOG.md b/CHANGELOG.md index d37414c9..b2b3decc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,12 @@ ## Master (unreleased) +## 1.5.0 [☰](https://github.com/activeadmin/arbre/compare/v1.4.0...v1.5.0) + +* Avoid mutating string literals. [#292][] by [@tomgilligan][] * Allow activesupport 7.0. [#314][] by [@tagliala][] +* Drop ruby 2.5 support. [#315][] by [@alejandroperea][] +* Fix keyword delegation in form component. [#318][] by [@deivid-rodriguez][] ## 1.4.0 [☰](https://github.com/activeadmin/arbre/compare/v1.3.0...v1.4.0) @@ -100,11 +105,15 @@ Initial release and extraction from Active Admin [#202]: https://github.com/activeadmin/arbre/pull/202 [#205]: https://github.com/activeadmin/arbre/pull/205 [#242]: https://github.com/activeadmin/arbre/pull/242 +[#292]: https://github.com/activeadmin/arbre/pull/292 [#314]: https://github.com/activeadmin/arbre/pull/314 +[#315]: https://github.com/activeadmin/arbre/pull/315 +[#318]: https://github.com/activeadmin/arbre/pull/318 [@aramvisser]: https://github.com/aramvisser [@LTe]: https://github.com/LTe [@OscarBarrett]: https://github.com/OscarBarrett +[@alejandroperea]: https://github.com/alejandroperea [@alexesDev]: https://github.com/alexesDev [@deivid-rodriguez]: https://github.com/deivid-rodriguez [@dlackty]: https://github.com/dlackty @@ -117,3 +126,4 @@ Initial release and extraction from Active Admin [@timoschilling]: https://github.com/timoschilling [@varyonic]: https://github.com/varyonic [@tagliala]: https://github.com/tagliala +[@tomgilligan]: https://github.com/tomgilligan diff --git a/Gemfile.lock b/Gemfile.lock index e1f620df..6bec317d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - arbre (1.4.0) + arbre (1.5.0) activesupport (>= 3.0.0, < 7.1) ruby2_keywords (>= 0.0.2, < 1.0) diff --git a/Rakefile b/Rakefile index 0aa314a0..2993a815 100644 --- a/Rakefile +++ b/Rakefile @@ -2,6 +2,8 @@ require 'bundler' Bundler::GemHelper.install_tasks +import "tasks/gemfiles.rake" + require 'rspec/core/rake_task' RSpec::Core::RakeTask.new(:spec) diff --git a/gemfiles/rails_61.gemfile.lock b/gemfiles/rails_61.gemfile.lock index ecc6a5ea..6962da77 100644 --- a/gemfiles/rails_61.gemfile.lock +++ b/gemfiles/rails_61.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - arbre (1.4.0) + arbre (1.5.0) activesupport (>= 3.0.0, < 7.1) ruby2_keywords (>= 0.0.2, < 1.0) @@ -233,4 +233,4 @@ DEPENDENCIES rubocop-packaging BUNDLED WITH - 2.3.3 + 2.3.6 diff --git a/lib/arbre/version.rb b/lib/arbre/version.rb index 8d41458d..b5aee0de 100644 --- a/lib/arbre/version.rb +++ b/lib/arbre/version.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module Arbre - VERSION = "1.4.0" + VERSION = "1.5.0" end diff --git a/tasks/gemfiles.rake b/tasks/gemfiles.rake new file mode 100644 index 00000000..286cf839 --- /dev/null +++ b/tasks/gemfiles.rake @@ -0,0 +1,9 @@ +# frozen_string_literal: true +desc "Bundle all Gemfiles" +task :bundle do |_t, opts| + ["Gemfile", *Dir.glob("gemfiles/*.gemfile")].each do |gemfile| + Bundler.with_original_env do + sh({ "BUNDLE_GEMFILE" => gemfile }, "bundle", *opts) + end + end +end