Merge branch 'v0.10' of https://github.com/google/google-api-ruby-client into v0.10

.travis.yml

@@ -1,26 +1,21 @@
 language: ruby
+sudo: false
 rvm:
-  - 2.3.0
-  - 2.2
-  - 2.1
+  - 2.3.1
+  - 2.2.5
   - 2.0.0
-  - jruby-9000
+  - 2.1
+  - jruby-9.0.5.0
 env:
-  global:
-    - JRUBY_OPTS='-X-C -J-Xmx1024m -J-XX:+UseConcMarkSweepGC'
-  matrix:
-    - RAILS_VERSION="~>4.0.0"
-    - RAILS_VERSION="~>4.1.0"
-    - RAILS_VERSION="~>4.2.0"
+  - RAILS_VERSION="~>4.2.0"
+  - RAILS_VERSION="~>5.0.0"
 matrix:
   exclude:
-    - rvm: 2.0.0
-      env: 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
+    - 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:

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
 

Rakefile

@@ -1,2 +1,3 @@
 require "bundler/gem_tasks"
 
+task default: :spec

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.19'
-  spec.add_development_dependency 'activesupport', '>= 3.2', '< 5.0'
+  spec.add_development_dependency 'activesupport', '>= 4.2', '< 5.1'
 end

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'