Support and test under Rails 3.2, 4.0, 4.1, and 4.2

diff --git a/.travis.yml b/.travis.yml
index 891b260bbd2090d188a7e63ef7cd1e68c724e915..2a453720d84c8a2cfb02b89d80472cbf0d0c8d36 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,11 @@ rvm:
   - 1.9.3
   - rbx-2
   - jruby
+env:
+  - RAILS_VERSION="~>3.2"
+  - RAILS_VERSION="~>4.0.0"
+  - RAILS_VERSION="~>4.1.0"
+  - RAILS_VERSION="~>4.2.0"
 script: "bundle exec rake spec:all"
 before_install:
  - sudo apt-get update

diff --git a/Gemfile b/Gemfile
index ab0b3d14f5b0a049387add453e96f7d0021542a5..9e6d43ad8e37d754712abe7dbe16639f6639c672 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -3,3 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'jruby-openssl', :platforms => :jruby
+
+if ENV['RAILS_VERSION']
+  gem 'rails', ENV['RAILS_VERSION']
+end
\ No newline at end of file

diff --git a/google-api-client.gemspec b/google-api-client.gemspec
index d1413b77faa04846efc7ecbd7b22ec43577c5c34..b69b571a2cbd39ac882cb4d48bcf196922dcc31f 100644 (file)
--- a/google-api-client.gemspec
+++ b/google-api-client.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'extlib', '~> 0.9'
   s.add_runtime_dependency 'launchy', '~> 2.4'
   s.add_runtime_dependency 'retriable', '~> 1.4'
-  s.add_runtime_dependency 'activesupport', '~> 3.2'
+  s.add_runtime_dependency 'activesupport', '>= 3.2'
 
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'yard', '~> 0.8'