Skip to content

Commit

Permalink
Update Appraisal
Browse files Browse the repository at this point in the history
  • Loading branch information
yhirano55 committed Apr 8, 2018
1 parent 9dedeb3 commit 6583ba2
Show file tree
Hide file tree
Showing 10 changed files with 68 additions and 37 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
/spec/reports/
/tmp/
/gemfiles/*.gemfile.lock
/gemfiles/.bundle/*
/gemfiles/vendor/
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ AllCops:
Exclude:
- "spec/rails/**/*"
- "vendor/bundle/**/*"
- "gemfiles/vendor/**/*"
- "gemfiles/.bundle/**/*"
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
language: ruby

before_install:
- gem update --system
- gem install bundler

gemfiles:
- gemfiles/5.0.gemfile
- gemfiles/5.1.gemfile
- gemfiles/5.2.gemfile
rvm:
- 2.3.7
- 2.4.4

- 2.5.1
script:
- bundle exec rspec
17 changes: 8 additions & 9 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
appraise "rails42" do
gem "rails", "~> 4.2.0"
gem "devise", "~> 4.2.0"
gem "activeadmin", "1.0.0.pre4"
appraise "5.0" do
gem "rails", "~> 5.0.0"
end

appraise "rails50" do
gem "rails", "~> 5.0.0"
gem "devise", "~> 4.2.0"
gem "inherited_resources", github: "activeadmin/inherited_resources"
gem "activeadmin", github: "activeadmin/activeadmin"
appraise "5.1" do
gem "rails", "~> 5.1.0"
end

appraise "5.2" do
gem "rails", "~> 5.2.0.rc2"
end
13 changes: 8 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
source "https://rubygems.org"

git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

gemspec

gem "activeadmin", "1.0.0.pre4"
gem "appraisal"
gem "devise", "~> 4.2.0"
gem "devise"
gem "jquery-ui-rails", "~> 4.2.1"
gem "rails", "~> 4.2.0"
gem "rails", ">= 5.0.0"

group :development, :test do
gem "sqlite3", platforms: :mri
end

group :development do
gem "onkcop", require: false
gem "rake", "~> 10.0"
end

group :test do
Expand All @@ -19,5 +23,4 @@ group :test do
gem "poltergeist"
gem "rspec-rails"
gem "shoulda-matchers"
gem "sqlite3", platforms: :mri
end
3 changes: 2 additions & 1 deletion active_admin_role.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 2.1.0"

gem.add_dependency "activeadmin", ">= 1.0.0.pre4"
gem.add_dependency "activeadmin", ">= 1.2.0"
gem.add_dependency "cancancan", ">= 1.15.0"
gem.add_dependency "railties", ">= 5.0.0"
end
2 changes: 0 additions & 2 deletions gemfiles/.bundle/config

This file was deleted.

16 changes: 8 additions & 8 deletions gemfiles/rails42.gemfile → gemfiles/5.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@

source "https://rubygems.org"

gem "activeadmin", "1.0.0.pre4"
gem "appraisal"
gem "devise", "~> 4.2.0"
gem "pry"
gem "rails", "~> 4.2.0"
gem "devise"
gem "jquery-ui-rails", "~> 4.2.1"
gem "rails", "~> 5.0.0"

group :development, :test do
gem "sqlite3", platforms: :mri
end

group :development do
gem "bundler", "~> 1.13.0"
gem "rake", "~> 10.0"
gem "rubocop", "~> 0.40.0"
gem "onkcop", require: false
end

group :test do
Expand All @@ -20,7 +21,6 @@ group :test do
gem "poltergeist"
gem "rspec-rails"
gem "shoulda-matchers"
gem "sqlite3", platforms: :mri
end

gemspec path: "../"
17 changes: 8 additions & 9 deletions gemfiles/rails50.gemfile → gemfiles/5.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

source "https://rubygems.org"

gem "activeadmin", github: "activeadmin/activeadmin"
gem "appraisal"
gem "devise", "~> 4.2.0"
gem "inherited_resources", github: "activeadmin/inherited_resources"
gem "pry"
gem "rails", "~> 5.0.0"
gem "devise"
gem "jquery-ui-rails", "~> 4.2.1"
gem "rails", "~> 5.1.0"

group :development, :test do
gem "sqlite3", platforms: :mri
end

group :development do
gem "bundler", "~> 1.13.0"
gem "rake", "~> 10.0"
gem "rubocop", "~> 0.40.0"
gem "onkcop", require: false
end

group :test do
Expand All @@ -21,7 +21,6 @@ group :test do
gem "poltergeist"
gem "rspec-rails"
gem "shoulda-matchers"
gem "sqlite3", platforms: :mri
end

gemspec path: "../"
26 changes: 26 additions & 0 deletions gemfiles/5.2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal"
gem "devise"
gem "jquery-ui-rails", "~> 4.2.1"
gem "rails", "~> 5.2.0.rc2"

group :development, :test do
gem "sqlite3", platforms: :mri
end

group :development do
gem "onkcop", require: false
end

group :test do
gem "capybara"
gem "database_cleaner"
gem "poltergeist"
gem "rspec-rails"
gem "shoulda-matchers"
end

gemspec path: "../"

0 comments on commit 6583ba2

Please sign in to comment.