From 375002e17f448168cb015eb076323054924cdd4c Mon Sep 17 00:00:00 2001 From: Jack Wong Date: Wed, 10 Oct 2018 11:49:37 +0800 Subject: [PATCH 1/3] add supports for rails 5.2.x --- .travis.yml | 3 ++- Appraisals | 6 ++++++ activeadmin-globalize.gemspec | 4 ++-- gemfiles/rails5_2.gemfile | 30 ++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 gemfiles/rails5_2.gemfile diff --git a/.travis.yml b/.travis.yml index 773e409d..51fbb402 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: ruby rvm: - 2.2.7 - 2.3.4 - - 2.4.1 + - 2.4.3 # Load database schema before rake before_script: bundle exec rake db:schema:load # Test on all supported rails versions @@ -12,3 +12,4 @@ gemfile: - gemfiles/rails4_2.gemfile - gemfiles/rails5_0.gemfile - gemfiles/rails5_1.gemfile + - gemfiles/rails5_2.gemfile diff --git a/Appraisals b/Appraisals index 2cd73a66..29fc7c46 100644 --- a/Appraisals +++ b/Appraisals @@ -13,3 +13,9 @@ appraise 'rails5_1' do gem 'rails', '~> 5.1.3' gem 'globalize', '~> 5.1.0.beta2' end + +appraise 'rails5_2' do + gem 'devise', '~> 4.5' + gem 'rails', '~> 5.2.1' + gem 'globalize', github: 'globalize/globalize', ref: 'e37c471775d196cd4318e61954572c300c015467' +end diff --git a/activeadmin-globalize.gemspec b/activeadmin-globalize.gemspec index ca5a02ab..46ba2b4e 100644 --- a/activeadmin-globalize.gemspec +++ b/activeadmin-globalize.gemspec @@ -15,8 +15,8 @@ Gem::Specification.new do |s| s.files = Dir['{app,config,db,lib}/**/*'] + %w(MIT-LICENSE README.md) - s.add_dependency 'activeadmin', '>= 1.0', '< 1.2' - # Try to support rails from 3.2 up to 4.2.x + s.add_dependency 'activeadmin', '>= 1.0', '< 1.4' + # Try to support rails from 3.2 up to 5.2.x s.add_dependency 'globalize', '>= 3.1.0', '< 6.0' # development dependencies diff --git a/gemfiles/rails5_2.gemfile b/gemfiles/rails5_2.gemfile new file mode 100644 index 00000000..29f05e15 --- /dev/null +++ b/gemfiles/rails5_2.gemfile @@ -0,0 +1,30 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sass-rails" +gem "coffee-rails" +gem "therubyracer", platforms: :ruby +gem "uglifier" +gem "jquery-rails" +gem "devise", "~> 4.5" +gem "rails", "~> 5.2.1" +gem "globalize", github: "globalize/globalize", ref: "e37c471775d196cd4318e61954572c300c015467" + +group :test do + gem "sqlite3", "~> 1.3.5" + gem "rspec-rails", "~> 3.6.1" + gem "factory_girl_rails", "~> 4.2.1" + gem "database_cleaner", "~> 1.0.1" + gem "spring", require: false + gem "spring-commands-rspec", require: false + gem "capybara", "~> 2.15" + gem "capybara-screenshot" + gem "poltergeist" + gem "fuubar", "~> 2.2" + gem "appraisal" + gem "awesome_print" + gem "pry" +end + +gemspec path: "../" From 5a019a60e6854978cb5fe181b873f6e260b1ce6b Mon Sep 17 00:00:00 2001 From: yinchuang94 Date: Fri, 15 Jan 2021 01:17:40 +0800 Subject: [PATCH 2/3] add rails 6 support --- .travis.yml | 1 + Appraisals | 10 ++++++++++ activeadmin-globalize.gemspec | 2 +- gemfiles/rails6_0.gemfile | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gemfiles/rails6_0.gemfile diff --git a/.travis.yml b/.travis.yml index 51fbb402..e3b87cbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,3 +13,4 @@ gemfile: - gemfiles/rails5_0.gemfile - gemfiles/rails5_1.gemfile - gemfiles/rails5_2.gemfile + - gemfiles/rails6_0.gemfile diff --git a/Appraisals b/Appraisals index 29fc7c46..ef867539 100644 --- a/Appraisals +++ b/Appraisals @@ -19,3 +19,13 @@ appraise 'rails5_2' do gem 'rails', '~> 5.2.1' gem 'globalize', github: 'globalize/globalize', ref: 'e37c471775d196cd4318e61954572c300c015467' end + +appraise 'rails6_0' do + gem 'devise', '~> 4.7.1' + gem 'rails', '~> 6.0.0' + gem 'actionpack', '~> 6.0.0' + gem 'activerecord', '~> 6.0.0' + gem 'activesupport', '~> 6.0.0' + gem 'capybara', '~> 2.15' + gem 'globalize', '~> 5.3.1' +end diff --git a/activeadmin-globalize.gemspec b/activeadmin-globalize.gemspec index 46ba2b4e..7ba0415c 100644 --- a/activeadmin-globalize.gemspec +++ b/activeadmin-globalize.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.files = Dir['{app,config,db,lib}/**/*'] + %w(MIT-LICENSE README.md) - s.add_dependency 'activeadmin', '>= 1.0', '< 1.4' + s.add_dependency 'activeadmin', '>= 1.0', '< 2.6.0' # Try to support rails from 3.2 up to 5.2.x s.add_dependency 'globalize', '>= 3.1.0', '< 6.0' diff --git a/gemfiles/rails6_0.gemfile b/gemfiles/rails6_0.gemfile new file mode 100644 index 00000000..f8ac72d0 --- /dev/null +++ b/gemfiles/rails6_0.gemfile @@ -0,0 +1,34 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sass-rails" +gem "coffee-rails" +gem "therubyracer", platforms: :ruby +gem "uglifier" +gem "jquery-rails" +gem "devise", "~> 4.7.1" +gem "rails", "~> 6.0.0" +gem "actionpack", "~> 6.0.0" +gem "activerecord", "~> 6.0.0" +gem "activesupport", "~> 6.0.0" +gem "capybara", "~> 2.15" +gem "globalize", "~> 5.3.1" + +group :test do + gem "sqlite3", "~> 1.3.5" + gem "rspec-rails", "~> 3.6.1" + gem "factory_girl_rails", "~> 4.2.1" + gem "database_cleaner", "~> 1.0.1" + gem "spring", require: false + gem "spring-commands-rspec", require: false + gem "capybara", "~> 2.15" + gem "capybara-screenshot" + gem "poltergeist" + gem "fuubar", "~> 2.2" + gem "appraisal" + gem "awesome_print" + gem "pry" +end + +gemspec path: "../" From 533172597bddb86235cbf26e8ce7e11fd549179b Mon Sep 17 00:00:00 2001 From: yinchuang94 Date: Fri, 15 Jan 2021 01:29:42 +0800 Subject: [PATCH 3/3] support rails 6 --- activeadmin-globalize.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activeadmin-globalize.gemspec b/activeadmin-globalize.gemspec index 7ba0415c..a23e4f10 100644 --- a/activeadmin-globalize.gemspec +++ b/activeadmin-globalize.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.files = Dir['{app,config,db,lib}/**/*'] + %w(MIT-LICENSE README.md) - s.add_dependency 'activeadmin', '>= 1.0', '< 2.6.0' + s.add_dependency 'activeadmin', '>= 1.0', '<= 2.6.1' # Try to support rails from 3.2 up to 5.2.x s.add_dependency 'globalize', '>= 3.1.0', '< 6.0'