From 23d52bd3e98de8f7dd912fa2450254739672530b Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Thu, 18 Aug 2016 08:04:17 +0100
Subject: [PATCH] faster build. Test only supported version of rails. Test in
 Rails 5.0

---
 .travis.yml               | 22 ++++++++++++----------
 Gemfile                   |  1 -
 Rakefile                  |  1 +
 google-api-client.gemspec |  2 +-
 samples/web/Gemfile       |  1 -
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a82bfef3fe..66663df1ec8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,21 @@
 language: ruby
+sudo: false
 rvm:
-  - 2.3.0
-  - 2.2
+  - 2.3.1
+  - 2.2.5
   - 2.0.0
   - 2.1
-  - jruby-9000
+  - jruby-9.0.5.0
 env:
-  - 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
- - sudo apt-get install idn
- - gem update bundler
+  - RAILS_VERSION="~>5.0.0"
+matrix:
+  exclude:
+    - env: RAILS_VERSION="~>5.0.0"
+      rvm: 2.0.0
+    - env: RAILS_VERSION="~>5.0.0"
+      rvm: 2.1
+before_install: gem install bundler
 notifications:
   email:
     recipients:
diff --git a/Gemfile b/Gemfile
index 238047f1a1a..8d0eb2c4bb4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,6 @@ group :development do
   gem 'google-id-token', '~> 1.3'
   gem 'os', '~> 0.9'
   gem 'rmail', '~> 1.1'
-  gem 'sinatra', '~> 1.4'
   gem 'redis', '~> 3.2'
 end
 
diff --git a/Rakefile b/Rakefile
index 809eb5616ad..dc9a4dcd209 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,2 +1,3 @@
 require "bundler/gem_tasks"
 
+task default: :spec
diff --git a/google-api-client.gemspec b/google-api-client.gemspec
index 75737a6cddc..fba6622eec9 100644
--- a/google-api-client.gemspec
+++ b/google-api-client.gemspec
@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'googleauth', '~> 0.5'
   spec.add_runtime_dependency 'httpclient', '>= 2.8.1', '< 3.0'
   spec.add_development_dependency 'thor', '~> 0.14'
-  spec.add_development_dependency 'activesupport', '>= 3.2', '< 5.0'
+  spec.add_development_dependency 'activesupport', '>= 4.2', '< 5.1'
 end
diff --git a/samples/web/Gemfile b/samples/web/Gemfile
index 9c86e389f1b..98418b3e4a7 100644
--- a/samples/web/Gemfile
+++ b/samples/web/Gemfile
@@ -2,6 +2,5 @@ source 'https://rubygems.org'
 
 gem 'google-api-client', '~> 0.9'
 gem 'google-id-token', '~> 1.3'
-gem 'sinatra', '~> 1.4'
 gem 'redis', '~> 3.2'
 gem 'dotenv'