Allow Rails 4.2

activeadmin · Dec 9, 2014 · f522e44 · f522e44
1 parent cb178c2
commit f522e44
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .bundle
+test/gemfiles/*.lock
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,9 +2,9 @@ PATH
   remote: .
   specs:
     inherited_resources (1.5.1)
-      actionpack (>= 3.2, < 4.2)
+      actionpack (>= 3.2, < 5)
       has_scope (~> 0.6.0.rc)
-      railties (>= 3.2, < 4.2)
+      railties (>= 3.2, < 5)
       responders (~> 1.0)
 
 GEM
@@ -50,7 +50,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
-    responders (1.1.1)
+    responders (1.1.2)
       railties (>= 3.2, < 4.2)
     strong_parameters (0.1.4)
       actionpack (>= 3.2.0)

diff --git a/inherited_resources.gemspec b/inherited_resources.gemspec
@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency("responders", "~> 1.0")
-  s.add_dependency("actionpack", ">= 3.2", "< 4.2")
-  s.add_dependency("railties", ">= 3.2", "< 4.2")
+  s.add_dependency("responders")
+  s.add_dependency("actionpack", ">= 3.2", "< 5")
+  s.add_dependency("railties", ">= 3.2", "< 5")
   s.add_dependency("has_scope",  "~> 0.6.0.rc")
 end
diff --git a/test/gemfiles/Gemfile-Rails-4-2 b/test/gemfiles/Gemfile-Rails-4-2
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'rails', '~> 4.2.0.rc2'
+
+gem 'mocha'
+gem 'minitest-rg'