Skip to content

Commit 6a956c6

Browse files
committed
Use "soft" dependency with ActiveAdmin version
Add ActiveAdmin versions to the Travis-matrix: - 1.1.1 - 1.2.1
1 parent 6a1de6b commit 6a956c6

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ script: bundle exec rspec spec
22
cache: bundler
33
env:
44
matrix:
5-
- RAILS=4.2.6
6-
- RAILS=5.0.0
5+
- RAILS=4.2.6 AA=1.1.0
6+
- RAILS=5.0.0 AA=1.2.1
77
rvm:
88
- 2.2.6
99
- 2.3.3
1010
before_install:
1111
- gem update --system
1212
- rvm @global do gem install bundler -v 1.14.6
13-
- gem --version
13+
- gem --version

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ source 'https://rubygems.org'
44
gemspec
55
group :test do
66
default_rails_version = '4.2.7'
7+
default_activeadmin_version = '1.1.0'
78
gem 'sprockets-rails', '2.3.3'
89
gem 'rails', "#{ENV['RAILS'] || default_rails_version}"
910
gem 'rspec-rails'
10-
gem 'activeadmin', '1.2.1'
11+
gem 'activeadmin', "#{ENV['AA'] || default_activeadmin_version}"
1112
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
1213
gem 'sass-rails'
1314
gem 'sqlite3'

active_admin_datetimepicker.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
2020
spec.require_paths = ["lib"]
2121

2222
spec.add_dependency "xdan-datetimepicker-rails", "~> 2.5.1"
23-
spec.add_dependency "activeadmin", "~> 1.2.1"
23+
spec.add_dependency "activeadmin", "~> 1.1"
2424
spec.add_development_dependency "bundler", "~> 1.8"
2525
spec.add_development_dependency "rake", "~> 10.0"
2626

0 commit comments

Comments
 (0)