Skip to content

Commit 76bde92

Browse files
JNajeraworkgena
authored andcommitted
Update gemspec to work with AA 1.2.1 and bump 6.0.2
Use "soft" dependency with ActiveAdmin version Add ActiveAdmin versions to the Travis-matrix: - 1.1.1 - 1.2.1
1 parent 672ef45 commit 76bde92

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.travis.yml

+3-3
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

+2-1
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.1.0'
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ 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.1.0"
23+
spec.add_dependency "activeadmin", "~> 1.1"
2424
spec.add_development_dependency "bundler", "~> 1.8"
2525
spec.add_development_dependency "rake", "~> 10.0"
2626

27-
end
27+
end
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module ActiveAdminDatetimepicker
2-
VERSION = '0.6.1'
2+
VERSION = '0.6.2'
33
end

0 commit comments

Comments
 (0)