Skip to content

Commit

Permalink
Update gemspec to work with AA 1.2.1 and bump 6.0.2
Browse files Browse the repository at this point in the history
Use "soft" dependency with ActiveAdmin version

Add ActiveAdmin versions to the Travis-matrix:
- 1.1.1
- 1.2.1
  • Loading branch information
JNajera authored and workgena committed Mar 29, 2018
1 parent 672ef45 commit 76bde92
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ script: bundle exec rspec spec
cache: bundler
env:
matrix:
- RAILS=4.2.6
- RAILS=5.0.0
- RAILS=4.2.6 AA=1.1.0
- RAILS=5.0.0 AA=1.2.1
rvm:
- 2.2.6
- 2.3.3
before_install:
- gem update --system
- rvm @global do gem install bundler -v 1.14.6
- gem --version
- gem --version
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ source 'https://rubygems.org'
gemspec
group :test do
default_rails_version = '4.2.7'
default_activeadmin_version = '1.1.0'
gem 'sprockets-rails', '2.3.3'
gem 'rails', "#{ENV['RAILS'] || default_rails_version}"
gem 'rspec-rails'
gem 'activeadmin', '1.1.0'
gem 'activeadmin', "#{ENV['AA'] || default_activeadmin_version}"
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
gem 'sass-rails'
gem 'sqlite3'
Expand Down
4 changes: 2 additions & 2 deletions active_admin_datetimepicker.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]

spec.add_dependency "xdan-datetimepicker-rails", "~> 2.5.1"
spec.add_dependency "activeadmin", "~> 1.1.0"
spec.add_dependency "activeadmin", "~> 1.1"
spec.add_development_dependency "bundler", "~> 1.8"
spec.add_development_dependency "rake", "~> 10.0"

end
end
2 changes: 1 addition & 1 deletion lib/active_admin_datetimepicker/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module ActiveAdminDatetimepicker
VERSION = '0.6.1'
VERSION = '0.6.2'
end

0 comments on commit 76bde92

Please sign in to comment.