Merge pull request #144 from mchaisse/rails_5_1_support

Add support for Rails 5.1.x
jmazzi · May 25, 2017 · 7b4dcb8 · 7b4dcb8
2 parents 2590dbb + 1be89c7
commit 7b4dcb8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,11 +7,11 @@ rvm:
 
 gemfile:
   - gemfiles/activerecord_4_2.gemfile
-  - gemfiles/activerecord_5_0.gemfile
+  - gemfiles/activerecord_5_1.gemfile
 
 matrix:
   exclude:
-    - gemfile: gemfiles/activerecord_5_0.gemfile
+    - gemfile: gemfiles/activerecord_5_1.gemfile
       rvm: 2.1.10
 
 addons:

diff --git a/crypt_keeper.gemspec b/crypt_keeper.gemspec
@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = CryptKeeper::VERSION
 
-  gem.add_runtime_dependency 'activerecord',  '>= 4.2', '< 5.1'
-  gem.add_runtime_dependency 'activesupport', '>= 4.2', '< 5.1'
+  gem.add_runtime_dependency 'activerecord',  '>= 4.2', '< 5.2'
+  gem.add_runtime_dependency 'activesupport', '>= 4.2', '< 5.2'
   gem.add_runtime_dependency 'aes',           '~> 0.5.0'
   gem.add_runtime_dependency 'armor',         '~> 0.0.2'
 

diff --git a/gemfiles/activerecord_5_0.gemfile → gemfiles/activerecord_5_1.gemfile b/gemfiles/activerecord_5_0.gemfile → gemfiles/activerecord_5_1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0"
-gem "activesupport", "~> 5.0.0"
+gem "activerecord", "~> 5.1"
+gem "activesupport", "~> 5.1"
 
 gemspec :path => "../"