MDL-51531 libraries: Upgrade google libraries to 1.1.5

lib/google/README.md

@@ -26,7 +26,7 @@ See the examples/ directory for examples of the key client features.
 ```PHP
 <?php
 
-  require_once 'google-api-php-client/autoload.php'; // or wherever autoload.php is located
+  require_once 'google-api-php-client/src/Google/autoload.php'; // or wherever autoload.php is located
   
   $client = new Google_Client();
   $client->setApplicationName("Client_Library_Examples");
@@ -42,6 +42,10 @@ See the examples/ directory for examples of the key client features.
   
 ```
 
+### Service Specific Examples ###
+
+YouTube: https://github.com/youtube/api-samples/tree/master/php
+
 ## Frequently Asked Questions ##
 
 ### What do I do if something isn't working? ###
@@ -54,6 +58,10 @@ If there is a specific bug with the library, please file a issue in the Github i
 
 We accept contributions via Github Pull Requests, but all contributors need to be covered by the standard Google Contributor License Agreement. You can find links, and more instructions, in the documentation: https://developers.google.com/api-client-library/php/contribute
 
+### I want an example of X! ### 
+
+If X is a feature of the library, file away! If X is an example of using a specific service, the best place to go is to the teams for those specific APIs - our preference is to link to their examples rather than add them to the library, as they can then pin to specific versions of the library. If you have any examples for other APIs, let us know and we will happily add a link to the README above!
+
 ### Why do you still support 5.2? ###
 
 When we started working on the 1.0.0 branch we knew there were several fundamental issues to fix with the 0.6 releases of the library. At that time we looked at the usage of the library, and other related projects, and determined that there was still a large and active base of PHP 5.2 installs. You can see this in statistics such as the PHP versions chart in the WordPress stats: http://wordpress.org/about/stats/. We will keep looking at the types of usage we see, and try to take advantage of newer PHP features where possible.
@@ -72,10 +80,26 @@ $opt_params = array(
 );
 ```
 
+### How do I set a field to null? ###
+
+The library strips out nulls from the objects sent to the Google APIs as its the default value of all of the uninitialised properties. To work around this, set the field you want to null to Google_Model::NULL_VALUE. This is a placeholder that will be replaced with a true null when sent over the wire.
+
 ## Code Quality ##
 
-Copy the ruleset.xml in style/ into a new directory named GAPI/ in your
-/usr/share/php/PHP/CodeSniffer/Standards (or appropriate equivalent directory),
-and run code sniffs with:
+Run the PHPUnit tests with PHPUnit. You can configure an API key and token in BaseTest.php to run all calls, but this will require some setup on the Google Developer Console.
 
-        phpcs --standard=GAPI src/
+    phpunit tests/
+
+### Coding Style
+
+To check for coding style violations, run
+
+```
+vendor/bin/phpcs src --standard=style/ruleset.xml -np 
+```
+
+To automatically fix (fixable) coding style violations, run  
+
+```
+vendor/bin/phpcbf src --standard=style/ruleset.xml
+```

lib/google/autoload.php

@@ -15,19 +15,12 @@
  * limitations under the License.
  */
 
-function google_api_php_client_autoload($className) {
-  $classPath = explode('_', $className);
-  if ($classPath[0] != 'Google') {
-    return;
-  }
-  if (count($classPath) > 3) {
-    // Maximum class file path depth in this project is 3.
-    $classPath = array_slice($classPath, 0, 3);
-  }
-  $filePath = dirname(__FILE__) . '/src/' . implode('/', $classPath) . '.php';
-  if (file_exists($filePath)) {
-    require_once($filePath);
-  }
+// PHP 5.2 compatibility: E_USER_DEPRECATED was added in 5.3
+if (!defined('E_USER_DEPRECATED')) {
+  define('E_USER_DEPRECATED', E_USER_WARNING);
 }
 
-spl_autoload_register('google_api_php_client_autoload');
+$error = "google-api-php-client's autoloader was moved to src/Google/autoload.php in 1.1.3. This ";
+$error .= "redirect will be removed in 1.2. Please adjust your code to use the new location.";
+trigger_error($error, E_USER_DEPRECATED);
+require_once dirname(__FILE__) . '/src/Google/autoload.php';

lib/google/lib.php

@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 // All Google API classes support autoload with this.
-require_once($CFG->libdir . '/google/autoload.php');
+require_once($CFG->libdir . '/google/src/Google/autoload.php');
 // To be able to use our custom IO class.
 require_once($CFG->libdir . '/google/curlio.php');
 

lib/google/readme_moodle.txt

@@ -44,4 +44,4 @@ Repository: https://github.com/google/google-api-php-client
 Documentation: https://developers.google.com/api-client-library/php/
 Global documentation: https://developers.google.com
 
-Downloaded version: 1.1.2
+Downloaded version: 1.1.5

lib/google/src/Google/Auth/Abstract.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * Abstract class for the Authentication in the API client

lib/google/src/Google/Auth/AppIdentity.php

@@ -22,7 +22,9 @@
  */
 use google\appengine\api\app_identity\AppIdentityService;
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * Authentication via the Google App Engine App Identity service.
@@ -30,7 +32,6 @@ require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 class Google_Auth_AppIdentity extends Google_Auth_Abstract
 {
   const CACHE_PREFIX = "Google_Auth_AppIdentity::";
-  private $key = null;
   private $client;
   private $token = false;
   private $tokenScopes = false;
@@ -58,18 +59,32 @@ class Google_Auth_AppIdentity extends Google_Auth_Abstract
 
     $this->token = $this->client->getCache()->get($cacheKey);
     if (!$this->token) {
-      $this->token = AppIdentityService::getAccessToken($scopes);
-      if ($this->token) {
-        $this->client->getCache()->set(
-            $cacheKey,
-            $this->token
-        );
-      }
+      $this->retrieveToken($scopes, $cacheKey);
+    } else if ($this->token['expiration_time'] < time()) {
+      $this->client->getCache()->delete($cacheKey);
+      $this->retrieveToken($scopes, $cacheKey);
     }
+
     $this->tokenScopes = $scopes;
     return $this->token;
   }
 
+  /**
+   * Retrieve a new access token and store it in cache
+   * @param mixed $scopes
+   * @param string $cacheKey
+   */
+  private function retrieveToken($scopes, $cacheKey)
+  {
+    $this->token = AppIdentityService::getAccessToken($scopes);
+    if ($this->token) {
+      $this->client->getCache()->set(
+          $cacheKey,
+          $this->token
+      );
+    }
+  }
+
   /**
    * Perform an authenticated / signed apiHttpRequest.
    * This function takes the apiHttpRequest, calls apiAuth->sign on it

lib/google/src/Google/Auth/AssertionCredentials.php

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * Credentials object used for OAuth 2.0 Signed JWT assertion grants.
- *
- * @author Chirag Shah <[email protected]>
  */
 class Google_Auth_AssertionCredentials
 {

lib/google/src/Google/Auth/ComputeEngine.php

@@ -0,0 +1,146 @@
+<?php
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
+
+/**
+ * Authentication via built-in Compute Engine service accounts.
+ * The instance must be pre-configured with a service account
+ * and the appropriate scopes.
+ * @author Jonathan Parrott <[email protected]>
+ */
+class Google_Auth_ComputeEngine extends Google_Auth_Abstract
+{
+  const METADATA_AUTH_URL =
+      'http://metadata/computeMetadata/v1/instance/service-accounts/default/token';
+  private $client;
+  private $token;
+
+  public function __construct(Google_Client $client, $config = null)
+  {
+    $this->client = $client;
+  }
+
+  /**
+   * Perform an authenticated / signed apiHttpRequest.
+   * This function takes the apiHttpRequest, calls apiAuth->sign on it
+   * (which can modify the request in what ever way fits the auth mechanism)
+   * and then calls apiCurlIO::makeRequest on the signed request
+   *
+   * @param Google_Http_Request $request
+   * @return Google_Http_Request The resulting HTTP response including the
+   * responseHttpCode, responseHeaders and responseBody.
+   */
+  public function authenticatedRequest(Google_Http_Request $request)
+  {
+    $request = $this->sign($request);
+    return $this->client->getIo()->makeRequest($request);
+  }
+
+  /**
+   * @param string $token
+   * @throws Google_Auth_Exception
+   */
+  public function setAccessToken($token)
+  {
+    $token = json_decode($token, true);
+    if ($token == null) {
+      throw new Google_Auth_Exception('Could not json decode the token');
+    }
+    if (! isset($token['access_token'])) {
+      throw new Google_Auth_Exception("Invalid token format");
+    }
+    $token['created'] = time();
+    $this->token = $token;
+  }
+
+  public function getAccessToken()
+  {
+    return json_encode($this->token);
+  }
+
+  /**
+   * Acquires a new access token from the compute engine metadata server.
+   * @throws Google_Auth_Exception
+   */
+  public function acquireAccessToken()
+  {
+    $request = new Google_Http_Request(
+        self::METADATA_AUTH_URL,
+        'GET',
+        array(
+          'Metadata-Flavor' => 'Google'
+        )
+    );
+    $request->disableGzip();
+    $response = $this->client->getIo()->makeRequest($request);
+
+    if ($response->getResponseHttpCode() == 200) {
+      $this->setAccessToken($response->getResponseBody());
+      $this->token['created'] = time();
+      return $this->getAccessToken();
+    } else {
+      throw new Google_Auth_Exception(
+          sprintf(
+              "Error fetching service account access token, message: '%s'",
+              $response->getResponseBody()
+          ),
+          $response->getResponseHttpCode()
+      );
+    }
+  }
+
+  /**
+   * Include an accessToken in a given apiHttpRequest.
+   * @param Google_Http_Request $request
+   * @return Google_Http_Request
+   * @throws Google_Auth_Exception
+   */
+  public function sign(Google_Http_Request $request)
+  {
+    if ($this->isAccessTokenExpired()) {
+      $this->acquireAccessToken();
+    }
+
+    $this->client->getLogger()->debug('Compute engine service account authentication');
+
+    $request->setRequestHeaders(
+        array('Authorization' => 'Bearer ' . $this->token['access_token'])
+    );
+
+    return $request;
+  }
+
+  /**
+   * Returns if the access_token is expired.
+   * @return bool Returns True if the access_token is expired.
+   */
+  public function isAccessTokenExpired()
+  {
+    if (!$this->token || !isset($this->token['created'])) {
+      return true;
+    }
+
+    // If the token is set to expire in the next 30 seconds.
+    $expired = ($this->token['created']
+        + ($this->token['expires_in'] - 30)) < time();
+
+    return $expired;
+  }
+}

lib/google/src/Google/Auth/Exception.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 class Google_Auth_Exception extends Google_Exception
 {

lib/google/src/Google/Auth/LoginTicket.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * Class to hold information about an authenticated login.

lib/google/src/Google/Auth/OAuth2.php

@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * Authentication class that deals with the OAuth 2 web-server authentication flow
  *
- * @author Chris Chabot <[email protected]>
- * @author Chirag Shah <[email protected]>
- *
  */
 class Google_Auth_OAuth2 extends Google_Auth_Abstract
 {
@@ -79,28 +78,34 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
 
   /**
    * @param string $code
+   * @param boolean $crossClient
    * @throws Google_Auth_Exception
    * @return string
    */
-  public function authenticate($code)
+  public function authenticate($code, $crossClient = false)
   {
     if (strlen($code) == 0) {
       throw new Google_Auth_Exception("Invalid code");
     }
 
+    $arguments = array(
+          'code' => $code,
+          'grant_type' => 'authorization_code',
+          'client_id' => $this->client->getClassConfig($this, 'client_id'),
+          'client_secret' => $this->client->getClassConfig($this, 'client_secret')
+    );
+
+    if ($crossClient !== true) {
+        $arguments['redirect_uri'] = $this->client->getClassConfig($this, 'redirect_uri');
+    }
+
     // We got here from the redirect from a successful authorization grant,
     // fetch the access token
     $request = new Google_Http_Request(
         self::OAUTH2_TOKEN_URI,
         'POST',
         array(),
-        array(
-          'code' => $code,
-          'grant_type' => 'authorization_code',
-          'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
-          'client_id' => $this->client->getClassConfig($this, 'client_id'),
-          'client_secret' => $this->client->getClassConfig($this, 'client_secret')
-        )
+        $arguments
     );
     $request->disableGzip();
     $response = $this->client->getIo()->makeRequest($request);

lib/google/src/Google/Auth/Simple.php

@@ -15,18 +15,17 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * Simple API access implementation. Can either be used to make requests
  * completely unauthenticated, or by using a Simple API Access developer
  * key.
- * @author Chris Chabot <[email protected]>
- * @author Chirag Shah <[email protected]>
  */
 class Google_Auth_Simple extends Google_Auth_Abstract
 {
-  private $key = null;
   private $client;
 
   public function __construct(Google_Client $client, $config = null)

lib/google/src/Google/Cache/Apc.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * A persistent storage class based on the APC cache, which is not

lib/google/src/Google/Cache/Exception.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 class Google_Cache_Exception extends Google_Exception
 {

lib/google/src/Google/Cache/File.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /*
  * This class implements a basic on disk storage. While that does
@@ -68,8 +70,15 @@ class Google_Cache_File extends Google_Cache_Abstract
     }
 
     if ($this->acquireReadLock($storageFile)) {
-      $data = fread($this->fh, filesize($storageFile));
-      $data =  unserialize($data);
+      if (filesize($storageFile) > 0) {
+        $data = fread($this->fh, filesize($storageFile));
+        $data =  unserialize($data);
+      } else {
+        $this->client->getLogger()->debug(
+            'Cache file was empty',
+            array('file' => $storageFile)
+        );
+      }
       $this->unlock($storageFile);
     }
 
@@ -170,6 +179,13 @@ class Google_Cache_File extends Google_Cache_Abstract
   {
     $mode = $type == LOCK_EX ? "w" : "r";
     $this->fh = fopen($storageFile, $mode);
+    if (!$this->fh) {
+      $this->client->getLogger()->error(
+          'Failed to open file during lock acquisition',
+          array('file' => $storageFile)
+      );
+      return false;
+    }
     $count = 0;
     while (!flock($this->fh, $type | LOCK_NB)) {
       // Sleep for 10ms.

lib/google/src/Google/Cache/Memcache.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * A persistent storage class based on the memcache, which is not

lib/google/src/Google/Cache/Null.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * A blank storage class, for cases where caching is not

lib/google/src/Google/Client.php

@@ -15,18 +15,17 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/autoload.php';
+}
 
 /**
  * The Google API Client
  * http://code.google.com/p/google-api-php-client/
- *
- * @author Chris Chabot <[email protected]>
- * @author Chirag Shah <[email protected]>
  */
 class Google_Client
 {
-  const LIBVER = "1.1.2";
+  const LIBVER = "1.1.5";
   const USER_AGENT_SUFFIX = "google-api-php-client/";
   /**
    * @var Google_Auth_Abstract $auth
@@ -115,15 +114,45 @@ class Google_Client
 
   /**
    * Attempt to exchange a code for an valid authentication token.
+   * If $crossClient is set to true, the request body will not include
+   * the request_uri argument
    * Helper wrapped around the OAuth 2.0 implementation.
    *
    * @param $code string code from accounts.google.com
+   * @param $crossClient boolean, whether this is a cross-client authentication
    * @return string token
    */
-  public function authenticate($code)
+  public function authenticate($code, $crossClient = false)
   {
     $this->authenticated = true;
-    return $this->getAuth()->authenticate($code);
+    return $this->getAuth()->authenticate($code, $crossClient);
+  }
+  
+  /**
+   * Loads a service account key and parameters from a JSON
+   * file from the Google Developer Console. Uses that and the
+   * given array of scopes to return an assertion credential for
+   * use with refreshTokenWithAssertionCredential.
+   *
+   * @param string $jsonLocation File location of the project-key.json.
+   * @param array $scopes The scopes to assert.
+   * @return Google_Auth_AssertionCredentials.
+   * @
+   */
+  public function loadServiceAccountJson($jsonLocation, $scopes)
+  {
+    $data = json_decode(file_get_contents($jsonLocation));
+    if (isset($data->type) && $data->type == 'service_account') {
+      // Service Account format.
+      $cred = new Google_Auth_AssertionCredentials(
+          $data->client_email,
+          $scopes,
+          $data->private_key
+      );
+      return $cred;
+    } else {
+      throw new Google_Exception("Invalid service account JSON file.");
+    }
   }
 
   /**

lib/google/src/Google/Collection.php

@@ -1,6 +1,8 @@
 <?php
 
-require_once realpath(dirname(__FILE__) . '/../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/autoload.php';
+}
 
 /**
  * Extension to the regular Google_Model that automatically
@@ -48,10 +50,13 @@ class Google_Collection extends Google_Model implements Iterator, Countable
 
   public function count()
   {
+    if (!isset($this->modelData[$this->collection_key])) {
+      return 0;
+    }
     return count($this->modelData[$this->collection_key]);
   }
 
-  public function offsetExists ($offset)
+  public function offsetExists($offset)
   {
     if (!is_numeric($offset)) {
       return parent::offsetExists($offset);

lib/google/src/Google/Config.php

@@ -25,6 +25,9 @@ class Google_Config
   const GZIP_UPLOADS_ENABLED = true;
   const GZIP_UPLOADS_DISABLED = false;
   const USE_AUTO_IO_SELECTION = "auto";
+  const TASK_RETRY_NEVER = 0;
+  const TASK_RETRY_ONCE = 1;
+  const TASK_RETRY_ALWAYS = -1;
   protected $configuration;
 
   /**
@@ -101,6 +104,36 @@ class Google_Config
           'federated_signon_certs_url' =>
               'https://www.googleapis.com/oauth2/v1/certs',
         ),
+        'Google_Task_Runner' => array(
+          // Delays are specified in seconds
+          'initial_delay' => 1,
+          'max_delay' => 60,
+          // Base number for exponential backoff
+          'factor' => 2,
+          // A random number between -jitter and jitter will be added to the
+          // factor on each iteration to allow for better distribution of
+          // retries.
+          'jitter' => .5,
+          // Maximum number of retries allowed
+          'retries' => 0
+        ),
+        'Google_Service_Exception' => array(
+          'retry_map' => array(
+            '500' => self::TASK_RETRY_ALWAYS,
+            '503' => self::TASK_RETRY_ALWAYS,
+            'rateLimitExceeded' => self::TASK_RETRY_ALWAYS,
+            'userRateLimitExceeded' => self::TASK_RETRY_ALWAYS
+          )
+        ),
+        'Google_IO_Exception' => array(
+          'retry_map' => !extension_loaded('curl') ? array() : array(
+            CURLE_COULDNT_RESOLVE_HOST => self::TASK_RETRY_ALWAYS,
+            CURLE_COULDNT_CONNECT => self::TASK_RETRY_ALWAYS,
+            CURLE_OPERATION_TIMEOUTED => self::TASK_RETRY_ALWAYS,
+            CURLE_SSL_CONNECT_ERROR => self::TASK_RETRY_ALWAYS,
+            CURLE_GOT_NOTHING => self::TASK_RETRY_ALWAYS
+          )
+        ),
         // Set a default directory for the file cache.
         'Google_Cache_File' => array(
           'directory' => sys_get_temp_dir() . '/Google_Client'
@@ -348,6 +381,11 @@ class Google_Config
    * Set the hd (hosted domain) parameter streamlines the login process for
    * Google Apps hosted accounts. By including the domain of the user, you
    * restrict sign-in to accounts at that domain.
+   *
+   * This should not be used to ensure security on your application - check
+   * the hd values within an id token (@see Google_Auth_LoginTicket) after sign
+   * in to ensure that the user is from the domain you were expecting.
+   *
    * @param $hd string - the domain to use.
    */
   public function setHostedDomain($hd)

lib/google/src/Google/Http/Batch.php

@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
- * @author Chirag Shah <[email protected]>
+ * Class to handle batched requests to the Google API service.
  */
 class Google_Http_Batch
 {
@@ -33,12 +35,15 @@ class Google_Http_Batch
 
   private $expected_classes = array();
 
-  private $base_path;
+  private $root_url;
 
-  public function __construct(Google_Client $client, $boundary = false)
+  private $batch_path;
+
+  public function __construct(Google_Client $client, $boundary = false, $rootUrl = '', $batchPath = '')
   {
     $this->client = $client;
-    $this->base_path = $this->client->getBasePath();
+    $this->root_url = rtrim($rootUrl ? $rootUrl : $this->client->getBasePath(), '/');
+    $this->batch_path = $batchPath ? $batchPath : 'batch';
     $this->expected_classes = array();
     $boundary = (false == $boundary) ? mt_rand() : $boundary;
     $this->boundary = str_replace('"', '', $boundary);
@@ -60,14 +65,13 @@ class Google_Http_Batch
     /** @var Google_Http_Request $req */
     foreach ($this->requests as $key => $req) {
       $body .= "--{$this->boundary}\n";
-      $body .= $req->toBatchString($key) . "\n";
+      $body .= $req->toBatchString($key) . "\n\n";
       $this->expected_classes["response-" . $key] = $req->getExpectedClass();
     }
 
-    $body = rtrim($body);
-    $body .= "\n--{$this->boundary}--";
+    $body .= "--{$this->boundary}--";
 
-    $url = $this->base_path . '/batch';
+    $url = $this->root_url . '/' . $this->batch_path;
     $httpRequest = new Google_Http_Request($url, 'POST');
     $httpRequest->setRequestHeaders(
         array('Content-Type' => 'multipart/mixed; boundary=' . $this->boundary)

lib/google/src/Google/Http/CacheParser.php

@@ -15,12 +15,13 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * Implement the caching directives specified in rfc2616. This
  * implementation is guided by the guidance offered in rfc2616-sec13.
- * @author Chirag Shah <[email protected]>
  */
 class Google_Http_CacheParser
 {

lib/google/src/Google/Http/MediaFileUpload.php

@@ -15,11 +15,13 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
- * @author Chirag Shah <[email protected]>
- *
+ * Manage large file uploads, which may be media but can be any type
+ * of sizable data.
  */
 class Google_Http_MediaFileUpload
 {
@@ -285,7 +287,7 @@ class Google_Http_MediaFileUpload
     }
     $message = $code;
     $body = @json_decode($response->getResponseBody());
-    if (!empty( $body->error->errors ) ) {
+    if (!empty($body->error->errors) ) {
       $message .= ': ';
       foreach ($body->error->errors as $error) {
         $message .= "{$error->domain}, {$error->message};";
@@ -297,4 +299,9 @@ class Google_Http_MediaFileUpload
     $this->client->getLogger()->error($error);
     throw new Google_Exception($error);
   }
+
+  public function setChunkSize($chunkSize)
+  {
+    $this->chunkSize = $chunkSize;
+  }
 }

lib/google/src/Google/Http/REST.php

@@ -15,16 +15,37 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * This class implements the RESTful transport of apiServiceRequest()'s
- *
- * @author Chris Chabot <[email protected]>
- * @author Chirag Shah <[email protected]>
  */
 class Google_Http_REST
 {
+  /**
+   * Executes a Google_Http_Request and (if applicable) automatically retries
+   * when errors occur.
+   *
+   * @param Google_Client $client
+   * @param Google_Http_Request $req
+   * @return array decoded result
+   * @throws Google_Service_Exception on server side error (ie: not authenticated,
+   *  invalid or malformed post body, invalid url)
+   */
+  public static function execute(Google_Client $client, Google_Http_Request $req)
+  {
+    $runner = new Google_Task_Runner(
+        $client,
+        sprintf('%s %s', $req->getRequestMethod(), $req->getUrl()),
+        array(get_class(), 'doExecute'),
+        array($client, $req)
+    );
+
+    return $runner->run();
+  }
+
   /**
    * Executes a Google_Http_Request
    *
@@ -34,7 +55,7 @@ class Google_Http_REST
    * @throws Google_Service_Exception on server side error (ie: not authenticated,
    *  invalid or malformed post body, invalid url)
    */
-  public static function execute(Google_Client $client, Google_Http_Request $req)
+  public static function doExecute(Google_Client $client, Google_Http_Request $req)
   {
     $httpRequest = $client->getIo()->makeRequest($req);
     $httpRequest->setExpectedClass($req->getExpectedClass());
@@ -74,17 +95,27 @@ class Google_Http_REST
         $errors = $decoded['error']['errors'];
       }
 
+      $map = null;
       if ($client) {
         $client->getLogger()->error(
             $err,
             array('code' => $code, 'errors' => $errors)
         );
+
+        $map = $client->getClassConfig(
+            'Google_Service_Exception',
+            'retry_map'
+        );
       }
-      throw new Google_Service_Exception($err, $code, null, $errors);
+      throw new Google_Service_Exception($err, $code, null, $errors, $map);
     }
 
     // Only attempt to decode the response, if the response code wasn't (204) 'no content'
     if ($code != '204') {
+      if ($response->getExpectedRaw()) {
+        return $body;
+      }
+      
       $decoded = json_decode($body, true);
       if ($decoded === null || $decoded === "") {
         $error = "Invalid json in service response: $body";
@@ -125,10 +156,10 @@ class Google_Http_REST
       } else if ($paramSpec['location'] == 'query') {
         if (isset($paramSpec['repeated']) && is_array($paramSpec['value'])) {
           foreach ($paramSpec['value'] as $value) {
-            $queryVars[] = $paramName . '=' . rawurlencode($value);
+            $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($value));
           }
         } else {
-          $queryVars[] = $paramName . '=' . rawurlencode($paramSpec['value']);
+          $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($paramSpec['value']));
         }
       }
     }

lib/google/src/Google/Http/Request.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * HTTP Request to be executed by IO classes. Upon execution, the
@@ -49,6 +51,7 @@ class Google_Http_Request
   protected $responseBody;
   
   protected $expectedClass;
+  protected $expectedRaw = false;
 
   public $accessKey;
 
@@ -80,7 +83,7 @@ class Google_Http_Request
    */
   public function setBaseComponent($baseComponent)
   {
-    $this->baseComponent = $baseComponent;
+    $this->baseComponent = rtrim($baseComponent, '/');
   }
   
   /**
@@ -127,7 +130,7 @@ class Google_Http_Request
     return $this->queryParams;
   }
 
-  /** 
+  /**
    * Set a new query parameter.
    * @param $key - string to set, does not need to be URL encoded
    * @param $value - string to set, does not need to be URL encoded
@@ -188,6 +191,31 @@ class Google_Http_Request
     return $this->expectedClass;
   }
 
+  /**
+   * Enable expected raw response
+   */
+  public function enableExpectedRaw()
+  {
+    $this->expectedRaw = true;
+  }
+
+  /**
+   * Disable expected raw response
+   */
+  public function disableExpectedRaw()
+  {
+    $this->expectedRaw = false;
+  }
+
+  /**
+   * Expected raw response or not.
+   * @return boolean expected raw response
+   */
+  public function getExpectedRaw()
+  {
+    return $this->expectedRaw;
+  }
+
   /**
    * @param array $headers The HTTP response headers
    * to be normalized.
@@ -413,7 +441,7 @@ class Google_Http_Request
   
   /**
    * Our own version of parse_str that allows for multiple variables
-   * with the same name. 
+   * with the same name.
    * @param $string - the query string to parse
    */
   private function parseQuery($string)
@@ -437,7 +465,7 @@ class Google_Http_Request
   
   /**
    * A version of build query that allows for multiple
-   * duplicate keys. 
+   * duplicate keys.
    * @param $parts array of key value pairs
    */
   private function buildQuery($parts)
@@ -455,7 +483,7 @@ class Google_Http_Request
     return implode('&', $return);
   }
   
-  /** 
+  /**
    * If we're POSTing and have no body to send, we can send the query
    * parameters in there, which avoids length issues with longer query
    * params.

lib/google/src/Google/IO/Abstract.php

@@ -19,7 +19,9 @@
  * Abstract IO base class
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 abstract class Google_IO_Abstract
 {
@@ -30,6 +32,17 @@ abstract class Google_IO_Abstract
     "HTTP/1.1 200 Connection established\r\n\r\n",
   );
   private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
+  private static $HOP_BY_HOP = array(
+    'connection' => true,
+    'keep-alive' => true,
+    'proxy-authenticate' => true,
+    'proxy-authorization' => true,
+    'te' => true,
+    'trailers' => true,
+    'transfer-encoding' => true,
+    'upgrade' => true
+  );
+
 
   /** @var Google_Client */
   protected $client;
@@ -44,9 +57,10 @@ abstract class Google_IO_Abstract
   }
 
   /**
-   * Executes a Google_Http_Request and returns the resulting populated Google_Http_Request
-   * @param Google_Http_Request $request
-   * @return Google_Http_Request $request
+   * Executes a Google_Http_Request
+   * @param Google_Http_Request $request the http request to be executed
+   * @return array containing response headers, body, and http code
+   * @throws Google_IO_Exception on curl or IO error
    */
   abstract public function executeRequest(Google_Http_Request $request);
 
@@ -55,13 +69,13 @@ abstract class Google_IO_Abstract
    * @param $options
    */
   abstract public function setOptions($options);
-  
+
   /**
    * Set the maximum request time in seconds.
    * @param $timeout in seconds
    */
   abstract public function setTimeout($timeout);
-  
+
   /**
    * Get the maximum request time in seconds.
    * @return timeout in seconds
@@ -96,12 +110,12 @@ abstract class Google_IO_Abstract
 
     return false;
   }
-  
+
   /**
    * Execute an HTTP Request
    *
-   * @param Google_HttpRequest $request the http request to be executed
-   * @return Google_HttpRequest http request with the response http code,
+   * @param Google_Http_Request $request the http request to be executed
+   * @return Google_Http_Request http request with the response http code,
    * response headers and response body filled in
    * @throws Google_IO_Exception on curl or IO error
    */
@@ -128,7 +142,7 @@ abstract class Google_IO_Abstract
     }
 
     if (!isset($responseHeaders['Date']) && !isset($responseHeaders['date'])) {
-      $responseHeaders['Date'] = date("r");
+      $responseHeaders['date'] = date("r");
     }
 
     $request->setResponseHttpCode($respHttpCode);
@@ -216,28 +230,24 @@ abstract class Google_IO_Abstract
 
   /**
    * Update a cached request, using the headers from the last response.
-   * @param Google_HttpRequest $cached A previously cached response.
+   * @param Google_Http_Request $cached A previously cached response.
    * @param mixed Associative array of response headers from the last request.
    */
   protected function updateCachedRequest($cached, $responseHeaders)
   {
-    if (isset($responseHeaders['connection'])) {
-      $hopByHop = array_merge(
-          self::$HOP_BY_HOP,
-          explode(
-              ',',
-              $responseHeaders['connection']
+    $hopByHop = self::$HOP_BY_HOP;
+    if (!empty($responseHeaders['connection'])) {
+      $connectionHeaders = array_map(
+          'strtolower',
+          array_filter(
+              array_map('trim', explode(',', $responseHeaders['connection']))
           )
       );
-
-      $endToEnd = array();
-      foreach ($hopByHop as $key) {
-        if (isset($responseHeaders[$key])) {
-          $endToEnd[$key] = $responseHeaders[$key];
-        }
-      }
-      $cached->setResponseHeaders($endToEnd);
+      $hopByHop += array_fill_keys($connectionHeaders, true);
     }
+
+    $endToEnd = array_diff_key($responseHeaders, $hopByHop);
+    $cached->setResponseHeaders($endToEnd);
   }
 
   /**
@@ -320,7 +330,7 @@ abstract class Google_IO_Abstract
       // Times will have colons in - so we just want the first match.
       $header_parts = explode(': ', $header, 2);
       if (count($header_parts) == 2) {
-        $headers[$header_parts[0]] = $header_parts[1];
+        $headers[strtolower($header_parts[0])] = $header_parts[1];
       }
     }
 

lib/google/src/Google/IO/Curl.php

@@ -21,7 +21,9 @@
  * @author Stuart Langley <[email protected]>
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 class Google_IO_Curl extends Google_IO_Abstract
 {
@@ -29,12 +31,23 @@ class Google_IO_Curl extends Google_IO_Abstract
   const NO_QUIRK_VERSION = 0x071E00;
 
   private $options = array();
+
+  public function __construct(Google_Client $client)
+  {
+    if (!extension_loaded('curl')) {
+      $error = 'The cURL IO handler requires the cURL extension to be enabled';
+      $client->getLogger()->critical($error);
+      throw new Google_IO_Exception($error);
+    }
+
+    parent::__construct($client);
+  }
+
   /**
    * Execute an HTTP Request
    *
-   * @param Google_HttpRequest $request the http request to be executed
-   * @return Google_HttpRequest http request with the response http code,
-   * response headers and response body filled in
+   * @param Google_Http_Request $request the http request to be executed
+   * @return array containing response headers, body, and http code
    * @throws Google_IO_Exception on curl or IO error
    */
   public function executeRequest(Google_Http_Request $request)
@@ -68,7 +81,12 @@ class Google_IO_Curl extends Google_IO_Abstract
     if ($request->canGzip()) {
       curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate');
     }
-
+    
+    $options = $this->client->getClassConfig('Google_IO_Curl', 'options');
+    if (is_array($options)) {
+      $this->setOptions($options);
+    }
+    
     foreach ($this->options as $key => $var) {
       curl_setopt($curl, $key, $var);
     }
@@ -90,9 +108,11 @@ class Google_IO_Curl extends Google_IO_Abstract
     $response = curl_exec($curl);
     if ($response === false) {
       $error = curl_error($curl);
+      $code = curl_errno($curl);
+      $map = $this->client->getClassConfig('Google_IO_Exception', 'retry_map');
 
       $this->client->getLogger()->error('cURL ' . $error);
-      throw new Google_IO_Exception($error);
+      throw new Google_IO_Exception($error, $code, null, $map);
     }
     $headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
 
@@ -128,7 +148,7 @@ class Google_IO_Curl extends Google_IO_Abstract
   {
     // Since this timeout is really for putting a bound on the time
     // we'll set them both to the same. If you need to specify a longer
-    // CURLOPT_TIMEOUT, or a tigher CONNECTTIMEOUT, the best thing to
+    // CURLOPT_TIMEOUT, or a higher CONNECTTIMEOUT, the best thing to
     // do is use the setOptions method for the values individually.
     $this->options[CURLOPT_CONNECTTIMEOUT] = $timeout;
     $this->options[CURLOPT_TIMEOUT] = $timeout;

lib/google/src/Google/IO/Exception.php

@@ -15,8 +15,55 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
-class Google_IO_Exception extends Google_Exception
+class Google_IO_Exception extends Google_Exception implements Google_Task_Retryable
 {
+  /**
+   * @var array $retryMap Map of errors with retry counts.
+   */
+  private $retryMap = array();
+
+  /**
+   * Creates a new IO exception with an optional retry map.
+   *
+   * @param string $message
+   * @param int $code
+   * @param Exception|null $previous
+   * @param array|null $retryMap Map of errors with retry counts.
+   */
+  public function __construct(
+      $message,
+      $code = 0,
+      Exception $previous = null,
+      array $retryMap = null
+  ) {
+    if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+      parent::__construct($message, $code, $previous);
+    } else {
+      parent::__construct($message, $code);
+    }
+
+    if (is_array($retryMap)) {
+      $this->retryMap = $retryMap;
+    }
+  }
+
+  /**
+   * Gets the number of times the associated task can be retried.
+   *
+   * NOTE: -1 is returned if the task can be retried indefinitely
+   *
+   * @return integer
+   */
+  public function allowedRetries()
+  {
+    if (isset($this->retryMap[$this->code])) {
+      return $this->retryMap[$this->code];
+    }
+
+    return 0;
+  }
 }

lib/google/src/Google/IO/Stream.php

@@ -21,7 +21,9 @@
  * @author Stuart Langley <[email protected]>
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 class Google_IO_Stream extends Google_IO_Abstract
 {
@@ -40,12 +42,23 @@ class Google_IO_Stream extends Google_IO_Abstract
     "verify_peer" => true,
   );
 
+  public function __construct(Google_Client $client)
+  {
+    if (!ini_get('allow_url_fopen')) {
+      $error = 'The stream IO handler requires the allow_url_fopen runtime ' .
+               'configuration to be enabled';
+      $client->getLogger()->critical($error);
+      throw new Google_IO_Exception($error);
+    }
+
+    parent::__construct($client);
+  }
+
   /**
    * Execute an HTTP Request
    *
-   * @param Google_HttpRequest $request the http request to be executed
-   * @return Google_HttpRequest http request with the response http code,
-   * response headers and response body filled in
+   * @param Google_Http_Request $request the http request to be executed
+   * @return array containing response headers, body, and http code
    * @throws Google_IO_Exception on curl or IO error
    */
   public function executeRequest(Google_Http_Request $request)

lib/google/src/Google/Logger/Abstract.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * Abstract logging class based on the PSR-3 standard.

lib/google/src/Google/Logger/Exception.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 class Google_Logger_Exception extends Google_Exception
 {

lib/google/src/Google/Logger/File.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * File logging class based on the PSR-3 standard.

lib/google/src/Google/Logger/Null.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * Null logger based on the PSR-3 standard.

lib/google/src/Google/Logger/Psr.php

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
 /**
  * Psr logging class based on the PSR-3 standard.

lib/google/src/Google/Model.php

@@ -20,11 +20,14 @@
  * from a given json schema.
  * http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5
  *
- * @author Chirag Shah <[email protected]>
- *
  */
 class Google_Model implements ArrayAccess
 {
+  /**
+   * If you need to specify a NULL JSON value, use Google_Model::NULL_VALUE
+   * instead - it will be replaced when converting to JSON with a real null.
+   */
+  const NULL_VALUE = "{}gapi-php-null";
   protected $internal_gapi_mappings = array();
   protected $modelData = array();
   protected $processed = array();
@@ -93,7 +96,7 @@ class Google_Model implements ArrayAccess
    */
   protected function mapTypes($array)
   {
-    // Hard initilise simple types, lazy load more complex ones.
+    // Hard initialise simple types, lazy load more complex ones.
     foreach ($array as $key => $val) {
       if ( !property_exists($this, $this->keyType($key)) &&
         property_exists($this, $key)) {
@@ -132,7 +135,7 @@ class Google_Model implements ArrayAccess
     foreach ($this->modelData as $key => $val) {
       $result = $this->getSimpleValue($val);
       if ($result !== null) {
-        $object->$key = $result;
+        $object->$key = $this->nullPlaceholderCheck($result);
       }
     }
 
@@ -144,7 +147,7 @@ class Google_Model implements ArrayAccess
       $result = $this->getSimpleValue($this->$name);
       if ($result !== null) {
         $name = $this->getMappedName($name);
-        $object->$name = $result;
+        $object->$name = $this->nullPlaceholderCheck($result);
       }
     }
 
@@ -165,13 +168,24 @@ class Google_Model implements ArrayAccess
         $a_value = $this->getSimpleValue($a_value);
         if ($a_value !== null) {
           $key = $this->getMappedName($key);
-          $return[$key] = $a_value;
+          $return[$key] = $this->nullPlaceholderCheck($a_value);
         }
       }
       return $return;
     }
     return $value;
   }
+  
+  /**
+   * Check whether the value is the null placeholder and return true null.
+   */
+  private function nullPlaceholderCheck($value)
+  {
+    if ($value === self::NULL_VALUE) {
+      return null;
+    }
+    return $value;
+  }
 
   /**
    * If there is an internal name mapping, use that.

lib/google/src/Google/Service.php

@@ -17,6 +17,8 @@
 
 class Google_Service
 {
+  public $batchPath;
+  public $rootUrl;
   public $version;
   public $servicePath;
   public $availableScopes;
@@ -36,4 +38,19 @@ class Google_Service
   {
     return $this->client;
   }
+
+  /**
+   * Create a new HTTP Batch handler for this service
+   *
+   * @return Google_Http_Batch
+   */
+  public function createBatch()
+  {
+    return new Google_Http_Batch(
+        $this->client,
+        false,
+        $this->rootUrl,
+        $this->batchPath
+    );
+  }
 }

lib/google/src/Google/Service/AdExchangeBuyer.php

@@ -37,6 +37,7 @@ class Google_Service_AdExchangeBuyer extends Google_Service
 
   public $accounts;
   public $billingInfo;
+  public $budget;
   public $creatives;
   public $directDeals;
   public $performanceReport;
@@ -51,6 +52,7 @@ class Google_Service_AdExchangeBuyer extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'adexchangebuyer/v1.3/';
     $this->version = 'v1.3';
     $this->serviceName = 'adexchangebuyer';
@@ -123,6 +125,61 @@ class Google_Service_AdExchangeBuyer extends Google_Service
           )
         )
     );
+    $this->budget = new Google_Service_AdExchangeBuyer_Budget_Resource(
+        $this,
+        $this->serviceName,
+        'budget',
+        array(
+          'methods' => array(
+            'get' => array(
+              'path' => 'billinginfo/{accountId}/{billingId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'accountId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'billingId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'patch' => array(
+              'path' => 'billinginfo/{accountId}/{billingId}',
+              'httpMethod' => 'PATCH',
+              'parameters' => array(
+                'accountId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'billingId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'update' => array(
+              'path' => 'billinginfo/{accountId}/{billingId}',
+              'httpMethod' => 'PUT',
+              'parameters' => array(
+                'accountId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'billingId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
     $this->creatives = new Google_Service_AdExchangeBuyer_Creatives_Resource(
         $this,
         $this->serviceName,
@@ -446,6 +503,74 @@ class Google_Service_AdExchangeBuyer_BillingInfo_Resource extends Google_Service
   }
 }
 
+/**
+ * The "budget" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
+ *   $budget = $adexchangebuyerService->budget;
+ *  </code>
+ */
+class Google_Service_AdExchangeBuyer_Budget_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Returns the budget information for the adgroup specified by the accountId and
+   * billingId. (budget.get)
+   *
+   * @param string $accountId The account id to get the budget information for.
+   * @param string $billingId The billing id to get the budget information for.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_AdExchangeBuyer_Budget
+   */
+  public function get($accountId, $billingId, $optParams = array())
+  {
+    $params = array('accountId' => $accountId, 'billingId' => $billingId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Budget");
+  }
+
+  /**
+   * Updates the budget amount for the budget of the adgroup specified by the
+   * accountId and billingId, with the budget amount in the request. This method
+   * supports patch semantics. (budget.patch)
+   *
+   * @param string $accountId The account id associated with the budget being
+   * updated.
+   * @param string $billingId The billing id associated with the budget being
+   * updated.
+   * @param Google_Budget $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_AdExchangeBuyer_Budget
+   */
+  public function patch($accountId, $billingId, Google_Service_AdExchangeBuyer_Budget $postBody, $optParams = array())
+  {
+    $params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Budget");
+  }
+
+  /**
+   * Updates the budget amount for the budget of the adgroup specified by the
+   * accountId and billingId, with the budget amount in the request.
+   * (budget.update)
+   *
+   * @param string $accountId The account id associated with the budget being
+   * updated.
+   * @param string $billingId The billing id associated with the budget being
+   * updated.
+   * @param Google_Budget $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_AdExchangeBuyer_Budget
+   */
+  public function update($accountId, $billingId, Google_Service_AdExchangeBuyer_Budget $postBody, $optParams = array())
+  {
+    $params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Budget");
+  }
+}
+
 /**
  * The "creatives" collection of methods.
  * Typical usage is:
@@ -920,6 +1045,68 @@ class Google_Service_AdExchangeBuyer_BillingInfoList extends Google_Collection
   }
 }
 
+class Google_Service_AdExchangeBuyer_Budget extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $accountId;
+  public $billingId;
+  public $budgetAmount;
+  public $currencyCode;
+  public $id;
+  public $kind;
+
+
+  public function setAccountId($accountId)
+  {
+    $this->accountId = $accountId;
+  }
+  public function getAccountId()
+  {
+    return $this->accountId;
+  }
+  public function setBillingId($billingId)
+  {
+    $this->billingId = $billingId;
+  }
+  public function getBillingId()
+  {
+    return $this->billingId;
+  }
+  public function setBudgetAmount($budgetAmount)
+  {
+    $this->budgetAmount = $budgetAmount;
+  }
+  public function getBudgetAmount()
+  {
+    return $this->budgetAmount;
+  }
+  public function setCurrencyCode($currencyCode)
+  {
+    $this->currencyCode = $currencyCode;
+  }
+  public function getCurrencyCode()
+  {
+    return $this->currencyCode;
+  }
+  public function setId($id)
+  {
+    $this->id = $id;
+  }
+  public function getId()
+  {
+    return $this->id;
+  }
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+}
+
 class Google_Service_AdExchangeBuyer_Creative extends Google_Collection
 {
   protected $collection_key = 'vendorType';
@@ -1407,10 +1594,14 @@ class Google_Service_AdExchangeBuyer_PerformanceReport extends Google_Collection
   protected $collection_key = 'hostedMatchStatusRate';
   protected $internal_gapi_mappings = array(
   );
+  public $bidRate;
+  public $bidRequestRate;
   public $calloutStatusRate;
   public $cookieMatcherStatusRate;
   public $creativeStatusRate;
+  public $filteredBidRate;
   public $hostedMatchStatusRate;
+  public $inventoryMatchRate;
   public $kind;
   public $latency50thPercentile;
   public $latency85thPercentile;
@@ -1422,9 +1613,27 @@ class Google_Service_AdExchangeBuyer_PerformanceReport extends Google_Collection
   public $quotaConfiguredLimit;
   public $quotaThrottledLimit;
   public $region;
+  public $successfulRequestRate;
   public $timestamp;
+  public $unsuccessfulRequestRate;
 
 
+  public function setBidRate($bidRate)
+  {
+    $this->bidRate = $bidRate;
+  }
+  public function getBidRate()
+  {
+    return $this->bidRate;
+  }
+  public function setBidRequestRate($bidRequestRate)
+  {
+    $this->bidRequestRate = $bidRequestRate;
+  }
+  public function getBidRequestRate()
+  {
+    return $this->bidRequestRate;
+  }
   public function setCalloutStatusRate($calloutStatusRate)
   {
     $this->calloutStatusRate = $calloutStatusRate;
@@ -1449,6 +1658,14 @@ class Google_Service_AdExchangeBuyer_PerformanceReport extends Google_Collection
   {
     return $this->creativeStatusRate;
   }
+  public function setFilteredBidRate($filteredBidRate)
+  {
+    $this->filteredBidRate = $filteredBidRate;
+  }
+  public function getFilteredBidRate()
+  {
+    return $this->filteredBidRate;
+  }
   public function setHostedMatchStatusRate($hostedMatchStatusRate)
   {
     $this->hostedMatchStatusRate = $hostedMatchStatusRate;
@@ -1457,6 +1674,14 @@ class Google_Service_AdExchangeBuyer_PerformanceReport extends Google_Collection
   {
     return $this->hostedMatchStatusRate;
   }
+  public function setInventoryMatchRate($inventoryMatchRate)
+  {
+    $this->inventoryMatchRate = $inventoryMatchRate;
+  }
+  public function getInventoryMatchRate()
+  {
+    return $this->inventoryMatchRate;
+  }
   public function setKind($kind)
   {
     $this->kind = $kind;
@@ -1545,6 +1770,14 @@ class Google_Service_AdExchangeBuyer_PerformanceReport extends Google_Collection
   {
     return $this->region;
   }
+  public function setSuccessfulRequestRate($successfulRequestRate)
+  {
+    $this->successfulRequestRate = $successfulRequestRate;
+  }
+  public function getSuccessfulRequestRate()
+  {
+    return $this->successfulRequestRate;
+  }
   public function setTimestamp($timestamp)
   {
     $this->timestamp = $timestamp;
@@ -1553,6 +1786,14 @@ class Google_Service_AdExchangeBuyer_PerformanceReport extends Google_Collection
   {
     return $this->timestamp;
   }
+  public function setUnsuccessfulRequestRate($unsuccessfulRequestRate)
+  {
+    $this->unsuccessfulRequestRate = $unsuccessfulRequestRate;
+  }
+  public function getUnsuccessfulRequestRate()
+  {
+    return $this->unsuccessfulRequestRate;
+  }
 }
 
 class Google_Service_AdExchangeBuyer_PerformanceReportList extends Google_Collection

lib/google/src/Google/Service/AdExchangeSeller.php

@@ -58,6 +58,7 @@ class Google_Service_AdExchangeSeller extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'adexchangeseller/v2.0/';
     $this->version = 'v2.0';
     $this->serviceName = 'adexchangeseller';

lib/google/src/Google/Service/AdSense.php

@@ -73,6 +73,7 @@ class Google_Service_AdSense extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'adsense/v1.4/';
     $this->version = 'v1.4';
     $this->serviceName = 'adsense';

lib/google/src/Google/Service/AdSenseHost.php

@@ -54,6 +54,7 @@ class Google_Service_AdSenseHost extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'adsensehost/v4.1/';
     $this->version = 'v4.1';
     $this->serviceName = 'adsensehost';

lib/google/src/Google/Service/Admin.php

@@ -45,6 +45,7 @@ class Google_Service_Admin extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'email/v2/users/';
     $this->version = 'email_migration_v2';
     $this->serviceName = 'admin';

lib/google/src/Google/Service/AndroidPublisher.php

@@ -30,7 +30,7 @@
  */
 class Google_Service_AndroidPublisher extends Google_Service
 {
-  /** View and manage your Google Play Android Developer account. */
+  /** View and manage your Google Play Developer account. */
   const ANDROIDPUBLISHER =
       "https://www.googleapis.com/auth/androidpublisher";
 
@@ -43,6 +43,7 @@ class Google_Service_AndroidPublisher extends Google_Service
   public $edits_listings;
   public $edits_testers;
   public $edits_tracks;
+  public $entitlements;
   public $inappproducts;
   public $purchases_products;
   public $purchases_subscriptions;
@@ -56,6 +57,7 @@ class Google_Service_AndroidPublisher extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'androidpublisher/v2/applications/';
     $this->version = 'v2';
     $this->serviceName = 'androidpublisher';
@@ -296,7 +298,22 @@ class Google_Service_AndroidPublisher extends Google_Service
         'apks',
         array(
           'methods' => array(
-            'list' => array(
+            'addexternallyhosted' => array(
+              'path' => '{packageName}/edits/{editId}/apks/externallyHosted',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'packageName' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'editId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
               'path' => '{packageName}/edits/{editId}/apks',
               'httpMethod' => 'GET',
               'parameters' => array(
@@ -885,6 +902,42 @@ class Google_Service_AndroidPublisher extends Google_Service
           )
         )
     );
+    $this->entitlements = new Google_Service_AndroidPublisher_Entitlements_Resource(
+        $this,
+        $this->serviceName,
+        'entitlements',
+        array(
+          'methods' => array(
+            'list' => array(
+              'path' => '{packageName}/entitlements',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'packageName' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'token' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'startIndex' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+                'maxResults' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+                'productId' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),
+          )
+        )
+    );
     $this->inappproducts = new Google_Service_AndroidPublisher_Inappproducts_Resource(
         $this,
         $this->serviceName,
@@ -1391,6 +1444,26 @@ class Google_Service_AndroidPublisher_EditsApklistings_Resource extends Google_S
 class Google_Service_AndroidPublisher_EditsApks_Resource extends Google_Service_Resource
 {
 
+  /**
+   * Creates a new APK without uploading the APK itself to Google Play, instead
+   * hosting the APK at a specified URL. This function is only available to
+   * enterprises using Google Play for Work whose application is configured to
+   * restrict distribution to the enterprise domain. (apks.addexternallyhosted)
+   *
+   * @param string $packageName Unique identifier for the Android app that is
+   * being updated; for example, "com.spiffygame".
+   * @param string $editId Unique identifier for this edit.
+   * @param Google_ApksAddExternallyHostedRequest $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_AndroidPublisher_ApksAddExternallyHostedResponse
+   */
+  public function addexternallyhosted($packageName, $editId, Google_Service_AndroidPublisher_ApksAddExternallyHostedRequest $postBody, $optParams = array())
+  {
+    $params = array('packageName' => $packageName, 'editId' => $editId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('addexternallyhosted', array($params), "Google_Service_AndroidPublisher_ApksAddExternallyHostedResponse");
+  }
+
   /**
    * (apks.listEditsApks)
    *
@@ -1907,8 +1980,10 @@ class Google_Service_AndroidPublisher_EditsTracks_Resource extends Google_Servic
   }
 
   /**
-   * Updates the track configuration for the specified track type. This method
-   * supports patch semantics. (tracks.patch)
+   * Updates the track configuration for the specified track type. When halted,
+   * the rollout track cannot be updated without adding new APKs, and adding new
+   * APKs will cause it to resume. This method supports patch semantics.
+   * (tracks.patch)
    *
    * @param string $packageName Unique identifier for the Android app that is
    * being updated; for example, "com.spiffygame".
@@ -1926,7 +2001,9 @@ class Google_Service_AndroidPublisher_EditsTracks_Resource extends Google_Servic
   }
 
   /**
-   * Updates the track configuration for the specified track type. (tracks.update)
+   * Updates the track configuration for the specified track type. When halted,
+   * the rollout track cannot be updated without adding new APKs, and adding new
+   * APKs will cause it to resume. (tracks.update)
    *
    * @param string $packageName Unique identifier for the Android app that is
    * being updated; for example, "com.spiffygame".
@@ -1944,6 +2021,40 @@ class Google_Service_AndroidPublisher_EditsTracks_Resource extends Google_Servic
   }
 }
 
+/**
+ * The "entitlements" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
+ *   $entitlements = $androidpublisherService->entitlements;
+ *  </code>
+ */
+class Google_Service_AndroidPublisher_Entitlements_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Lists the user's current inapp item or subscription entitlements
+   * (entitlements.listEntitlements)
+   *
+   * @param string $packageName The package name of the application the inapp
+   * product was sold in (for example, 'com.some.thing').
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string token
+   * @opt_param string startIndex
+   * @opt_param string maxResults
+   * @opt_param string productId The product id of the inapp product (for example,
+   * 'sku1'). This can be used to restrict the result set.
+   * @return Google_Service_AndroidPublisher_EntitlementsListResponse
+   */
+  public function listEntitlements($packageName, $optParams = array())
+  {
+    $params = array('packageName' => $packageName);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_AndroidPublisher_EntitlementsListResponse");
+  }
+}
+
 /**
  * The "inappproducts" collection of methods.
  * Typical usage is:
@@ -2341,6 +2452,42 @@ class Google_Service_AndroidPublisher_ApkListingsListResponse extends Google_Col
   }
 }
 
+class Google_Service_AndroidPublisher_ApksAddExternallyHostedRequest extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  protected $externallyHostedApkType = 'Google_Service_AndroidPublisher_ExternallyHostedApk';
+  protected $externallyHostedApkDataType = '';
+
+
+  public function setExternallyHostedApk(Google_Service_AndroidPublisher_ExternallyHostedApk $externallyHostedApk)
+  {
+    $this->externallyHostedApk = $externallyHostedApk;
+  }
+  public function getExternallyHostedApk()
+  {
+    return $this->externallyHostedApk;
+  }
+}
+
+class Google_Service_AndroidPublisher_ApksAddExternallyHostedResponse extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  protected $externallyHostedApkType = 'Google_Service_AndroidPublisher_ExternallyHostedApk';
+  protected $externallyHostedApkDataType = '';
+
+
+  public function setExternallyHostedApk(Google_Service_AndroidPublisher_ExternallyHostedApk $externallyHostedApk)
+  {
+    $this->externallyHostedApk = $externallyHostedApk;
+  }
+  public function getExternallyHostedApk()
+  {
+    return $this->externallyHostedApk;
+  }
+}
+
 class Google_Service_AndroidPublisher_ApksListResponse extends Google_Collection
 {
   protected $collection_key = 'apks';
@@ -2439,6 +2586,89 @@ class Google_Service_AndroidPublisher_AppEdit extends Google_Model
   }
 }
 
+class Google_Service_AndroidPublisher_Entitlement extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $kind;
+  public $productId;
+  public $productType;
+  public $token;
+
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+  public function setProductId($productId)
+  {
+    $this->productId = $productId;
+  }
+  public function getProductId()
+  {
+    return $this->productId;
+  }
+  public function setProductType($productType)
+  {
+    $this->productType = $productType;
+  }
+  public function getProductType()
+  {
+    return $this->productType;
+  }
+  public function setToken($token)
+  {
+    $this->token = $token;
+  }
+  public function getToken()
+  {
+    return $this->token;
+  }
+}
+
+class Google_Service_AndroidPublisher_EntitlementsListResponse extends Google_Collection
+{
+  protected $collection_key = 'resources';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $pageInfoType = 'Google_Service_AndroidPublisher_PageInfo';
+  protected $pageInfoDataType = '';
+  protected $resourcesType = 'Google_Service_AndroidPublisher_Entitlement';
+  protected $resourcesDataType = 'array';
+  protected $tokenPaginationType = 'Google_Service_AndroidPublisher_TokenPagination';
+  protected $tokenPaginationDataType = '';
+
+
+  public function setPageInfo(Google_Service_AndroidPublisher_PageInfo $pageInfo)
+  {
+    $this->pageInfo = $pageInfo;
+  }
+  public function getPageInfo()
+  {
+    return $this->pageInfo;
+  }
+  public function setResources($resources)
+  {
+    $this->resources = $resources;
+  }
+  public function getResources()
+  {
+    return $this->resources;
+  }
+  public function setTokenPagination(Google_Service_AndroidPublisher_TokenPagination $tokenPagination)
+  {
+    $this->tokenPagination = $tokenPagination;
+  }
+  public function getTokenPagination()
+  {
+    return $this->tokenPagination;
+  }
+}
+
 class Google_Service_AndroidPublisher_ExpansionFile extends Google_Model
 {
   protected $internal_gapi_mappings = array(
@@ -2483,6 +2713,177 @@ class Google_Service_AndroidPublisher_ExpansionFilesUploadResponse extends Googl
   }
 }
 
+class Google_Service_AndroidPublisher_ExternallyHostedApk extends Google_Collection
+{
+  protected $collection_key = 'usesPermissions';
+  protected $internal_gapi_mappings = array(
+  );
+  public $applicationLabel;
+  public $certificateBase64s;
+  public $externallyHostedUrl;
+  public $fileSha1Base64;
+  public $fileSha256Base64;
+  public $fileSize;
+  public $iconBase64;
+  public $maximumSdk;
+  public $minimumSdk;
+  public $nativeCodes;
+  public $packageName;
+  public $usesFeatures;
+  protected $usesPermissionsType = 'Google_Service_AndroidPublisher_ExternallyHostedApkUsesPermission';
+  protected $usesPermissionsDataType = 'array';
+  public $versionCode;
+  public $versionName;
+
+
+  public function setApplicationLabel($applicationLabel)
+  {
+    $this->applicationLabel = $applicationLabel;
+  }
+  public function getApplicationLabel()
+  {
+    return $this->applicationLabel;
+  }
+  public function setCertificateBase64s($certificateBase64s)
+  {
+    $this->certificateBase64s = $certificateBase64s;
+  }
+  public function getCertificateBase64s()
+  {
+    return $this->certificateBase64s;
+  }
+  public function setExternallyHostedUrl($externallyHostedUrl)
+  {
+    $this->externallyHostedUrl = $externallyHostedUrl;
+  }
+  public function getExternallyHostedUrl()
+  {
+    return $this->externallyHostedUrl;
+  }
+  public function setFileSha1Base64($fileSha1Base64)
+  {
+    $this->fileSha1Base64 = $fileSha1Base64;
+  }
+  public function getFileSha1Base64()
+  {
+    return $this->fileSha1Base64;
+  }
+  public function setFileSha256Base64($fileSha256Base64)
+  {
+    $this->fileSha256Base64 = $fileSha256Base64;
+  }
+  public function getFileSha256Base64()
+  {
+    return $this->fileSha256Base64;
+  }
+  public function setFileSize($fileSize)
+  {
+    $this->fileSize = $fileSize;
+  }
+  public function getFileSize()
+  {
+    return $this->fileSize;
+  }
+  public function setIconBase64($iconBase64)
+  {
+    $this->iconBase64 = $iconBase64;
+  }
+  public function getIconBase64()
+  {
+    return $this->iconBase64;
+  }
+  public function setMaximumSdk($maximumSdk)
+  {
+    $this->maximumSdk = $maximumSdk;
+  }
+  public function getMaximumSdk()
+  {
+    return $this->maximumSdk;
+  }
+  public function setMinimumSdk($minimumSdk)
+  {
+    $this->minimumSdk = $minimumSdk;
+  }
+  public function getMinimumSdk()
+  {
+    return $this->minimumSdk;
+  }
+  public function setNativeCodes($nativeCodes)
+  {
+    $this->nativeCodes = $nativeCodes;
+  }
+  public function getNativeCodes()
+  {
+    return $this->nativeCodes;
+  }
+  public function setPackageName($packageName)
+  {
+    $this->packageName = $packageName;
+  }
+  public function getPackageName()
+  {
+    return $this->packageName;
+  }
+  public function setUsesFeatures($usesFeatures)
+  {
+    $this->usesFeatures = $usesFeatures;
+  }
+  public function getUsesFeatures()
+  {
+    return $this->usesFeatures;
+  }
+  public function setUsesPermissions($usesPermissions)
+  {
+    $this->usesPermissions = $usesPermissions;
+  }
+  public function getUsesPermissions()
+  {
+    return $this->usesPermissions;
+  }
+  public function setVersionCode($versionCode)
+  {
+    $this->versionCode = $versionCode;
+  }
+  public function getVersionCode()
+  {
+    return $this->versionCode;
+  }
+  public function setVersionName($versionName)
+  {
+    $this->versionName = $versionName;
+  }
+  public function getVersionName()
+  {
+    return $this->versionName;
+  }
+}
+
+class Google_Service_AndroidPublisher_ExternallyHostedApkUsesPermission extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $maxSdkVersion;
+  public $name;
+
+
+  public function setMaxSdkVersion($maxSdkVersion)
+  {
+    $this->maxSdkVersion = $maxSdkVersion;
+  }
+  public function getMaxSdkVersion()
+  {
+    return $this->maxSdkVersion;
+  }
+  public function setName($name)
+  {
+    $this->name = $name;
+  }
+  public function getName()
+  {
+    return $this->name;
+  }
+}
+
 class Google_Service_AndroidPublisher_Image extends Google_Model
 {
   protected $internal_gapi_mappings = array(

lib/google/src/Google/Service/AppState.php

@@ -45,6 +45,7 @@ class Google_Service_AppState extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'appstate/v1/';
     $this->version = 'v1';
     $this->serviceName = 'appstate';

lib/google/src/Google/Service/Appsactivity.php

@@ -33,13 +33,16 @@ class Google_Service_Appsactivity extends Google_Service
   /** View the activity history of your Google Apps. */
   const ACTIVITY =
       "https://www.googleapis.com/auth/activity";
-  /** View and manage the files and documents in your Google Drive. */
+  /** View and manage the files in your Google Drive. */
   const DRIVE =
       "https://www.googleapis.com/auth/drive";
-  /** View metadata for files and documents in your Google Drive. */
+  /** View and manage metadata of files in your Google Drive. */
+  const DRIVE_METADATA =
+      "https://www.googleapis.com/auth/drive.metadata";
+  /** View metadata for files in your Google Drive. */
   const DRIVE_METADATA_READONLY =
       "https://www.googleapis.com/auth/drive.metadata.readonly";
-  /** View the files and documents in your Google Drive. */
+  /** View the files in your Google Drive. */
   const DRIVE_READONLY =
       "https://www.googleapis.com/auth/drive.readonly";
 
@@ -54,6 +57,7 @@ class Google_Service_Appsactivity extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'appsactivity/v1/';
     $this->version = 'v1';
     $this->serviceName = 'appsactivity';

lib/google/src/Google/Service/Autoscaler.php

@@ -51,6 +51,7 @@ class Google_Service_Autoscaler extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'autoscaler/v1beta2/';
     $this->version = 'v1beta2';
     $this->serviceName = 'autoscaler';

lib/google/src/Google/Service/Bigquery.php

@@ -23,7 +23,7 @@
  *
  * <p>
  * For more information about this service, see the API
- * <a href="https://developers.google.com/bigquery/docs/overview" target="_blank">Documentation</a>
+ * <a href="https://cloud.google.com/bigquery/" target="_blank">Documentation</a>
  * </p>
  *
  * @author Google, Inc.
@@ -39,6 +39,9 @@ class Google_Service_Bigquery extends Google_Service
   /** View and manage your data across Google Cloud Platform services. */
   const CLOUD_PLATFORM =
       "https://www.googleapis.com/auth/cloud-platform";
+  /** View your data across Google Cloud Platform services. */
+  const CLOUD_PLATFORM_READ_ONLY =
+      "https://www.googleapis.com/auth/cloud-platform.read-only";
   /** Manage your data and permissions in Google Cloud Storage. */
   const DEVSTORAGE_FULL_CONTROL =
       "https://www.googleapis.com/auth/devstorage.full_control";
@@ -64,6 +67,7 @@ class Google_Service_Bigquery extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'bigquery/v2/';
     $this->version = 'v2';
     $this->serviceName = 'bigquery';
@@ -180,7 +184,22 @@ class Google_Service_Bigquery extends Google_Service
         'jobs',
         array(
           'methods' => array(
-            'get' => array(
+            'cancel' => array(
+              'path' => 'project/{projectId}/jobs/{jobId}/cancel',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'jobId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'get' => array(
               'path' => 'projects/{projectId}/jobs/{jobId}',
               'httpMethod' => 'GET',
               'parameters' => array(
@@ -561,9 +580,8 @@ class Google_Service_Bigquery_Datasets_Resource extends Google_Service_Resource
   }
 
   /**
-   * Lists all the datasets in the specified project to which the caller has read
-   * access; however, a project owner can list (but not necessarily get) all
-   * datasets in his project. (datasets.listDatasets)
+   * Lists all datasets in the specified project to which you have been granted
+   * the READER dataset role. (datasets.listDatasets)
    *
    * @param string $projectId Project ID of the datasets to be listed
    * @param array $optParams Optional parameters.
@@ -631,7 +649,26 @@ class Google_Service_Bigquery_Jobs_Resource extends Google_Service_Resource
 {
 
   /**
-   * Retrieves the specified job by ID. (jobs.get)
+   * Requests that a job be cancelled. This call will return immediately, and the
+   * client will need to poll for the job status to see if the cancel completed
+   * successfully. Cancelled jobs may still incur costs. (jobs.cancel)
+   *
+   * @param string $projectId Project ID of the job to cancel
+   * @param string $jobId Job ID of the job to cancel
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Bigquery_JobCancelResponse
+   */
+  public function cancel($projectId, $jobId, $optParams = array())
+  {
+    $params = array('projectId' => $projectId, 'jobId' => $jobId);
+    $params = array_merge($params, $optParams);
+    return $this->call('cancel', array($params), "Google_Service_Bigquery_JobCancelResponse");
+  }
+
+  /**
+   * Returns information about a specific job. Job information is available for a
+   * six month period after creation. Requires that you're the person who ran the
+   * job, or have the Is Owner project role. (jobs.get)
    *
    * @param string $projectId Project ID of the requested job
    * @param string $jobId Job ID of the requested job
@@ -653,9 +690,9 @@ class Google_Service_Bigquery_Jobs_Resource extends Google_Service_Resource
    * @param array $optParams Optional parameters.
    *
    * @opt_param string timeoutMs How long to wait for the query to complete, in
-   * milliseconds, before returning. Default is to return immediately. If the
-   * timeout passes before the job completes, the request will fail with a TIMEOUT
-   * error
+   * milliseconds, before returning. Default is 10 seconds. If the timeout passes
+   * before the job completes, the 'jobComplete' field in the response will be
+   * false
    * @opt_param string maxResults Maximum number of results to read
    * @opt_param string pageToken Page token, returned by a previous call, to
    * request the next page of results
@@ -670,7 +707,8 @@ class Google_Service_Bigquery_Jobs_Resource extends Google_Service_Resource
   }
 
   /**
-   * Starts a new asynchronous job. (jobs.insert)
+   * Starts a new asynchronous job. Requires the Can View project role.
+   * (jobs.insert)
    *
    * @param string $projectId Project ID of the project that will be billed for
    * the job
@@ -686,9 +724,11 @@ class Google_Service_Bigquery_Jobs_Resource extends Google_Service_Resource
   }
 
   /**
-   * Lists all the Jobs in the specified project that were started by the user.
-   * The job list returns in reverse chronological order of when the jobs were
-   * created, starting with the most recent job created. (jobs.listJobs)
+   * Lists all jobs that you started in the specified project. Job information is
+   * available for a six month period after creation. The job list is sorted in
+   * reverse chronological order, by job creation time. Requires the Can View
+   * project role, or the Is Owner project role if you set the allUsers property.
+   * (jobs.listJobs)
    *
    * @param string $projectId Project ID of the jobs to list
    * @param array $optParams Optional parameters.
@@ -739,7 +779,7 @@ class Google_Service_Bigquery_Projects_Resource extends Google_Service_Resource
 {
 
   /**
-   * Lists the projects to which you have at least read access.
+   * Lists all projects to which you have been granted any project role.
    * (projects.listProjects)
    *
    * @param array $optParams Optional parameters.
@@ -770,7 +810,7 @@ class Google_Service_Bigquery_Tabledata_Resource extends Google_Service_Resource
 
   /**
    * Streams data into BigQuery one record at a time without needing to run a load
-   * job. (tabledata.insertAll)
+   * job. Requires the WRITER dataset role. (tabledata.insertAll)
    *
    * @param string $projectId Project ID of the destination table.
    * @param string $datasetId Dataset ID of the destination table.
@@ -787,7 +827,8 @@ class Google_Service_Bigquery_Tabledata_Resource extends Google_Service_Resource
   }
 
   /**
-   * Retrieves table data from a specified set of rows. (tabledata.listTabledata)
+   * Retrieves table data from a specified set of rows. Requires the READER
+   * dataset role. (tabledata.listTabledata)
    *
    * @param string $projectId Project ID of the table to read
    * @param string $datasetId Dataset ID of the table to read
@@ -870,7 +911,8 @@ class Google_Service_Bigquery_Tables_Resource extends Google_Service_Resource
   }
 
   /**
-   * Lists all tables in the specified dataset. (tables.listTables)
+   * Lists all tables in the specified dataset. Requires the READER dataset role.
+   * (tables.listTables)
    *
    * @param string $projectId Project ID of the tables to list
    * @param string $datasetId Dataset ID of the tables to list
@@ -931,6 +973,68 @@ class Google_Service_Bigquery_Tables_Resource extends Google_Service_Resource
 
 
 
+class Google_Service_Bigquery_CsvOptions extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $allowJaggedRows;
+  public $allowQuotedNewlines;
+  public $encoding;
+  public $fieldDelimiter;
+  public $quote;
+  public $skipLeadingRows;
+
+
+  public function setAllowJaggedRows($allowJaggedRows)
+  {
+    $this->allowJaggedRows = $allowJaggedRows;
+  }
+  public function getAllowJaggedRows()
+  {
+    return $this->allowJaggedRows;
+  }
+  public function setAllowQuotedNewlines($allowQuotedNewlines)
+  {
+    $this->allowQuotedNewlines = $allowQuotedNewlines;
+  }
+  public function getAllowQuotedNewlines()
+  {
+    return $this->allowQuotedNewlines;
+  }
+  public function setEncoding($encoding)
+  {
+    $this->encoding = $encoding;
+  }
+  public function getEncoding()
+  {
+    return $this->encoding;
+  }
+  public function setFieldDelimiter($fieldDelimiter)
+  {
+    $this->fieldDelimiter = $fieldDelimiter;
+  }
+  public function getFieldDelimiter()
+  {
+    return $this->fieldDelimiter;
+  }
+  public function setQuote($quote)
+  {
+    $this->quote = $quote;
+  }
+  public function getQuote()
+  {
+    return $this->quote;
+  }
+  public function setSkipLeadingRows($skipLeadingRows)
+  {
+    $this->skipLeadingRows = $skipLeadingRows;
+  }
+  public function getSkipLeadingRows()
+  {
+    return $this->skipLeadingRows;
+  }
+}
+
 class Google_Service_Bigquery_Dataset extends Google_Collection
 {
   protected $collection_key = 'access';
@@ -941,12 +1045,14 @@ class Google_Service_Bigquery_Dataset extends Google_Collection
   public $creationTime;
   protected $datasetReferenceType = 'Google_Service_Bigquery_DatasetReference';
   protected $datasetReferenceDataType = '';
+  public $defaultTableExpirationMs;
   public $description;
   public $etag;
   public $friendlyName;
   public $id;
   public $kind;
   public $lastModifiedTime;
+  public $location;
   public $selfLink;
 
 
@@ -974,6 +1080,14 @@ class Google_Service_Bigquery_Dataset extends Google_Collection
   {
     return $this->datasetReference;
   }
+  public function setDefaultTableExpirationMs($defaultTableExpirationMs)
+  {
+    $this->defaultTableExpirationMs = $defaultTableExpirationMs;
+  }
+  public function getDefaultTableExpirationMs()
+  {
+    return $this->defaultTableExpirationMs;
+  }
   public function setDescription($description)
   {
     $this->description = $description;
@@ -1022,6 +1136,14 @@ class Google_Service_Bigquery_Dataset extends Google_Collection
   {
     return $this->lastModifiedTime;
   }
+  public function setLocation($location)
+  {
+    $this->location = $location;
+  }
+  public function getLocation()
+  {
+    return $this->location;
+  }
   public function setSelfLink($selfLink)
   {
     $this->selfLink = $selfLink;
@@ -1256,12 +1378,88 @@ class Google_Service_Bigquery_ErrorProto extends Google_Model
   }
 }
 
+class Google_Service_Bigquery_ExternalDataConfiguration extends Google_Collection
+{
+  protected $collection_key = 'sourceUris';
+  protected $internal_gapi_mappings = array(
+  );
+  public $compression;
+  protected $csvOptionsType = 'Google_Service_Bigquery_CsvOptions';
+  protected $csvOptionsDataType = '';
+  public $ignoreUnknownValues;
+  public $maxBadRecords;
+  protected $schemaType = 'Google_Service_Bigquery_TableSchema';
+  protected $schemaDataType = '';
+  public $sourceFormat;
+  public $sourceUris;
+
+
+  public function setCompression($compression)
+  {
+    $this->compression = $compression;
+  }
+  public function getCompression()
+  {
+    return $this->compression;
+  }
+  public function setCsvOptions(Google_Service_Bigquery_CsvOptions $csvOptions)
+  {
+    $this->csvOptions = $csvOptions;
+  }
+  public function getCsvOptions()
+  {
+    return $this->csvOptions;
+  }
+  public function setIgnoreUnknownValues($ignoreUnknownValues)
+  {
+    $this->ignoreUnknownValues = $ignoreUnknownValues;
+  }
+  public function getIgnoreUnknownValues()
+  {
+    return $this->ignoreUnknownValues;
+  }
+  public function setMaxBadRecords($maxBadRecords)
+  {
+    $this->maxBadRecords = $maxBadRecords;
+  }
+  public function getMaxBadRecords()
+  {
+    return $this->maxBadRecords;
+  }
+  public function setSchema(Google_Service_Bigquery_TableSchema $schema)
+  {
+    $this->schema = $schema;
+  }
+  public function getSchema()
+  {
+    return $this->schema;
+  }
+  public function setSourceFormat($sourceFormat)
+  {
+    $this->sourceFormat = $sourceFormat;
+  }
+  public function getSourceFormat()
+  {
+    return $this->sourceFormat;
+  }
+  public function setSourceUris($sourceUris)
+  {
+    $this->sourceUris = $sourceUris;
+  }
+  public function getSourceUris()
+  {
+    return $this->sourceUris;
+  }
+}
+
 class Google_Service_Bigquery_GetQueryResultsResponse extends Google_Collection
 {
   protected $collection_key = 'rows';
   protected $internal_gapi_mappings = array(
   );
   public $cacheHit;
+  protected $errorsType = 'Google_Service_Bigquery_ErrorProto';
+  protected $errorsDataType = 'array';
   public $etag;
   public $jobComplete;
   protected $jobReferenceType = 'Google_Service_Bigquery_JobReference';
@@ -1284,6 +1482,14 @@ class Google_Service_Bigquery_GetQueryResultsResponse extends Google_Collection
   {
     return $this->cacheHit;
   }
+  public function setErrors($errors)
+  {
+    $this->errors = $errors;
+  }
+  public function getErrors()
+  {
+    return $this->errors;
+  }
   public function setEtag($etag)
   {
     $this->etag = $etag;
@@ -1361,6 +1567,7 @@ class Google_Service_Bigquery_GetQueryResultsResponse extends Google_Collection
 class Google_Service_Bigquery_Job extends Google_Model
 {
   protected $internal_gapi_mappings = array(
+        "userEmail" => "user_email",
   );
   protected $configurationType = 'Google_Service_Bigquery_JobConfiguration';
   protected $configurationDataType = '';
@@ -1374,6 +1581,7 @@ class Google_Service_Bigquery_Job extends Google_Model
   protected $statisticsDataType = '';
   protected $statusType = 'Google_Service_Bigquery_JobStatus';
   protected $statusDataType = '';
+  public $userEmail;
 
 
   public function setConfiguration(Google_Service_Bigquery_JobConfiguration $configuration)
@@ -1440,6 +1648,41 @@ class Google_Service_Bigquery_Job extends Google_Model
   {
     return $this->status;
   }
+  public function setUserEmail($userEmail)
+  {
+    $this->userEmail = $userEmail;
+  }
+  public function getUserEmail()
+  {
+    return $this->userEmail;
+  }
+}
+
+class Google_Service_Bigquery_JobCancelResponse extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  protected $jobType = 'Google_Service_Bigquery_Job';
+  protected $jobDataType = '';
+  public $kind;
+
+
+  public function setJob(Google_Service_Bigquery_Job $job)
+  {
+    $this->job = $job;
+  }
+  public function getJob()
+  {
+    return $this->job;
+  }
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
 }
 
 class Google_Service_Bigquery_JobConfiguration extends Google_Model
@@ -1642,6 +1885,7 @@ class Google_Service_Bigquery_JobConfigurationLoad extends Google_Collection
   public $fieldDelimiter;
   public $ignoreUnknownValues;
   public $maxBadRecords;
+  public $projectionFields;
   public $quote;
   protected $schemaType = 'Google_Service_Bigquery_TableSchema';
   protected $schemaDataType = '';
@@ -1717,6 +1961,14 @@ class Google_Service_Bigquery_JobConfigurationLoad extends Google_Collection
   {
     return $this->maxBadRecords;
   }
+  public function setProjectionFields($projectionFields)
+  {
+    $this->projectionFields = $projectionFields;
+  }
+  public function getProjectionFields()
+  {
+    return $this->projectionFields;
+  }
   public function setQuote($quote)
   {
     $this->quote = $quote;
@@ -1783,8 +2035,9 @@ class Google_Service_Bigquery_JobConfigurationLoad extends Google_Collection
   }
 }
 
-class Google_Service_Bigquery_JobConfigurationQuery extends Google_Model
+class Google_Service_Bigquery_JobConfigurationQuery extends Google_Collection
 {
+  protected $collection_key = 'userDefinedFunctionResources';
   protected $internal_gapi_mappings = array(
   );
   public $allowLargeResults;
@@ -1797,7 +2050,11 @@ class Google_Service_Bigquery_JobConfigurationQuery extends Google_Model
   public $preserveNulls;
   public $priority;
   public $query;
+  protected $tableDefinitionsType = 'Google_Service_Bigquery_ExternalDataConfiguration';
+  protected $tableDefinitionsDataType = 'map';
   public $useQueryCache;
+  protected $userDefinedFunctionResourcesType = 'Google_Service_Bigquery_UserDefinedFunctionResource';
+  protected $userDefinedFunctionResourcesDataType = 'array';
   public $writeDisposition;
 
 
@@ -1865,6 +2122,14 @@ class Google_Service_Bigquery_JobConfigurationQuery extends Google_Model
   {
     return $this->query;
   }
+  public function setTableDefinitions($tableDefinitions)
+  {
+    $this->tableDefinitions = $tableDefinitions;
+  }
+  public function getTableDefinitions()
+  {
+    return $this->tableDefinitions;
+  }
   public function setUseQueryCache($useQueryCache)
   {
     $this->useQueryCache = $useQueryCache;
@@ -1873,6 +2138,14 @@ class Google_Service_Bigquery_JobConfigurationQuery extends Google_Model
   {
     return $this->useQueryCache;
   }
+  public function setUserDefinedFunctionResources($userDefinedFunctionResources)
+  {
+    $this->userDefinedFunctionResources = $userDefinedFunctionResources;
+  }
+  public function getUserDefinedFunctionResources()
+  {
+    return $this->userDefinedFunctionResources;
+  }
   public function setWriteDisposition($writeDisposition)
   {
     $this->writeDisposition = $writeDisposition;
@@ -1883,6 +2156,10 @@ class Google_Service_Bigquery_JobConfigurationQuery extends Google_Model
   }
 }
 
+class Google_Service_Bigquery_JobConfigurationQueryTableDefinitions extends Google_Model
+{
+}
+
 class Google_Service_Bigquery_JobConfigurationTableCopy extends Google_Collection
 {
   protected $collection_key = 'sourceTables';
@@ -1950,7 +2227,6 @@ class Google_Service_Bigquery_JobList extends Google_Collection
   protected $jobsDataType = 'array';
   public $kind;
   public $nextPageToken;
-  public $totalItems;
 
 
   public function setEtag($etag)
@@ -1985,14 +2261,6 @@ class Google_Service_Bigquery_JobList extends Google_Collection
   {
     return $this->nextPageToken;
   }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
 }
 
 class Google_Service_Bigquery_JobListJobs extends Google_Model
@@ -2194,10 +2462,20 @@ class Google_Service_Bigquery_JobStatistics2 extends Google_Model
 {
   protected $internal_gapi_mappings = array(
   );
+  public $billingTier;
   public $cacheHit;
+  public $totalBytesBilled;
   public $totalBytesProcessed;
 
 
+  public function setBillingTier($billingTier)
+  {
+    $this->billingTier = $billingTier;
+  }
+  public function getBillingTier()
+  {
+    return $this->billingTier;
+  }
   public function setCacheHit($cacheHit)
   {
     $this->cacheHit = $cacheHit;
@@ -2206,6 +2484,14 @@ class Google_Service_Bigquery_JobStatistics2 extends Google_Model
   {
     return $this->cacheHit;
   }
+  public function setTotalBytesBilled($totalBytesBilled)
+  {
+    $this->totalBytesBilled = $totalBytesBilled;
+  }
+  public function getTotalBytesBilled()
+  {
+    return $this->totalBytesBilled;
+  }
   public function setTotalBytesProcessed($totalBytesProcessed)
   {
     $this->totalBytesProcessed = $totalBytesProcessed;
@@ -2533,6 +2819,8 @@ class Google_Service_Bigquery_QueryResponse extends Google_Collection
   protected $internal_gapi_mappings = array(
   );
   public $cacheHit;
+  protected $errorsType = 'Google_Service_Bigquery_ErrorProto';
+  protected $errorsDataType = 'array';
   public $jobComplete;
   protected $jobReferenceType = 'Google_Service_Bigquery_JobReference';
   protected $jobReferenceDataType = '';
@@ -2554,6 +2842,14 @@ class Google_Service_Bigquery_QueryResponse extends Google_Collection
   {
     return $this->cacheHit;
   }
+  public function setErrors($errors)
+  {
+    $this->errors = $errors;
+  }
+  public function getErrors()
+  {
+    return $this->errors;
+  }
   public function setJobComplete($jobComplete)
   {
     $this->jobComplete = $jobComplete;
@@ -2620,6 +2916,41 @@ class Google_Service_Bigquery_QueryResponse extends Google_Collection
   }
 }
 
+class Google_Service_Bigquery_Streamingbuffer extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $estimatedBytes;
+  public $estimatedRows;
+  public $oldestEntryTime;
+
+
+  public function setEstimatedBytes($estimatedBytes)
+  {
+    $this->estimatedBytes = $estimatedBytes;
+  }
+  public function getEstimatedBytes()
+  {
+    return $this->estimatedBytes;
+  }
+  public function setEstimatedRows($estimatedRows)
+  {
+    $this->estimatedRows = $estimatedRows;
+  }
+  public function getEstimatedRows()
+  {
+    return $this->estimatedRows;
+  }
+  public function setOldestEntryTime($oldestEntryTime)
+  {
+    $this->oldestEntryTime = $oldestEntryTime;
+  }
+  public function getOldestEntryTime()
+  {
+    return $this->oldestEntryTime;
+  }
+}
+
 class Google_Service_Bigquery_Table extends Google_Model
 {
   protected $internal_gapi_mappings = array(
@@ -2628,15 +2959,20 @@ class Google_Service_Bigquery_Table extends Google_Model
   public $description;
   public $etag;
   public $expirationTime;
+  protected $externalDataConfigurationType = 'Google_Service_Bigquery_ExternalDataConfiguration';
+  protected $externalDataConfigurationDataType = '';
   public $friendlyName;
   public $id;
   public $kind;
   public $lastModifiedTime;
+  public $location;
   public $numBytes;
   public $numRows;
   protected $schemaType = 'Google_Service_Bigquery_TableSchema';
   protected $schemaDataType = '';
   public $selfLink;
+  protected $streamingBufferType = 'Google_Service_Bigquery_Streamingbuffer';
+  protected $streamingBufferDataType = '';
   protected $tableReferenceType = 'Google_Service_Bigquery_TableReference';
   protected $tableReferenceDataType = '';
   public $type;
@@ -2676,6 +3012,14 @@ class Google_Service_Bigquery_Table extends Google_Model
   {
     return $this->expirationTime;
   }
+  public function setExternalDataConfiguration(Google_Service_Bigquery_ExternalDataConfiguration $externalDataConfiguration)
+  {
+    $this->externalDataConfiguration = $externalDataConfiguration;
+  }
+  public function getExternalDataConfiguration()
+  {
+    return $this->externalDataConfiguration;
+  }
   public function setFriendlyName($friendlyName)
   {
     $this->friendlyName = $friendlyName;
@@ -2708,6 +3052,14 @@ class Google_Service_Bigquery_Table extends Google_Model
   {
     return $this->lastModifiedTime;
   }
+  public function setLocation($location)
+  {
+    $this->location = $location;
+  }
+  public function getLocation()
+  {
+    return $this->location;
+  }
   public function setNumBytes($numBytes)
   {
     $this->numBytes = $numBytes;
@@ -2740,6 +3092,14 @@ class Google_Service_Bigquery_Table extends Google_Model
   {
     return $this->selfLink;
   }
+  public function setStreamingBuffer(Google_Service_Bigquery_Streamingbuffer $streamingBuffer)
+  {
+    $this->streamingBuffer = $streamingBuffer;
+  }
+  public function getStreamingBuffer()
+  {
+    return $this->streamingBuffer;
+  }
   public function setTableReference(Google_Service_Bigquery_TableReference $tableReference)
   {
     $this->tableReference = $tableReference;
@@ -2788,11 +3148,21 @@ class Google_Service_Bigquery_TableDataInsertAllRequest extends Google_Collectio
   protected $collection_key = 'rows';
   protected $internal_gapi_mappings = array(
   );
+  public $ignoreUnknownValues;
   public $kind;
   protected $rowsType = 'Google_Service_Bigquery_TableDataInsertAllRequestRows';
   protected $rowsDataType = 'array';
+  public $skipInvalidRows;
 
 
+  public function setIgnoreUnknownValues($ignoreUnknownValues)
+  {
+    $this->ignoreUnknownValues = $ignoreUnknownValues;
+  }
+  public function getIgnoreUnknownValues()
+  {
+    return $this->ignoreUnknownValues;
+  }
   public function setKind($kind)
   {
     $this->kind = $kind;
@@ -2809,6 +3179,14 @@ class Google_Service_Bigquery_TableDataInsertAllRequest extends Google_Collectio
   {
     return $this->rows;
   }
+  public function setSkipInvalidRows($skipInvalidRows)
+  {
+    $this->skipInvalidRows = $skipInvalidRows;
+  }
+  public function getSkipInvalidRows()
+  {
+    return $this->skipInvalidRows;
+  }
 }
 
 class Google_Service_Bigquery_TableDataInsertAllRequestRows extends Google_Model
@@ -3185,6 +3563,32 @@ class Google_Service_Bigquery_TableSchema extends Google_Collection
   }
 }
 
+class Google_Service_Bigquery_UserDefinedFunctionResource extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $inlineCode;
+  public $resourceUri;
+
+
+  public function setInlineCode($inlineCode)
+  {
+    $this->inlineCode = $inlineCode;
+  }
+  public function getInlineCode()
+  {
+    return $this->inlineCode;
+  }
+  public function setResourceUri($resourceUri)
+  {
+    $this->resourceUri = $resourceUri;
+  }
+  public function getResourceUri()
+  {
+    return $this->resourceUri;
+  }
+}
+
 class Google_Service_Bigquery_ViewDefinition extends Google_Model
 {
   protected $internal_gapi_mappings = array(

lib/google/src/Google/Service/Blogger.php

@@ -55,6 +55,7 @@ class Google_Service_Blogger extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'blogger/v3/';
     $this->version = 'v3';
     $this->serviceName = 'blogger';
@@ -281,6 +282,11 @@ class Google_Service_Blogger extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
+                'status' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                  'repeated' => true,
+                ),
                 'startDate' => array(
                   'location' => 'query',
                   'type' => 'string',
@@ -439,6 +445,14 @@ class Google_Service_Blogger extends Google_Service
                   'type' => 'string',
                   'repeated' => true,
                 ),
+                'maxResults' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+                'pageToken' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'fetchBodies' => array(
                   'location' => 'query',
                   'type' => 'boolean',
@@ -1119,6 +1133,7 @@ class Google_Service_Blogger_Comments_Resource extends Google_Service_Resource
    * @param string $blogId ID of the blog to fetch comments from.
    * @param array $optParams Optional parameters.
    *
+   * @opt_param string status
    * @opt_param string startDate Earliest date of comment to fetch, a date-time
    * with RFC 3339 formatting.
    * @opt_param string endDate Latest date of comment to fetch, a date-time with
@@ -1262,10 +1277,12 @@ class Google_Service_Blogger_Pages_Resource extends Google_Service_Resource
    * Retrieves the pages for a blog, optionally including non-LIVE statuses.
    * (pages.listPages)
    *
-   * @param string $blogId ID of the blog to fetch pages from.
+   * @param string $blogId ID of the blog to fetch Pages from.
    * @param array $optParams Optional parameters.
    *
    * @opt_param string status
+   * @opt_param string maxResults Maximum number of Pages to fetch.
+   * @opt_param string pageToken Continuation token if the request is paged.
    * @opt_param bool fetchBodies Whether to retrieve the Page bodies.
    * @opt_param string view Access level with which to view the returned result.
    * Note that some fields require elevated access.
@@ -2260,6 +2277,7 @@ class Google_Service_Blogger_CommentList extends Google_Collection
   protected $collection_key = 'items';
   protected $internal_gapi_mappings = array(
   );
+  public $etag;
   protected $itemsType = 'Google_Service_Blogger_Comment';
   protected $itemsDataType = 'array';
   public $kind;
@@ -2267,6 +2285,14 @@ class Google_Service_Blogger_CommentList extends Google_Collection
   public $prevPageToken;
 
 
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+  public function getEtag()
+  {
+    return $this->etag;
+  }
   public function setItems($items)
   {
     $this->items = $items;
@@ -2520,11 +2546,21 @@ class Google_Service_Blogger_PageList extends Google_Collection
   protected $collection_key = 'items';
   protected $internal_gapi_mappings = array(
   );
+  public $etag;
   protected $itemsType = 'Google_Service_Blogger_Page';
   protected $itemsDataType = 'array';
   public $kind;
+  public $nextPageToken;
 
 
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+  public function getEtag()
+  {
+    return $this->etag;
+  }
   public function setItems($items)
   {
     $this->items = $items;
@@ -2541,6 +2577,14 @@ class Google_Service_Blogger_PageList extends Google_Collection
   {
     return $this->kind;
   }
+  public function setNextPageToken($nextPageToken)
+  {
+    $this->nextPageToken = $nextPageToken;
+  }
+  public function getNextPageToken()
+  {
+    return $this->nextPageToken;
+  }
 }
 
 class Google_Service_Blogger_Pageviews extends Google_Collection
@@ -2892,12 +2936,21 @@ class Google_Service_Blogger_PostList extends Google_Collection
   protected $collection_key = 'items';
   protected $internal_gapi_mappings = array(
   );
+  public $etag;
   protected $itemsType = 'Google_Service_Blogger_Post';
   protected $itemsDataType = 'array';
   public $kind;
   public $nextPageToken;
 
 
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+  public function getEtag()
+  {
+    return $this->etag;
+  }
   public function setItems($items)
   {
     $this->items = $items;

lib/google/src/Google/Service/Books.php

@@ -46,6 +46,7 @@ class Google_Service_Books extends Google_Service
   public $mylibrary_bookshelves;
   public $mylibrary_bookshelves_volumes;
   public $mylibrary_readingpositions;
+  public $onboarding;
   public $promooffer;
   public $volumes;
   public $volumes_associated;
@@ -62,6 +63,7 @@ class Google_Service_Books extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'books/v1/';
     $this->version = 'v1';
     $this->serviceName = 'books';
@@ -506,7 +508,11 @@ class Google_Service_Books extends Google_Service
         'myconfig',
         array(
           'methods' => array(
-            'releaseDownloadAccess' => array(
+            'getUserSettings' => array(
+              'path' => 'myconfig/getUserSettings',
+              'httpMethod' => 'GET',
+              'parameters' => array(),
+            ),'releaseDownloadAccess' => array(
               'path' => 'myconfig/releaseDownloadAccess',
               'httpMethod' => 'POST',
               'parameters' => array(
@@ -601,6 +607,10 @@ class Google_Service_Books extends Google_Service
                   'repeated' => true,
                 ),
               ),
+            ),'updateUserSettings' => array(
+              'path' => 'myconfig/updateUserSettings',
+              'httpMethod' => 'POST',
+              'parameters' => array(),
             ),
           )
         )
@@ -625,20 +635,6 @@ class Google_Service_Books extends Google_Service
                   'type' => 'string',
                 ),
               ),
-            ),'get' => array(
-              'path' => 'mylibrary/annotations/{annotationId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'annotationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
             ),'insert' => array(
               'path' => 'mylibrary/annotations',
               'httpMethod' => 'POST',
@@ -685,10 +681,9 @@ class Google_Service_Books extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
-                'pageIds' => array(
+                'updatedMax' => array(
                   'location' => 'query',
                   'type' => 'string',
-                  'repeated' => true,
                 ),
                 'contentVersion' => array(
                   'location' => 'query',
@@ -702,10 +697,6 @@ class Google_Service_Books extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
-                'updatedMax' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
               ),
             ),'summary' => array(
               'path' => 'mylibrary/annotations/summary',
@@ -761,6 +752,10 @@ class Google_Service_Books extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
+                'reason' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'source' => array(
                   'location' => 'query',
                   'type' => 'string',
@@ -841,6 +836,10 @@ class Google_Service_Books extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
+                'reason' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'source' => array(
                   'location' => 'query',
                   'type' => 'string',
@@ -962,6 +961,51 @@ class Google_Service_Books extends Google_Service
           )
         )
     );
+    $this->onboarding = new Google_Service_Books_Onboarding_Resource(
+        $this,
+        $this->serviceName,
+        'onboarding',
+        array(
+          'methods' => array(
+            'listCategories' => array(
+              'path' => 'onboarding/listCategories',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'locale' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),'listCategoryVolumes' => array(
+              'path' => 'onboarding/listCategoryVolumes',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'locale' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'pageToken' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'maxAllowedMaturityRating' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'categoryId' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                  'repeated' => true,
+                ),
+                'pageSize' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+              ),
+            ),
+          )
+        )
+    );
     $this->promooffer = new Google_Service_Books_Promooffer_Resource(
         $this,
         $this->serviceName,
@@ -1086,7 +1130,11 @@ class Google_Service_Books extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
-                'source' => array(
+                'user_library_consistent_read' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'projection' => array(
                   'location' => 'query',
                   'type' => 'string',
                 ),
@@ -1094,7 +1142,7 @@ class Google_Service_Books extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
-                'projection' => array(
+                'source' => array(
                   'location' => 'query',
                   'type' => 'string',
                 ),
@@ -1188,6 +1236,10 @@ class Google_Service_Books extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'maxAllowedMaturityRating' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'association' => array(
                   'location' => 'query',
                   'type' => 'string',
@@ -1256,6 +1308,10 @@ class Google_Service_Books extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'maxAllowedMaturityRating' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
               ),
             ),'rate' => array(
               'path' => 'volumes/recommended/rate',
@@ -1705,6 +1761,19 @@ class Google_Service_Books_LayersVolumeAnnotations_Resource extends Google_Servi
 class Google_Service_Books_Myconfig_Resource extends Google_Service_Resource
 {
 
+  /**
+   * Gets the current settings for the user. (myconfig.getUserSettings)
+   *
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Books_Usersettings
+   */
+  public function getUserSettings($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('getUserSettings', array($params), "Google_Service_Books_Usersettings");
+  }
+
   /**
    * Release downloaded content access restriction.
    * (myconfig.releaseDownloadAccess)
@@ -1776,6 +1845,22 @@ class Google_Service_Books_Myconfig_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('syncVolumeLicenses', array($params), "Google_Service_Books_Volumes");
   }
+
+  /**
+   * Sets the settings for the user. If a sub-object is specified, it will
+   * overwrite the existing sub-object stored in the server. Unspecified sub-
+   * objects will retain the existing value. (myconfig.updateUserSettings)
+   *
+   * @param Google_Usersettings $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Books_Usersettings
+   */
+  public function updateUserSettings(Google_Service_Books_Usersettings $postBody, $optParams = array())
+  {
+    $params = array('postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('updateUserSettings', array($params), "Google_Service_Books_Usersettings");
+  }
 }
 
 /**
@@ -1816,22 +1901,6 @@ class Google_Service_Books_MylibraryAnnotations_Resource extends Google_Service_
     return $this->call('delete', array($params));
   }
 
-  /**
-   * Gets an annotation by its ID. (annotations.get)
-   *
-   * @param string $annotationId The ID for the annotation to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Annotation
-   */
-  public function get($annotationId, $optParams = array())
-  {
-    $params = array('annotationId' => $annotationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Annotation");
-  }
-
   /**
    * Inserts a new annotation. (annotations.insert)
    *
@@ -1866,14 +1935,12 @@ class Google_Service_Books_MylibraryAnnotations_Resource extends Google_Service_
    * @opt_param string maxResults Maximum number of results to return
    * @opt_param string pageToken The value of the nextToken from the previous
    * page.
-   * @opt_param string pageIds The page ID(s) for the volume that is being
-   * queried.
+   * @opt_param string updatedMax RFC 3339 timestamp to restrict to items updated
+   * prior to this timestamp (exclusive).
    * @opt_param string contentVersion The content version for the requested
    * volume.
    * @opt_param string source String to identify the originator of this request.
    * @opt_param string layerId The layer ID to limit annotation by.
-   * @opt_param string updatedMax RFC 3339 timestamp to restrict to items updated
-   * prior to this timestamp (exclusive).
    * @return Google_Service_Books_Annotations
    */
   public function listMylibraryAnnotations($optParams = array())
@@ -1933,6 +2000,8 @@ class Google_Service_Books_MylibraryBookshelves_Resource extends Google_Service_
    * @param string $volumeId ID of volume to add.
    * @param array $optParams Optional parameters.
    *
+   * @opt_param string reason The reason for which the book is added to the
+   * library.
    * @opt_param string source String to identify the originator of this request.
    */
   public function addVolume($shelf, $volumeId, $optParams = array())
@@ -2016,6 +2085,8 @@ class Google_Service_Books_MylibraryBookshelves_Resource extends Google_Service_
    * @param string $volumeId ID of volume to remove.
    * @param array $optParams Optional parameters.
    *
+   * @opt_param string reason The reason for which the book is removed from the
+   * library.
    * @opt_param string source String to identify the originator of this request.
    */
   public function removeVolume($shelf, $volumeId, $optParams = array())
@@ -2120,6 +2191,59 @@ class Google_Service_Books_MylibraryReadingpositions_Resource extends Google_Ser
   }
 }
 
+/**
+ * The "onboarding" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $booksService = new Google_Service_Books(...);
+ *   $onboarding = $booksService->onboarding;
+ *  </code>
+ */
+class Google_Service_Books_Onboarding_Resource extends Google_Service_Resource
+{
+
+  /**
+   * List categories for onboarding experience. (onboarding.listCategories)
+   *
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code.
+   * Default is en-US if unset.
+   * @return Google_Service_Books_Category
+   */
+  public function listCategories($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('listCategories', array($params), "Google_Service_Books_Category");
+  }
+
+  /**
+   * List available volumes under categories for onboarding experience.
+   * (onboarding.listCategoryVolumes)
+   *
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code.
+   * Default is en-US if unset.
+   * @opt_param string pageToken The value of the nextToken from the previous
+   * page.
+   * @opt_param string maxAllowedMaturityRating The maximum allowed maturity
+   * rating of returned volumes. Books with a higher maturity rating are filtered
+   * out.
+   * @opt_param string categoryId List of category ids requested.
+   * @opt_param string pageSize Number of maximum results per page to be included
+   * in the response.
+   * @return Google_Service_Books_Volume2
+   */
+  public function listCategoryVolumes($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('listCategoryVolumes', array($params), "Google_Service_Books_Volume2");
+  }
+}
+
 /**
  * The "promooffer" collection of methods.
  * Typical usage is:
@@ -2210,10 +2334,11 @@ class Google_Service_Books_Volumes_Resource extends Google_Service_Resource
    * @param string $volumeId ID of volume to retrieve.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string source String to identify the originator of this request.
-   * @opt_param string country ISO-3166-1 code to override the IP-based location.
+   * @opt_param bool user_library_consistent_read
    * @opt_param string projection Restrict information returned to a set of
    * selected fields.
+   * @opt_param string country ISO-3166-1 code to override the IP-based location.
+   * @opt_param string source String to identify the originator of this request.
    * @opt_param string partner Brand results for partner ID.
    * @return Google_Service_Books_Volume
    */
@@ -2276,6 +2401,9 @@ class Google_Service_Books_VolumesAssociated_Resource extends Google_Service_Res
    * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code. Ex:
    * 'en_US'. Used for generating recommendations.
    * @opt_param string source String to identify the originator of this request.
+   * @opt_param string maxAllowedMaturityRating The maximum allowed maturity
+   * rating of returned recommendations. Books with a higher maturity rating are
+   * filtered out.
    * @opt_param string association Association type.
    * @return Google_Service_Books_Volumes
    */
@@ -2341,6 +2469,9 @@ class Google_Service_Books_VolumesRecommended_Resource extends Google_Service_Re
    * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code. Ex:
    * 'en_US'. Used for generating recommendations.
    * @opt_param string source String to identify the originator of this request.
+   * @opt_param string maxAllowedMaturityRating The maximum allowed maturity
+   * rating of returned recommendations. Books with a higher maturity rating are
+   * filtered out.
    * @return Google_Service_Books_Volumes
    */
   public function listVolumesRecommended($optParams = array())
@@ -3218,6 +3349,69 @@ class Google_Service_Books_Bookshelves extends Google_Collection
   }
 }
 
+class Google_Service_Books_Category extends Google_Collection
+{
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $itemsType = 'Google_Service_Books_CategoryItems';
+  protected $itemsDataType = 'array';
+  public $kind;
+
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+  public function getItems()
+  {
+    return $this->items;
+  }
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+}
+
+class Google_Service_Books_CategoryItems extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $badgeUrl;
+  public $categoryId;
+  public $name;
+
+
+  public function setBadgeUrl($badgeUrl)
+  {
+    $this->badgeUrl = $badgeUrl;
+  }
+  public function getBadgeUrl()
+  {
+    return $this->badgeUrl;
+  }
+  public function setCategoryId($categoryId)
+  {
+    $this->categoryId = $categoryId;
+  }
+  public function getCategoryId()
+  {
+    return $this->categoryId;
+  }
+  public function setName($name)
+  {
+    $this->name = $name;
+  }
+  public function getName()
+  {
+    return $this->name;
+  }
+}
+
 class Google_Service_Books_ConcurrentAccessRestriction extends Google_Model
 {
   protected $internal_gapi_mappings = array(
@@ -4589,6 +4783,7 @@ class Google_Service_Books_OffersItems extends Google_Collection
   protected $internal_gapi_mappings = array(
   );
   public $artUrl;
+  public $gservicesKey;
   public $id;
   protected $itemsType = 'Google_Service_Books_OffersItemsItems';
   protected $itemsDataType = 'array';
@@ -4602,6 +4797,14 @@ class Google_Service_Books_OffersItems extends Google_Collection
   {
     return $this->artUrl;
   }
+  public function setGservicesKey($gservicesKey)
+  {
+    $this->gservicesKey = $gservicesKey;
+  }
+  public function getGservicesKey()
+  {
+    return $this->gservicesKey;
+  }
   public function setId($id)
   {
     $this->id = $id;
@@ -4942,6 +5145,59 @@ class Google_Service_Books_ReviewSource extends Google_Model
   }
 }
 
+class Google_Service_Books_Usersettings extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $kind;
+  protected $notesExportType = 'Google_Service_Books_UsersettingsNotesExport';
+  protected $notesExportDataType = '';
+
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+  public function setNotesExport(Google_Service_Books_UsersettingsNotesExport $notesExport)
+  {
+    $this->notesExport = $notesExport;
+  }
+  public function getNotesExport()
+  {
+    return $this->notesExport;
+  }
+}
+
+class Google_Service_Books_UsersettingsNotesExport extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $folderName;
+  public $isEnabled;
+
+
+  public function setFolderName($folderName)
+  {
+    $this->folderName = $folderName;
+  }
+  public function getFolderName()
+  {
+    return $this->folderName;
+  }
+  public function setIsEnabled($isEnabled)
+  {
+    $this->isEnabled = $isEnabled;
+  }
+  public function getIsEnabled()
+  {
+    return $this->isEnabled;
+  }
+}
+
 class Google_Service_Books_Volume extends Google_Model
 {
   protected $internal_gapi_mappings = array(
@@ -5056,6 +5312,43 @@ class Google_Service_Books_Volume extends Google_Model
   }
 }
 
+class Google_Service_Books_Volume2 extends Google_Collection
+{
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $itemsType = 'Google_Service_Books_Volume';
+  protected $itemsDataType = 'array';
+  public $kind;
+  public $nextPageToken;
+
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+  public function getItems()
+  {
+    return $this->items;
+  }
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+  public function setNextPageToken($nextPageToken)
+  {
+    $this->nextPageToken = $nextPageToken;
+  }
+  public function getNextPageToken()
+  {
+    return $this->nextPageToken;
+  }
+}
+
 class Google_Service_Books_VolumeAccessInfo extends Google_Model
 {
   protected $internal_gapi_mappings = array(
@@ -5807,6 +6100,7 @@ class Google_Service_Books_VolumeVolumeInfo extends Google_Collection
   protected $collection_key = 'industryIdentifiers';
   protected $internal_gapi_mappings = array(
   );
+  public $allowAnonLogging;
   public $authors;
   public $averageRating;
   public $canonicalVolumeLink;
@@ -5822,6 +6116,7 @@ class Google_Service_Books_VolumeVolumeInfo extends Google_Collection
   public $infoLink;
   public $language;
   public $mainCategory;
+  public $maturityRating;
   public $pageCount;
   public $previewLink;
   public $printType;
@@ -5830,10 +6125,19 @@ class Google_Service_Books_VolumeVolumeInfo extends Google_Collection
   public $publisher;
   public $ratingsCount;
   public $readingModes;
+  public $samplePageCount;
   public $subtitle;
   public $title;
 
 
+  public function setAllowAnonLogging($allowAnonLogging)
+  {
+    $this->allowAnonLogging = $allowAnonLogging;
+  }
+  public function getAllowAnonLogging()
+  {
+    return $this->allowAnonLogging;
+  }
   public function setAuthors($authors)
   {
     $this->authors = $authors;
@@ -5930,6 +6234,14 @@ class Google_Service_Books_VolumeVolumeInfo extends Google_Collection
   {
     return $this->mainCategory;
   }
+  public function setMaturityRating($maturityRating)
+  {
+    $this->maturityRating = $maturityRating;
+  }
+  public function getMaturityRating()
+  {
+    return $this->maturityRating;
+  }
   public function setPageCount($pageCount)
   {
     $this->pageCount = $pageCount;
@@ -5994,6 +6306,14 @@ class Google_Service_Books_VolumeVolumeInfo extends Google_Collection
   {
     return $this->readingModes;
   }
+  public function setSamplePageCount($samplePageCount)
+  {
+    $this->samplePageCount = $samplePageCount;
+  }
+  public function getSamplePageCount()
+  {
+    return $this->samplePageCount;
+  }
   public function setSubtitle($subtitle)
   {
     $this->subtitle = $subtitle;

lib/google/src/Google/Service/Calendar.php

@@ -55,6 +55,7 @@ class Google_Service_Calendar extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'calendar/v3/';
     $this->version = 'v3';
     $this->serviceName = 'calendar';
@@ -469,6 +470,10 @@ class Google_Service_Calendar extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
+                'supportsAttachments' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
               ),
             ),'insert' => array(
               'path' => 'calendars/{calendarId}/events',
@@ -479,6 +484,10 @@ class Google_Service_Calendar extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
+                'supportsAttachments' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
                 'sendNotifications' => array(
                   'location' => 'query',
                   'type' => 'boolean',
@@ -665,6 +674,10 @@ class Google_Service_Calendar extends Google_Service
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
+                'supportsAttachments' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
                 'maxAttendees' => array(
                   'location' => 'query',
                   'type' => 'integer',
@@ -711,6 +724,10 @@ class Google_Service_Calendar extends Google_Service
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
+                'supportsAttachments' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
                 'maxAttendees' => array(
                   'location' => 'query',
                   'type' => 'integer',
@@ -1103,7 +1120,7 @@ class Google_Service_Calendar_CalendarList_Resource extends Google_Service_Resou
    * @opt_param bool showDeleted Whether to include deleted calendar list entries
    * in the result. Optional. The default is False.
    * @opt_param string minAccessRole The minimum access role for the user in the
-   * returned entires. Optional. The default is no restriction.
+   * returned entries. Optional. The default is no restriction.
    * @opt_param int maxResults Maximum number of entries returned on one result
    * page. By default the value is 100 entries. The page size can never be larger
    * than 250 entries. Optional.
@@ -1182,7 +1199,7 @@ class Google_Service_Calendar_CalendarList_Resource extends Google_Service_Resou
    * @opt_param bool showDeleted Whether to include deleted calendar list entries
    * in the result. Optional. The default is False.
    * @opt_param string minAccessRole The minimum access role for the user in the
-   * returned entires. Optional. The default is no restriction.
+   * returned entries. Optional. The default is no restriction.
    * @opt_param int maxResults Maximum number of entries returned on one result
    * page. By default the value is 100 entries. The page size can never be larger
    * than 250 entries. Optional.
@@ -1212,8 +1229,8 @@ class Google_Service_Calendar_Calendars_Resource extends Google_Service_Resource
 {
 
   /**
-   * Clears a primary calendar. This operation deletes all data associated with
-   * the primary calendar of an account and cannot be undone. (calendars.clear)
+   * Clears a primary calendar. This operation deletes all events associated with
+   * the primary calendar of an account. (calendars.clear)
    *
    * @param string $calendarId Calendar identifier.
    * @param array $optParams Optional parameters.
@@ -1226,7 +1243,8 @@ class Google_Service_Calendar_Calendars_Resource extends Google_Service_Resource
   }
 
   /**
-   * Deletes a secondary calendar. (calendars.delete)
+   * Deletes a secondary calendar. Use calendars.clear for clearing all events on
+   * primary calendars. (calendars.delete)
    *
    * @param string $calendarId Calendar identifier.
    * @param array $optParams Optional parameters.
@@ -1410,6 +1428,9 @@ class Google_Service_Calendar_Events_Resource extends Google_Service_Resource
    * @param string $calendarId Calendar identifier.
    * @param Google_Event $postBody
    * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool supportsAttachments Whether API client performing operation
+   * supports event attachments. Optional. The default is False.
    * @return Google_Service_Calendar_Event
    */
   public function import($calendarId, Google_Service_Calendar_Event $postBody, $optParams = array())
@@ -1426,6 +1447,8 @@ class Google_Service_Calendar_Events_Resource extends Google_Service_Resource
    * @param Google_Event $postBody
    * @param array $optParams Optional parameters.
    *
+   * @opt_param bool supportsAttachments Whether API client performing operation
+   * supports event attachments. Optional. The default is False.
    * @opt_param bool sendNotifications Whether to send notifications about the
    * creation of the new event. Optional. The default is False.
    * @opt_param int maxAttendees The maximum number of attendees to include in the
@@ -1600,6 +1623,8 @@ class Google_Service_Calendar_Events_Resource extends Google_Service_Resource
    * of this option is discouraged and should only be used by clients which cannot
    * handle the absence of an email address value in the mentioned places.
    * Optional. The default is False.
+   * @opt_param bool supportsAttachments Whether API client performing operation
+   * supports event attachments. Optional. The default is False.
    * @opt_param int maxAttendees The maximum number of attendees to include in the
    * response. If there are more than the specified number of attendees, only the
    * participant is returned. Optional.
@@ -1647,6 +1672,8 @@ class Google_Service_Calendar_Events_Resource extends Google_Service_Resource
    * of this option is discouraged and should only be used by clients which cannot
    * handle the absence of an email address value in the mentioned places.
    * Optional. The default is False.
+   * @opt_param bool supportsAttachments Whether API client performing operation
+   * supports event attachments. Optional. The default is False.
    * @opt_param int maxAttendees The maximum number of attendees to include in the
    * response. If there are more than the specified number of attendees, only the
    * participant is returned. Optional.
@@ -2541,6 +2568,8 @@ class Google_Service_Calendar_Event extends Google_Collection
   protected $internal_gapi_mappings = array(
   );
   public $anyoneCanAddSelf;
+  protected $attachmentsType = 'Google_Service_Calendar_EventAttachment';
+  protected $attachmentsDataType = 'array';
   protected $attendeesType = 'Google_Service_Calendar_EventAttendee';
   protected $attendeesDataType = 'array';
   public $attendeesOmitted;
@@ -2596,6 +2625,14 @@ class Google_Service_Calendar_Event extends Google_Collection
   {
     return $this->anyoneCanAddSelf;
   }
+  public function setAttachments($attachments)
+  {
+    $this->attachments = $attachments;
+  }
+  public function getAttachments()
+  {
+    return $this->attachments;
+  }
   public function setAttendees($attendees)
   {
     $this->attendees = $attendees;
@@ -2882,9 +2919,36 @@ class Google_Service_Calendar_EventAttachment extends Google_Model
 {
   protected $internal_gapi_mappings = array(
   );
+  public $fileUrl;
+  public $iconLink;
+  public $mimeType;
   public $title;
 
 
+  public function setFileUrl($fileUrl)
+  {
+    $this->fileUrl = $fileUrl;
+  }
+  public function getFileUrl()
+  {
+    return $this->fileUrl;
+  }
+  public function setIconLink($iconLink)
+  {
+    $this->iconLink = $iconLink;
+  }
+  public function getIconLink()
+  {
+    return $this->iconLink;
+  }
+  public function setMimeType($mimeType)
+  {
+    $this->mimeType = $mimeType;
+  }
+  public function getMimeType()
+  {
+    return $this->mimeType;
+  }
   public function setTitle($title)
   {
     $this->title = $title;

lib/google/src/Google/Service/CivicInfo.php

@@ -45,6 +45,7 @@ class Google_Service_CivicInfo extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'civicinfo/v2/';
     $this->version = 'v2';
     $this->serviceName = 'civicinfo';

lib/google/src/Google/Service/CloudMonitoring.php

@@ -16,23 +16,23 @@
  */
 
 /**
- * Service definition for CloudMonitoring (v2beta1).
+ * Service definition for CloudMonitoring (v2beta2).
  *
  * <p>
  * API for accessing Google Cloud and API monitoring data.</p>
  *
  * <p>
  * For more information about this service, see the API
- * <a href="https://developers.google.com/cloud-monitoring/" target="_blank">Documentation</a>
+ * <a href="https://cloud.google.com/monitoring/v2beta2/" target="_blank">Documentation</a>
  * </p>
  *
  * @author Google, Inc.
  */
 class Google_Service_CloudMonitoring extends Google_Service
 {
-  /** View monitoring data for all of your Google Cloud and API projects. */
-  const MONITORING_READONLY =
-      "https://www.googleapis.com/auth/monitoring.readonly";
+  /** View and write monitoring data for all of your Google and third-party Cloud and API projects. */
+  const MONITORING =
+      "https://www.googleapis.com/auth/monitoring";
 
   public $metricDescriptors;
   public $timeseries;
@@ -47,8 +47,9 @@ class Google_Service_CloudMonitoring extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
-    $this->servicePath = 'cloudmonitoring/v2beta1/projects/';
-    $this->version = 'v2beta1';
+    $this->rootUrl = 'https://www.googleapis.com/';
+    $this->servicePath = 'cloudmonitoring/v2beta2/projects/';
+    $this->version = 'v2beta2';
     $this->serviceName = 'cloudmonitoring';
 
     $this->metricDescriptors = new Google_Service_CloudMonitoring_MetricDescriptors_Resource(
@@ -57,7 +58,32 @@ class Google_Service_CloudMonitoring extends Google_Service
         'metricDescriptors',
         array(
           'methods' => array(
-            'list' => array(
+            'create' => array(
+              'path' => '{project}/metricDescriptors',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'project' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'delete' => array(
+              'path' => '{project}/metricDescriptors/{metric}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'project' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'metric' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
               'path' => '{project}/metricDescriptors',
               'httpMethod' => 'GET',
               'parameters' => array(
@@ -116,6 +142,10 @@ class Google_Service_CloudMonitoring extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'aggregator' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'labels' => array(
                   'location' => 'query',
                   'type' => 'string',
@@ -125,11 +155,25 @@ class Google_Service_CloudMonitoring extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'window' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'oldest' => array(
                   'location' => 'query',
                   'type' => 'string',
                 ),
               ),
+            ),'write' => array(
+              'path' => '{project}/timeseries:write',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'project' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
             ),
           )
         )
@@ -167,6 +211,10 @@ class Google_Service_CloudMonitoring extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'aggregator' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'labels' => array(
                   'location' => 'query',
                   'type' => 'string',
@@ -176,6 +224,10 @@ class Google_Service_CloudMonitoring extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'window' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'oldest' => array(
                   'location' => 'query',
                   'type' => 'string',
@@ -200,6 +252,37 @@ class Google_Service_CloudMonitoring extends Google_Service
 class Google_Service_CloudMonitoring_MetricDescriptors_Resource extends Google_Service_Resource
 {
 
+  /**
+   * Create a new metric. (metricDescriptors.create)
+   *
+   * @param string $project The project id. The value can be the numeric project
+   * ID or string-based project name.
+   * @param Google_MetricDescriptor $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_CloudMonitoring_MetricDescriptor
+   */
+  public function create($project, Google_Service_CloudMonitoring_MetricDescriptor $postBody, $optParams = array())
+  {
+    $params = array('project' => $project, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('create', array($params), "Google_Service_CloudMonitoring_MetricDescriptor");
+  }
+
+  /**
+   * Delete an existing metric. (metricDescriptors.delete)
+   *
+   * @param string $project The project ID to which the metric belongs.
+   * @param string $metric Name of the metric.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_CloudMonitoring_DeleteMetricDescriptorResponse
+   */
+  public function delete($project, $metric, $optParams = array())
+  {
+    $params = array('project' => $project, 'metric' => $metric);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params), "Google_Service_CloudMonitoring_DeleteMetricDescriptorResponse");
+  }
+
   /**
    * List metric descriptors that match the query. If the query is not set, then
    * all of the metric descriptors will be returned. Large responses will be
@@ -269,6 +352,9 @@ class Google_Service_CloudMonitoring_Timeseries_Resource extends Google_Service_
    *
    * If neither oldest nor timespan is specified, the default time interval will
    * be (youngest - 4 hours, youngest].
+   * @opt_param string aggregator The aggregation function that will reduce the
+   * data points in each window to a single point. This parameter is only valid
+   * for non-cumulative metrics with a value type of INT64 or DOUBLE.
    * @opt_param string labels A collection of labels for the matching time series,
    * which are represented as: - key==value: key equals the value  - key=~value:
    * key regex matches the value  - key!=value: key does not equal the value  -
@@ -278,6 +364,11 @@ class Google_Service_CloudMonitoring_Timeseries_Resource extends Google_Service_
    * @opt_param string pageToken The pagination token, which is used to page
    * through large result sets. Set this value to the value of the nextPageToken
    * to retrieve the next page of results.
+   * @opt_param string window The sampling window. At most one data point will be
+   * returned for each window in the requested time interval. This parameter is
+   * only valid for non-cumulative metric types. Units: - m: minute  - h: hour  -
+   * d: day  - w: week  Examples: 3m, 4w. Only one unit is allowed, for example:
+   * 2w3d is not allowed; you should use 17d instead.
    * @opt_param string oldest Start of the time interval (exclusive), which is
    * expressed as an RFC 3339 timestamp. If neither oldest nor timespan is
    * specified, the default time interval will be (youngest - 4 hours, youngest]
@@ -289,6 +380,28 @@ class Google_Service_CloudMonitoring_Timeseries_Resource extends Google_Service_
     $params = array_merge($params, $optParams);
     return $this->call('list', array($params), "Google_Service_CloudMonitoring_ListTimeseriesResponse");
   }
+
+  /**
+   * Put data points to one or more time series for one or more metrics. If a time
+   * series does not exist, a new time series will be created. It is not allowed
+   * to write a time series point that is older than the existing youngest point
+   * of that time series. Points that are older than the existing youngest point
+   * of that time series will be discarded silently. Therefore, users should make
+   * sure that points of a time series are written sequentially in the order of
+   * their end time. (timeseries.write)
+   *
+   * @param string $project The project ID. The value can be the numeric project
+   * ID or string-based project name.
+   * @param Google_WriteTimeseriesRequest $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_CloudMonitoring_WriteTimeseriesResponse
+   */
+  public function write($project, Google_Service_CloudMonitoring_WriteTimeseriesRequest $postBody, $optParams = array())
+  {
+    $params = array('project' => $project, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('write', array($params), "Google_Service_CloudMonitoring_WriteTimeseriesResponse");
+  }
 }
 
 /**
@@ -329,6 +442,9 @@ class Google_Service_CloudMonitoring_TimeseriesDescriptors_Resource extends Goog
    *
    * If neither oldest nor timespan is specified, the default time interval will
    * be (youngest - 4 hours, youngest].
+   * @opt_param string aggregator The aggregation function that will reduce the
+   * data points in each window to a single point. This parameter is only valid
+   * for non-cumulative metrics with a value type of INT64 or DOUBLE.
    * @opt_param string labels A collection of labels for the matching time series,
    * which are represented as: - key==value: key equals the value  - key=~value:
    * key regex matches the value  - key!=value: key does not equal the value  -
@@ -338,6 +454,11 @@ class Google_Service_CloudMonitoring_TimeseriesDescriptors_Resource extends Goog
    * @opt_param string pageToken The pagination token, which is used to page
    * through large result sets. Set this value to the value of the nextPageToken
    * to retrieve the next page of results.
+   * @opt_param string window The sampling window. At most one data point will be
+   * returned for each window in the requested time interval. This parameter is
+   * only valid for non-cumulative metric types. Units: - m: minute  - h: hour  -
+   * d: day  - w: week  Examples: 3m, 4w. Only one unit is allowed, for example:
+   * 2w3d is not allowed; you should use 17d instead.
    * @opt_param string oldest Start of the time interval (exclusive), which is
    * expressed as an RFC 3339 timestamp. If neither oldest nor timespan is
    * specified, the default time interval will be (youngest - 4 hours, youngest]
@@ -354,6 +475,23 @@ class Google_Service_CloudMonitoring_TimeseriesDescriptors_Resource extends Goog
 
 
 
+class Google_Service_CloudMonitoring_DeleteMetricDescriptorResponse extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $kind;
+
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+}
+
 class Google_Service_CloudMonitoring_ListMetricDescriptorsRequest extends Google_Model
 {
   protected $internal_gapi_mappings = array(
@@ -951,3 +1089,80 @@ class Google_Service_CloudMonitoring_TimeseriesDescriptorLabel extends Google_Mo
 class Google_Service_CloudMonitoring_TimeseriesDescriptorLabels extends Google_Model
 {
 }
+
+class Google_Service_CloudMonitoring_TimeseriesPoint extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  protected $pointType = 'Google_Service_CloudMonitoring_Point';
+  protected $pointDataType = '';
+  protected $timeseriesDescType = 'Google_Service_CloudMonitoring_TimeseriesDescriptor';
+  protected $timeseriesDescDataType = '';
+
+
+  public function setPoint(Google_Service_CloudMonitoring_Point $point)
+  {
+    $this->point = $point;
+  }
+  public function getPoint()
+  {
+    return $this->point;
+  }
+  public function setTimeseriesDesc(Google_Service_CloudMonitoring_TimeseriesDescriptor $timeseriesDesc)
+  {
+    $this->timeseriesDesc = $timeseriesDesc;
+  }
+  public function getTimeseriesDesc()
+  {
+    return $this->timeseriesDesc;
+  }
+}
+
+class Google_Service_CloudMonitoring_WriteTimeseriesRequest extends Google_Collection
+{
+  protected $collection_key = 'timeseries';
+  protected $internal_gapi_mappings = array(
+  );
+  public $commonLabels;
+  protected $timeseriesType = 'Google_Service_CloudMonitoring_TimeseriesPoint';
+  protected $timeseriesDataType = 'array';
+
+
+  public function setCommonLabels($commonLabels)
+  {
+    $this->commonLabels = $commonLabels;
+  }
+  public function getCommonLabels()
+  {
+    return $this->commonLabels;
+  }
+  public function setTimeseries($timeseries)
+  {
+    $this->timeseries = $timeseries;
+  }
+  public function getTimeseries()
+  {
+    return $this->timeseries;
+  }
+}
+
+class Google_Service_CloudMonitoring_WriteTimeseriesRequestCommonLabels extends Google_Model
+{
+}
+
+class Google_Service_CloudMonitoring_WriteTimeseriesResponse extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $kind;
+
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+}

lib/google/src/Google/Service/Cloudlatencytest.php

@@ -0,0 +1,295 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * Service definition for Cloudlatencytest (v2).
+ *
+ * <p>
+ * A Test API to report latency data.</p>
+ *
+ * <p>
+ * For more information about this service, see the API
+ * <a href="" target="_blank">Documentation</a>
+ * </p>
+ *
+ * @author Google, Inc.
+ */
+class Google_Service_Cloudlatencytest extends Google_Service
+{
+  /** View monitoring data for all of your Google Cloud and API projects. */
+  const MONITORING_READONLY =
+      "https://www.googleapis.com/auth/monitoring.readonly";
+
+  public $statscollection;
+  
+
+  /**
+   * Constructs the internal representation of the Cloudlatencytest service.
+   *
+   * @param Google_Client $client
+   */
+  public function __construct(Google_Client $client)
+  {
+    parent::__construct($client);
+    $this->rootUrl = 'https://cloudlatencytest-pa.googleapis.com/';
+    $this->servicePath = 'v2/statscollection/';
+    $this->version = 'v2';
+    $this->serviceName = 'cloudlatencytest';
+
+    $this->statscollection = new Google_Service_Cloudlatencytest_Statscollection_Resource(
+        $this,
+        $this->serviceName,
+        'statscollection',
+        array(
+          'methods' => array(
+            'updateaggregatedstats' => array(
+              'path' => 'updateaggregatedstats',
+              'httpMethod' => 'POST',
+              'parameters' => array(),
+            ),'updatestats' => array(
+              'path' => 'updatestats',
+              'httpMethod' => 'POST',
+              'parameters' => array(),
+            ),
+          )
+        )
+    );
+  }
+}
+
+
+/**
+ * The "statscollection" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $cloudlatencytestService = new Google_Service_Cloudlatencytest(...);
+ *   $statscollection = $cloudlatencytestService->statscollection;
+ *  </code>
+ */
+class Google_Service_Cloudlatencytest_Statscollection_Resource extends Google_Service_Resource
+{
+
+  /**
+   * RPC to update the new TCP stats. (statscollection.updateaggregatedstats)
+   *
+   * @param Google_AggregatedStats $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Cloudlatencytest_AggregatedStatsReply
+   */
+  public function updateaggregatedstats(Google_Service_Cloudlatencytest_AggregatedStats $postBody, $optParams = array())
+  {
+    $params = array('postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('updateaggregatedstats', array($params), "Google_Service_Cloudlatencytest_AggregatedStatsReply");
+  }
+
+  /**
+   * RPC to update the new TCP stats. (statscollection.updatestats)
+   *
+   * @param Google_Stats $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Cloudlatencytest_StatsReply
+   */
+  public function updatestats(Google_Service_Cloudlatencytest_Stats $postBody, $optParams = array())
+  {
+    $params = array('postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('updatestats', array($params), "Google_Service_Cloudlatencytest_StatsReply");
+  }
+}
+
+
+
+
+class Google_Service_Cloudlatencytest_AggregatedStats extends Google_Collection
+{
+  protected $collection_key = 'stats';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $statsType = 'Google_Service_Cloudlatencytest_Stats';
+  protected $statsDataType = 'array';
+
+
+  public function setStats($stats)
+  {
+    $this->stats = $stats;
+  }
+  public function getStats()
+  {
+    return $this->stats;
+  }
+}
+
+class Google_Service_Cloudlatencytest_AggregatedStatsReply extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $testValue;
+
+
+  public function setTestValue($testValue)
+  {
+    $this->testValue = $testValue;
+  }
+  public function getTestValue()
+  {
+    return $this->testValue;
+  }
+}
+
+class Google_Service_Cloudlatencytest_DoubleValue extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $label;
+  public $value;
+
+
+  public function setLabel($label)
+  {
+    $this->label = $label;
+  }
+  public function getLabel()
+  {
+    return $this->label;
+  }
+  public function setValue($value)
+  {
+    $this->value = $value;
+  }
+  public function getValue()
+  {
+    return $this->value;
+  }
+}
+
+class Google_Service_Cloudlatencytest_IntValue extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $label;
+  public $value;
+
+
+  public function setLabel($label)
+  {
+    $this->label = $label;
+  }
+  public function getLabel()
+  {
+    return $this->label;
+  }
+  public function setValue($value)
+  {
+    $this->value = $value;
+  }
+  public function getValue()
+  {
+    return $this->value;
+  }
+}
+
+class Google_Service_Cloudlatencytest_Stats extends Google_Collection
+{
+  protected $collection_key = 'stringValues';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $doubleValuesType = 'Google_Service_Cloudlatencytest_DoubleValue';
+  protected $doubleValuesDataType = 'array';
+  protected $intValuesType = 'Google_Service_Cloudlatencytest_IntValue';
+  protected $intValuesDataType = 'array';
+  protected $stringValuesType = 'Google_Service_Cloudlatencytest_StringValue';
+  protected $stringValuesDataType = 'array';
+  public $time;
+
+
+  public function setDoubleValues($doubleValues)
+  {
+    $this->doubleValues = $doubleValues;
+  }
+  public function getDoubleValues()
+  {
+    return $this->doubleValues;
+  }
+  public function setIntValues($intValues)
+  {
+    $this->intValues = $intValues;
+  }
+  public function getIntValues()
+  {
+    return $this->intValues;
+  }
+  public function setStringValues($stringValues)
+  {
+    $this->stringValues = $stringValues;
+  }
+  public function getStringValues()
+  {
+    return $this->stringValues;
+  }
+  public function setTime($time)
+  {
+    $this->time = $time;
+  }
+  public function getTime()
+  {
+    return $this->time;
+  }
+}
+
+class Google_Service_Cloudlatencytest_StatsReply extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $testValue;
+
+
+  public function setTestValue($testValue)
+  {
+    $this->testValue = $testValue;
+  }
+  public function getTestValue()
+  {
+    return $this->testValue;
+  }
+}
+
+class Google_Service_Cloudlatencytest_StringValue extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $label;
+  public $value;
+
+
+  public function setLabel($label)
+  {
+    $this->label = $label;
+  }
+  public function getLabel()
+  {
+    return $this->label;
+  }
+  public function setValue($value)
+  {
+    $this->value = $value;
+  }
+  public function getValue()
+  {
+    return $this->value;
+  }
+}

lib/google/src/Google/Service/Cloudresourcemanager.php

@@ -0,0 +1,388 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * Service definition for Cloudresourcemanager (v1beta1).
+ *
+ * <p>
+ * The Google Cloud Resource Manager API provides methods for creating, reading,
+ * and updating of project metadata, including IAM policies, and will shortly
+ * provide the same for other high-level entities (e.g. customers and resource
+ * groups). Longer term, we expect the cloudresourcemanager API to encompass
+ * other Cloud resources as well.</p>
+ *
+ * <p>
+ * For more information about this service, see the API
+ * <a href="https://cloud.google.com/resource-manager" target="_blank">Documentation</a>
+ * </p>
+ *
+ * @author Google, Inc.
+ */
+class Google_Service_Cloudresourcemanager extends Google_Service
+{
+  /** View and manage your data across Google Cloud Platform services. */
+  const CLOUD_PLATFORM =
+      "https://www.googleapis.com/auth/cloud-platform";
+
+  public $projects;
+  
+
+  /**
+   * Constructs the internal representation of the Cloudresourcemanager service.
+   *
+   * @param Google_Client $client
+   */
+  public function __construct(Google_Client $client)
+  {
+    parent::__construct($client);
+    $this->rootUrl = 'https://cloudresourcemanager.googleapis.com/';
+    $this->servicePath = '';
+    $this->version = 'v1beta1';
+    $this->serviceName = 'cloudresourcemanager';
+
+    $this->projects = new Google_Service_Cloudresourcemanager_Projects_Resource(
+        $this,
+        $this->serviceName,
+        'projects',
+        array(
+          'methods' => array(
+            'create' => array(
+              'path' => 'v1beta1/projects',
+              'httpMethod' => 'POST',
+              'parameters' => array(),
+            ),'delete' => array(
+              'path' => 'v1beta1/projects/{projectId}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'get' => array(
+              'path' => 'v1beta1/projects/{projectId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => 'v1beta1/projects',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'filter' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'pageToken' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'pageSize' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+              ),
+            ),'undelete' => array(
+              'path' => 'v1beta1/projects/{projectId}:undelete',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'update' => array(
+              'path' => 'v1beta1/projects/{projectId}',
+              'httpMethod' => 'PUT',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
+  }
+}
+
+
+/**
+ * The "projects" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $cloudresourcemanagerService = new Google_Service_Cloudresourcemanager(...);
+ *   $projects = $cloudresourcemanagerService->projects;
+ *  </code>
+ */
+class Google_Service_Cloudresourcemanager_Projects_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Creates a project resource. Initially, the project resource is owned by its
+   * creator exclusively. The creator can later grant permission to others to read
+   * or update the project. Several APIs are activated automatically for the
+   * project, including Google Cloud Storage. (projects.create)
+   *
+   * @param Google_Project $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Cloudresourcemanager_Project
+   */
+  public function create(Google_Service_Cloudresourcemanager_Project $postBody, $optParams = array())
+  {
+    $params = array('postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('create', array($params), "Google_Service_Cloudresourcemanager_Project");
+  }
+
+  /**
+   * Marks the project identified by the specified `project_id` (for example, `my-
+   * project-123`) for deletion. This method will only affect the project if it
+   * has a lifecycle state of
+   * [ACTIVE][cloudresourcemanager.projects.v1beta2.LifecycleState.ACTIVE] when
+   * this method is called. Otherwise this method does nothing (since all other
+   * states are phases of deletion). This method changes the project's lifecycle
+   * state from
+   * [ACTIVE][cloudresourcemanager.projects.v1beta2.LifecycleState.ACTIVE] to
+   * [DELETE_REQUESTED]
+   * [cloudresourcemanager.projects.v1beta2.LifecycleState.DELETE_REQUESTED]. The
+   * deletion starts at an unspecified time, at which point the lifecycle state
+   * changes to [DELETE_IN_PROGRESS]
+   * [cloudresourcemanager.projects.v1beta2.LifecycleState.DELETE_IN_PROGRESS].
+   * Until the deletion completes, you can check the lifecycle state checked by
+   * retrieving the project with [GetProject]
+   * [cloudresourcemanager.projects.v1beta2.Projects.GetProject], and the project
+   * remains visible to [ListProjects]
+   * [cloudresourcemanager.projects.v1beta2.Projects.ListProjects]. However, you
+   * cannot update the project. After the deletion completes, the project is not
+   * retrievable by the [GetProject]
+   * [cloudresourcemanager.projects.v1beta2.Projects.GetProject] and
+   * [ListProjects] [cloudresourcemanager.projects.v1beta2.Projects.ListProjects]
+   * methods. The caller must have modify permissions for this project.
+   * (projects.delete)
+   *
+   * @param string $projectId The project ID (for example, `foo-bar-123`).
+   * Required.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Cloudresourcemanager_Empty
+   */
+  public function delete($projectId, $optParams = array())
+  {
+    $params = array('projectId' => $projectId);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params), "Google_Service_Cloudresourcemanager_Empty");
+  }
+
+  /**
+   * Retrieves the project identified by the specified `project_id` (for example,
+   * `my-project-123`). The caller must have read permissions for this project.
+   * (projects.get)
+   *
+   * @param string $projectId The project ID (for example, `my-project-123`).
+   * Required.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Cloudresourcemanager_Project
+   */
+  public function get($projectId, $optParams = array())
+  {
+    $params = array('projectId' => $projectId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Cloudresourcemanager_Project");
+  }
+
+  /**
+   * Lists projects that are visible to the user and satisfy the specified filter.
+   * This method returns projects in an unspecified order. New projects do not
+   * necessarily appear at the end of the list. (projects.listProjects)
+   *
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string filter An expression for filtering the results of the
+   * request. Filter rules are case insensitive. The fields eligible for filtering
+   * are: name id labels. where  is a the name of a label Examples: name:* ==> The
+   * project has a name. name:Howl ==> The project’s name is `Howl` or 'howl'.
+   * name:HOWL ==> Equivalent to above. NAME:howl ==> Equivalent to above.
+   * labels.color:* ==> The project has the label "color". labels.color:red ==>
+   * The project’s label `color` has the value `red`. labels.color:red
+   * label.size:big ==> The project's label `color` has the value `red` and its
+   * label `size` has the value `big`. Optional.
+   * @opt_param string pageToken A pagination token returned from a previous call
+   * to ListProject that indicates from where listing should continue. Note:
+   * pagination is not yet supported; the server ignores this field. Optional.
+   * @opt_param int pageSize The maximum number of Projects to return in the
+   * response. The server can return fewer projects than requested. If
+   * unspecified, server picks an appropriate default. Note: pagination is not yet
+   * supported; the server ignores this field. Optional.
+   * @return Google_Service_Cloudresourcemanager_ListProjectsResponse
+   */
+  public function listProjects($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Cloudresourcemanager_ListProjectsResponse");
+  }
+
+  /**
+   * Restores the project identified by the specified `project_id` (for example,
+   * `my-project-123`). You can only use this method for a project that has a
+   * lifecycle state of [DELETE_REQUESTED]
+   * [cloudresourcemanager.projects.v1beta2.LifecycleState.DELETE_REQUESTED].
+   * After deletion starts, as indicated by a lifecycle state of
+   * [DELETE_IN_PROGRESS]
+   * [cloudresourcemanager.projects.v1beta2.LifecycleState.DELETE_IN_PROGRESS],
+   * the project cannot be restored. The caller must have modify permissions for
+   * this project. (projects.undelete)
+   *
+   * @param string $projectId The project ID (for example, `foo-bar-123`).
+   * Required.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Cloudresourcemanager_Empty
+   */
+  public function undelete($projectId, $optParams = array())
+  {
+    $params = array('projectId' => $projectId);
+    $params = array_merge($params, $optParams);
+    return $this->call('undelete', array($params), "Google_Service_Cloudresourcemanager_Empty");
+  }
+
+  /**
+   * Updates the attributes of the project identified by the specified
+   * `project_id` (for example, `my-project-123`). The caller must have modify
+   * permissions for this project. (projects.update)
+   *
+   * @param string $projectId The project ID (for example, `my-project-123`).
+   * Required.
+   * @param Google_Project $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Cloudresourcemanager_Project
+   */
+  public function update($projectId, Google_Service_Cloudresourcemanager_Project $postBody, $optParams = array())
+  {
+    $params = array('projectId' => $projectId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('update', array($params), "Google_Service_Cloudresourcemanager_Project");
+  }
+}
+
+
+
+
+class Google_Service_Cloudresourcemanager_Empty extends Google_Model
+{
+}
+
+class Google_Service_Cloudresourcemanager_ListProjectsResponse extends Google_Collection
+{
+  protected $collection_key = 'projects';
+  protected $internal_gapi_mappings = array(
+  );
+  public $nextPageToken;
+  protected $projectsType = 'Google_Service_Cloudresourcemanager_Project';
+  protected $projectsDataType = 'array';
+
+
+  public function setNextPageToken($nextPageToken)
+  {
+    $this->nextPageToken = $nextPageToken;
+  }
+  public function getNextPageToken()
+  {
+    return $this->nextPageToken;
+  }
+  public function setProjects($projects)
+  {
+    $this->projects = $projects;
+  }
+  public function getProjects()
+  {
+    return $this->projects;
+  }
+}
+
+class Google_Service_Cloudresourcemanager_Project extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $createTime;
+  public $labels;
+  public $lifecycleState;
+  public $name;
+  public $projectId;
+  public $projectNumber;
+
+
+  public function setCreateTime($createTime)
+  {
+    $this->createTime = $createTime;
+  }
+  public function getCreateTime()
+  {
+    return $this->createTime;
+  }
+  public function setLabels($labels)
+  {
+    $this->labels = $labels;
+  }
+  public function getLabels()
+  {
+    return $this->labels;
+  }
+  public function setLifecycleState($lifecycleState)
+  {
+    $this->lifecycleState = $lifecycleState;
+  }
+  public function getLifecycleState()
+  {
+    return $this->lifecycleState;
+  }
+  public function setName($name)
+  {
+    $this->name = $name;
+  }
+  public function getName()
+  {
+    return $this->name;
+  }
+  public function setProjectId($projectId)
+  {
+    $this->projectId = $projectId;
+  }
+  public function getProjectId()
+  {
+    return $this->projectId;
+  }
+  public function setProjectNumber($projectNumber)
+  {
+    $this->projectNumber = $projectNumber;
+  }
+  public function getProjectNumber()
+  {
+    return $this->projectNumber;
+  }
+}
+
+class Google_Service_Cloudresourcemanager_ProjectLabels extends Google_Model
+{
+}

lib/google/src/Google/Service/Cloudsearch.php

@@ -0,0 +1,53 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * Service definition for Cloudsearch (v1).
+ *
+ * <p>
+ * The Google Cloud Search API defines an application interface to index
+ * documents that contain structured data and to search those indexes. It
+ * supports full text search.</p>
+ *
+ * <p>
+ * For more information about this service, see the API
+ * <a href="" target="_blank">Documentation</a>
+ * </p>
+ *
+ * @author Google, Inc.
+ */
+class Google_Service_Cloudsearch extends Google_Service
+{
+
+
+
+  
+
+  /**
+   * Constructs the internal representation of the Cloudsearch service.
+   *
+   * @param Google_Client $client
+   */
+  public function __construct(Google_Client $client)
+  {
+    parent::__construct($client);
+    $this->servicePath = '';
+    $this->version = 'v1';
+    $this->serviceName = 'cloudsearch';
+
+  }
+}

lib/google/src/Google/Service/Container.php

@@ -16,7 +16,7 @@
  */
 
 /**
- * Service definition for Container (v1beta1).
+ * Service definition for Container (v1).
  *
  * <p>
  * The Google Container Engine API is used for building and managing container
@@ -24,7 +24,7 @@
  *
  * <p>
  * For more information about this service, see the API
- * <a href="" target="_blank">Documentation</a>
+ * <a href="https://cloud.google.com/container-engine/" target="_blank">Documentation</a>
  * </p>
  *
  * @author Google, Inc.
@@ -35,8 +35,6 @@ class Google_Service_Container extends Google_Service
   const CLOUD_PLATFORM =
       "https://www.googleapis.com/auth/cloud-platform";
 
-  public $projects_clusters;
-  public $projects_operations;
   public $projects_zones_clusters;
   public $projects_zones_operations;
   
@@ -49,50 +47,11 @@ class Google_Service_Container extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
-    $this->servicePath = 'container/v1beta1/projects/';
-    $this->version = 'v1beta1';
+    $this->rootUrl = 'https://container.googleapis.com/';
+    $this->servicePath = '';
+    $this->version = 'v1';
     $this->serviceName = 'container';
 
-    $this->projects_clusters = new Google_Service_Container_ProjectsClusters_Resource(
-        $this,
-        $this->serviceName,
-        'clusters',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => '{projectId}/clusters',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_operations = new Google_Service_Container_ProjectsOperations_Resource(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => '{projectId}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
     $this->projects_zones_clusters = new Google_Service_Container_ProjectsZonesClusters_Resource(
         $this,
         $this->serviceName,
@@ -100,7 +59,7 @@ class Google_Service_Container extends Google_Service
         array(
           'methods' => array(
             'create' => array(
-              'path' => '{projectId}/zones/{zoneId}/clusters',
+              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters',
               'httpMethod' => 'POST',
               'parameters' => array(
                 'projectId' => array(
@@ -108,14 +67,14 @@ class Google_Service_Container extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
-                'zoneId' => array(
+                'zone' => array(
                   'location' => 'path',
                   'type' => 'string',
                   'required' => true,
                 ),
               ),
             ),'delete' => array(
-              'path' => '{projectId}/zones/{zoneId}/clusters/{clusterId}',
+              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}',
               'httpMethod' => 'DELETE',
               'parameters' => array(
                 'projectId' => array(
@@ -123,7 +82,7 @@ class Google_Service_Container extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
-                'zoneId' => array(
+                'zone' => array(
                   'location' => 'path',
                   'type' => 'string',
                   'required' => true,
@@ -135,7 +94,7 @@ class Google_Service_Container extends Google_Service
                 ),
               ),
             ),'get' => array(
-              'path' => '{projectId}/zones/{zoneId}/clusters/{clusterId}',
+              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}',
               'httpMethod' => 'GET',
               'parameters' => array(
                 'projectId' => array(
@@ -143,7 +102,7 @@ class Google_Service_Container extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
-                'zoneId' => array(
+                'zone' => array(
                   'location' => 'path',
                   'type' => 'string',
                   'required' => true,
@@ -155,7 +114,7 @@ class Google_Service_Container extends Google_Service
                 ),
               ),
             ),'list' => array(
-              'path' => '{projectId}/zones/{zoneId}/clusters',
+              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters',
               'httpMethod' => 'GET',
               'parameters' => array(
                 'projectId' => array(
@@ -163,7 +122,27 @@ class Google_Service_Container extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
-                'zoneId' => array(
+                'zone' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'update' => array(
+              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}',
+              'httpMethod' => 'PUT',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zone' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'clusterId' => array(
                   'location' => 'path',
                   'type' => 'string',
                   'required' => true,
@@ -180,7 +159,7 @@ class Google_Service_Container extends Google_Service
         array(
           'methods' => array(
             'get' => array(
-              'path' => '{projectId}/zones/{zoneId}/operations/{operationId}',
+              'path' => 'v1/projects/{projectId}/zones/{zone}/operations/{operationId}',
               'httpMethod' => 'GET',
               'parameters' => array(
                 'projectId' => array(
@@ -188,7 +167,7 @@ class Google_Service_Container extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
-                'zoneId' => array(
+                'zone' => array(
                   'location' => 'path',
                   'type' => 'string',
                   'required' => true,
@@ -200,7 +179,7 @@ class Google_Service_Container extends Google_Service
                 ),
               ),
             ),'list' => array(
-              'path' => '{projectId}/zones/{zoneId}/operations',
+              'path' => 'v1/projects/{projectId}/zones/{zone}/operations',
               'httpMethod' => 'GET',
               'parameters' => array(
                 'projectId' => array(
@@ -208,7 +187,7 @@ class Google_Service_Container extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
-                'zoneId' => array(
+                'zone' => array(
                   'location' => 'path',
                   'type' => 'string',
                   'required' => true,
@@ -234,60 +213,6 @@ class Google_Service_Container_Projects_Resource extends Google_Service_Resource
 {
 }
 
-/**
- * The "clusters" collection of methods.
- * Typical usage is:
- *  <code>
- *   $containerService = new Google_Service_Container(...);
- *   $clusters = $containerService->clusters;
- *  </code>
- */
-class Google_Service_Container_ProjectsClusters_Resource extends Google_Service_Resource
-{
-
-  /**
-   * Lists all clusters owned by a project across all zones.
-   * (clusters.listProjectsClusters)
-   *
-   * @param string $projectId The Google Developers Console project ID or  project
-   * number.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_ListAggregatedClustersResponse
-   */
-  public function listProjectsClusters($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Container_ListAggregatedClustersResponse");
-  }
-}
-/**
- * The "operations" collection of methods.
- * Typical usage is:
- *  <code>
- *   $containerService = new Google_Service_Container(...);
- *   $operations = $containerService->operations;
- *  </code>
- */
-class Google_Service_Container_ProjectsOperations_Resource extends Google_Service_Resource
-{
-
-  /**
-   * Lists all operations in a project, across all zones.
-   * (operations.listProjectsOperations)
-   *
-   * @param string $projectId The Google Developers Console project ID or  project
-   * number.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_ListAggregatedOperationsResponse
-   */
-  public function listProjectsOperations($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Container_ListAggregatedOperationsResponse");
-  }
-}
 /**
  * The "zones" collection of methods.
  * Typical usage is:
@@ -313,50 +238,47 @@ class Google_Service_Container_ProjectsZonesClusters_Resource extends Google_Ser
 
   /**
    * Creates a cluster, consisting of the specified number and type of Google
-   * Compute Engine instances, plus a Kubernetes master instance.
+   * Compute Engine instances, plus a Kubernetes master endpoint. By default, the
+   * cluster is created in the project's [default
+   * network]('/compute/docs/networking#networks_1'). One firewall is added for
+   * the cluster. After cluster creation, the cluster creates routes for each node
+   * to allow the containers on that node to communicate with all other instances
+   * in the cluster. Finally, an entry is added to the project's global metadata
+   * indicating which CIDR range is being used by the cluster. (clusters.create)
    *
-   * The cluster is created in the project's default network.
-   *
-   * A firewall is added that allows traffic into port 443 on the master, which
-   * enables HTTPS. A firewall and a route is added for each node to allow the
-   * containers on that node to communicate with all other instances in the
-   * cluster.
-   *
-   * Finally, a route named k8s-iproute-10-xx-0-0 is created to track that the
-   * cluster's 10.xx.0.0/16 CIDR has been assigned. (clusters.create)
-   *
-   * @param string $projectId The Google Developers Console project ID or  project
-   * number.
-   * @param string $zoneId The name of the Google Compute Engine zone in which the
-   * cluster resides.
+   * @param string $projectId The Google Developers Console [project
+   * ID](https://console.developers.google.com/project) or [project
+   * number](https://developers.google.com/console/help/project-number)
+   * @param string $zone The name of the Google Compute Engine
+   * [zone](/compute/docs/zones#available) in which the cluster resides.
    * @param Google_CreateClusterRequest $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Container_Operation
    */
-  public function create($projectId, $zoneId, Google_Service_Container_CreateClusterRequest $postBody, $optParams = array())
+  public function create($projectId, $zone, Google_Service_Container_CreateClusterRequest $postBody, $optParams = array())
   {
-    $params = array('projectId' => $projectId, 'zoneId' => $zoneId, 'postBody' => $postBody);
+    $params = array('projectId' => $projectId, 'zone' => $zone, 'postBody' => $postBody);
     $params = array_merge($params, $optParams);
     return $this->call('create', array($params), "Google_Service_Container_Operation");
   }
 
   /**
-   * Deletes the cluster, including the Kubernetes master and all worker nodes.
-   *
-   * Firewalls and routes that were configured at cluster creation are also
+   * Deletes the cluster, including the Kubernetes endpoint and all worker nodes.
+   * Firewalls and routes that were configured during cluster creation are also
    * deleted. (clusters.delete)
    *
-   * @param string $projectId The Google Developers Console project ID or  project
-   * number.
-   * @param string $zoneId The name of the Google Compute Engine zone in which the
-   * cluster resides.
+   * @param string $projectId The Google Developers Console [project
+   * ID](https://console.developers.google.com/project) or [project
+   * number](https://developers.google.com/console/help/project-number)
+   * @param string $zone The name of the Google Compute Engine
+   * [zone](/compute/docs/zones#available) in which the cluster resides.
    * @param string $clusterId The name of the cluster to delete.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Container_Operation
    */
-  public function delete($projectId, $zoneId, $clusterId, $optParams = array())
+  public function delete($projectId, $zone, $clusterId, $optParams = array())
   {
-    $params = array('projectId' => $projectId, 'zoneId' => $zoneId, 'clusterId' => $clusterId);
+    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId);
     $params = array_merge($params, $optParams);
     return $this->call('delete', array($params), "Google_Service_Container_Operation");
   }
@@ -364,38 +286,61 @@ class Google_Service_Container_ProjectsZonesClusters_Resource extends Google_Ser
   /**
    * Gets a specific cluster. (clusters.get)
    *
-   * @param string $projectId The Google Developers Console project ID or  project
-   * number.
-   * @param string $zoneId The name of the Google Compute Engine zone in which the
-   * cluster resides.
+   * @param string $projectId The Google Developers Console A [project
+   * ID](https://console.developers.google.com/project) or [project
+   * number](https://developers.google.com/console/help/project-number)
+   * @param string $zone The name of the Google Compute Engine
+   * [zone](/compute/docs/zones#available) in which the cluster resides.
    * @param string $clusterId The name of the cluster to retrieve.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Container_Cluster
    */
-  public function get($projectId, $zoneId, $clusterId, $optParams = array())
+  public function get($projectId, $zone, $clusterId, $optParams = array())
   {
-    $params = array('projectId' => $projectId, 'zoneId' => $zoneId, 'clusterId' => $clusterId);
+    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId);
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_Container_Cluster");
   }
 
   /**
-   * Lists all clusters owned by a project in the specified zone.
-   * (clusters.listProjectsZonesClusters)
+   * Lists all clusters owned by a project in either the specified zone or all
+   * zones. (clusters.listProjectsZonesClusters)
    *
-   * @param string $projectId The Google Developers Console project ID or  project
-   * number.
-   * @param string $zoneId The name of the Google Compute Engine zone in which the
-   * cluster resides.
+   * @param string $projectId The Google Developers Console [project
+   * ID](https://console.developers.google.com/project) or [project
+   * number](https://developers.google.com/console/help/project-number)
+   * @param string $zone The name of the Google Compute Engine
+   * [zone](/compute/docs/zones#available) in which the cluster resides, or "-"
+   * for all zones.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Container_ListClustersResponse
    */
-  public function listProjectsZonesClusters($projectId, $zoneId, $optParams = array())
+  public function listProjectsZonesClusters($projectId, $zone, $optParams = array())
   {
-    $params = array('projectId' => $projectId, 'zoneId' => $zoneId);
+    $params = array('projectId' => $projectId, 'zone' => $zone);
     $params = array_merge($params, $optParams);
     return $this->call('list', array($params), "Google_Service_Container_ListClustersResponse");
   }
+
+  /**
+   * Update settings of a specific cluster. (clusters.update)
+   *
+   * @param string $projectId The Google Developers Console [project
+   * ID](https://console.developers.google.com/project) or [project
+   * number](https://developers.google.com/console/help/project-number)
+   * @param string $zone The name of the Google Compute Engine
+   * [zone](/compute/docs/zones#available) in which the cluster resides.
+   * @param string $clusterId The name of the cluster to upgrade.
+   * @param Google_UpdateClusterRequest $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Container_Operation
+   */
+  public function update($projectId, $zone, $clusterId, Google_Service_Container_UpdateClusterRequest $postBody, $optParams = array())
+  {
+    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('update', array($params), "Google_Service_Container_Operation");
+  }
 }
 /**
  * The "operations" collection of methods.
@@ -411,36 +356,38 @@ class Google_Service_Container_ProjectsZonesOperations_Resource extends Google_S
   /**
    * Gets the specified operation. (operations.get)
    *
-   * @param string $projectId The Google Developers Console project ID or  project
-   * number.
-   * @param string $zoneId The name of the Google Compute Engine zone in which the
-   * operation resides. This is always the same zone as the cluster with which the
-   * operation is associated.
-   * @param string $operationId The server-assigned name of the operation.
+   * @param string $projectId The Google Developers Console [project
+   * ID](https://console.developers.google.com/project) or [project
+   * number](https://developers.google.com/console/help/project-number)
+   * @param string $zone The name of the Google Compute Engine
+   * [zone](/compute/docs/zones#available) in which the cluster resides.
+   * @param string $operationId The server-assigned `name` of the operation.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Container_Operation
    */
-  public function get($projectId, $zoneId, $operationId, $optParams = array())
+  public function get($projectId, $zone, $operationId, $optParams = array())
   {
-    $params = array('projectId' => $projectId, 'zoneId' => $zoneId, 'operationId' => $operationId);
+    $params = array('projectId' => $projectId, 'zone' => $zone, 'operationId' => $operationId);
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_Container_Operation");
   }
 
   /**
-   * Lists all operations in a project in a specific zone.
+   * Lists all operations in a project in a specific zone or all zones.
    * (operations.listProjectsZonesOperations)
    *
-   * @param string $projectId The Google Developers Console project ID or  project
-   * number.
-   * @param string $zoneId The name of the Google Compute Engine zone to return
-   * operations for.
+   * @param string $projectId The Google Developers Console [project
+   * ID](https://console.developers.google.com/project) or [project
+   * number](https://developers.google.com/console/help/project-number)
+   * @param string $zone The name of the Google Compute Engine
+   * [zone](/compute/docs/zones#available) to return operations for, or "-" for
+   * all zones.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Container_ListOperationsResponse
    */
-  public function listProjectsZonesOperations($projectId, $zoneId, $optParams = array())
+  public function listProjectsZonesOperations($projectId, $zone, $optParams = array())
   {
-    $params = array('projectId' => $projectId, 'zoneId' => $zoneId);
+    $params = array('projectId' => $projectId, 'zone' => $zone);
     $params = array_merge($params, $optParams);
     return $this->call('list', array($params), "Google_Service_Container_ListOperationsResponse");
   }
@@ -449,51 +396,67 @@ class Google_Service_Container_ProjectsZonesOperations_Resource extends Google_S
 
 
 
-class Google_Service_Container_Cluster extends Google_Model
+class Google_Service_Container_Cluster extends Google_Collection
 {
+  protected $collection_key = 'instanceGroupUrls';
   protected $internal_gapi_mappings = array(
   );
-  public $clusterApiVersion;
-  public $containerIpv4Cidr;
-  public $creationTimestamp;
+  public $clusterIpv4Cidr;
+  public $createTime;
+  public $currentMasterVersion;
+  public $currentNodeVersion;
   public $description;
   public $endpoint;
+  public $initialClusterVersion;
+  public $initialNodeCount;
+  public $instanceGroupUrls;
+  public $loggingService;
   protected $masterAuthType = 'Google_Service_Container_MasterAuth';
   protected $masterAuthDataType = '';
+  public $monitoringService;
   public $name;
+  public $network;
   protected $nodeConfigType = 'Google_Service_Container_NodeConfig';
   protected $nodeConfigDataType = '';
-  public $nodeRoutingPrefixSize;
-  public $numNodes;
+  public $nodeIpv4CidrSize;
+  public $selfLink;
   public $servicesIpv4Cidr;
   public $status;
   public $statusMessage;
   public $zone;
 
 
-  public function setClusterApiVersion($clusterApiVersion)
+  public function setClusterIpv4Cidr($clusterIpv4Cidr)
   {
-    $this->clusterApiVersion = $clusterApiVersion;
+    $this->clusterIpv4Cidr = $clusterIpv4Cidr;
   }
-  public function getClusterApiVersion()
+  public function getClusterIpv4Cidr()
   {
-    return $this->clusterApiVersion;
+    return $this->clusterIpv4Cidr;
   }
-  public function setContainerIpv4Cidr($containerIpv4Cidr)
+  public function setCreateTime($createTime)
   {
-    $this->containerIpv4Cidr = $containerIpv4Cidr;
+    $this->createTime = $createTime;
   }
-  public function getContainerIpv4Cidr()
+  public function getCreateTime()
   {
-    return $this->containerIpv4Cidr;
+    return $this->createTime;
   }
-  public function setCreationTimestamp($creationTimestamp)
+  public function setCurrentMasterVersion($currentMasterVersion)
   {
-    $this->creationTimestamp = $creationTimestamp;
+    $this->currentMasterVersion = $currentMasterVersion;
   }
-  public function getCreationTimestamp()
+  public function getCurrentMasterVersion()
   {
-    return $this->creationTimestamp;
+    return $this->currentMasterVersion;
+  }
+  public function setCurrentNodeVersion($currentNodeVersion)
+  {
+    $this->currentNodeVersion = $currentNodeVersion;
+  }
+  public function getCurrentNodeVersion()
+  {
+    return $this->currentNodeVersion;
   }
   public function setDescription($description)
   {
@@ -511,6 +474,38 @@ class Google_Service_Container_Cluster extends Google_Model
   {
     return $this->endpoint;
   }
+  public function setInitialClusterVersion($initialClusterVersion)
+  {
+    $this->initialClusterVersion = $initialClusterVersion;
+  }
+  public function getInitialClusterVersion()
+  {
+    return $this->initialClusterVersion;
+  }
+  public function setInitialNodeCount($initialNodeCount)
+  {
+    $this->initialNodeCount = $initialNodeCount;
+  }
+  public function getInitialNodeCount()
+  {
+    return $this->initialNodeCount;
+  }
+  public function setInstanceGroupUrls($instanceGroupUrls)
+  {
+    $this->instanceGroupUrls = $instanceGroupUrls;
+  }
+  public function getInstanceGroupUrls()
+  {
+    return $this->instanceGroupUrls;
+  }
+  public function setLoggingService($loggingService)
+  {
+    $this->loggingService = $loggingService;
+  }
+  public function getLoggingService()
+  {
+    return $this->loggingService;
+  }
   public function setMasterAuth(Google_Service_Container_MasterAuth $masterAuth)
   {
     $this->masterAuth = $masterAuth;
@@ -519,6 +514,14 @@ class Google_Service_Container_Cluster extends Google_Model
   {
     return $this->masterAuth;
   }
+  public function setMonitoringService($monitoringService)
+  {
+    $this->monitoringService = $monitoringService;
+  }
+  public function getMonitoringService()
+  {
+    return $this->monitoringService;
+  }
   public function setName($name)
   {
     $this->name = $name;
@@ -527,6 +530,14 @@ class Google_Service_Container_Cluster extends Google_Model
   {
     return $this->name;
   }
+  public function setNetwork($network)
+  {
+    $this->network = $network;
+  }
+  public function getNetwork()
+  {
+    return $this->network;
+  }
   public function setNodeConfig(Google_Service_Container_NodeConfig $nodeConfig)
   {
     $this->nodeConfig = $nodeConfig;
@@ -535,21 +546,21 @@ class Google_Service_Container_Cluster extends Google_Model
   {
     return $this->nodeConfig;
   }
-  public function setNodeRoutingPrefixSize($nodeRoutingPrefixSize)
+  public function setNodeIpv4CidrSize($nodeIpv4CidrSize)
   {
-    $this->nodeRoutingPrefixSize = $nodeRoutingPrefixSize;
+    $this->nodeIpv4CidrSize = $nodeIpv4CidrSize;
   }
-  public function getNodeRoutingPrefixSize()
+  public function getNodeIpv4CidrSize()
   {
-    return $this->nodeRoutingPrefixSize;
+    return $this->nodeIpv4CidrSize;
   }
-  public function setNumNodes($numNodes)
+  public function setSelfLink($selfLink)
   {
-    $this->numNodes = $numNodes;
+    $this->selfLink = $selfLink;
   }
-  public function getNumNodes()
+  public function getSelfLink()
   {
-    return $this->numNodes;
+    return $this->selfLink;
   }
   public function setServicesIpv4Cidr($servicesIpv4Cidr)
   {
@@ -585,6 +596,23 @@ class Google_Service_Container_Cluster extends Google_Model
   }
 }
 
+class Google_Service_Container_ClusterUpdate extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $desiredNodeVersion;
+
+
+  public function setDesiredNodeVersion($desiredNodeVersion)
+  {
+    $this->desiredNodeVersion = $desiredNodeVersion;
+  }
+  public function getDesiredNodeVersion()
+  {
+    return $this->desiredNodeVersion;
+  }
+}
+
 class Google_Service_Container_CreateClusterRequest extends Google_Model
 {
   protected $internal_gapi_mappings = array(
@@ -603,44 +631,6 @@ class Google_Service_Container_CreateClusterRequest extends Google_Model
   }
 }
 
-class Google_Service_Container_ListAggregatedClustersResponse extends Google_Collection
-{
-  protected $collection_key = 'clusters';
-  protected $internal_gapi_mappings = array(
-  );
-  protected $clustersType = 'Google_Service_Container_Cluster';
-  protected $clustersDataType = 'array';
-
-
-  public function setClusters($clusters)
-  {
-    $this->clusters = $clusters;
-  }
-  public function getClusters()
-  {
-    return $this->clusters;
-  }
-}
-
-class Google_Service_Container_ListAggregatedOperationsResponse extends Google_Collection
-{
-  protected $collection_key = 'operations';
-  protected $internal_gapi_mappings = array(
-  );
-  protected $operationsType = 'Google_Service_Container_Operation';
-  protected $operationsDataType = 'array';
-
-
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
-
 class Google_Service_Container_ListClustersResponse extends Google_Collection
 {
   protected $collection_key = 'clusters';
@@ -683,10 +673,37 @@ class Google_Service_Container_MasterAuth extends Google_Model
 {
   protected $internal_gapi_mappings = array(
   );
+  public $clientCertificate;
+  public $clientKey;
+  public $clusterCaCertificate;
   public $password;
-  public $user;
+  public $username;
 
 
+  public function setClientCertificate($clientCertificate)
+  {
+    $this->clientCertificate = $clientCertificate;
+  }
+  public function getClientCertificate()
+  {
+    return $this->clientCertificate;
+  }
+  public function setClientKey($clientKey)
+  {
+    $this->clientKey = $clientKey;
+  }
+  public function getClientKey()
+  {
+    return $this->clientKey;
+  }
+  public function setClusterCaCertificate($clusterCaCertificate)
+  {
+    $this->clusterCaCertificate = $clusterCaCertificate;
+  }
+  public function getClusterCaCertificate()
+  {
+    return $this->clusterCaCertificate;
+  }
   public function setPassword($password)
   {
     $this->password = $password;
@@ -695,24 +712,34 @@ class Google_Service_Container_MasterAuth extends Google_Model
   {
     return $this->password;
   }
-  public function setUser($user)
+  public function setUsername($username)
   {
-    $this->user = $user;
+    $this->username = $username;
   }
-  public function getUser()
+  public function getUsername()
   {
-    return $this->user;
+    return $this->username;
   }
 }
 
-class Google_Service_Container_NodeConfig extends Google_Model
+class Google_Service_Container_NodeConfig extends Google_Collection
 {
+  protected $collection_key = 'oauthScopes';
   protected $internal_gapi_mappings = array(
   );
+  public $diskSizeGb;
   public $machineType;
-  public $sourceImage;
+  public $oauthScopes;
 
 
+  public function setDiskSizeGb($diskSizeGb)
+  {
+    $this->diskSizeGb = $diskSizeGb;
+  }
+  public function getDiskSizeGb()
+  {
+    return $this->diskSizeGb;
+  }
   public function setMachineType($machineType)
   {
     $this->machineType = $machineType;
@@ -721,13 +748,13 @@ class Google_Service_Container_NodeConfig extends Google_Model
   {
     return $this->machineType;
   }
-  public function setSourceImage($sourceImage)
+  public function setOauthScopes($oauthScopes)
   {
-    $this->sourceImage = $sourceImage;
+    $this->oauthScopes = $oauthScopes;
   }
-  public function getSourceImage()
+  public function getOauthScopes()
   {
-    return $this->sourceImage;
+    return $this->oauthScopes;
   }
 }
 
@@ -735,22 +762,15 @@ class Google_Service_Container_Operation extends Google_Model
 {
   protected $internal_gapi_mappings = array(
   );
-  public $errorMessage;
   public $name;
   public $operationType;
+  public $selfLink;
   public $status;
-  public $target;
+  public $statusMessage;
+  public $targetLink;
   public $zone;
 
 
-  public function setErrorMessage($errorMessage)
-  {
-    $this->errorMessage = $errorMessage;
-  }
-  public function getErrorMessage()
-  {
-    return $this->errorMessage;
-  }
   public function setName($name)
   {
     $this->name = $name;
@@ -767,6 +787,14 @@ class Google_Service_Container_Operation extends Google_Model
   {
     return $this->operationType;
   }
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
   public function setStatus($status)
   {
     $this->status = $status;
@@ -775,13 +803,21 @@ class Google_Service_Container_Operation extends Google_Model
   {
     return $this->status;
   }
-  public function setTarget($target)
+  public function setStatusMessage($statusMessage)
   {
-    $this->target = $target;
+    $this->statusMessage = $statusMessage;
   }
-  public function getTarget()
+  public function getStatusMessage()
   {
-    return $this->target;
+    return $this->statusMessage;
+  }
+  public function setTargetLink($targetLink)
+  {
+    $this->targetLink = $targetLink;
+  }
+  public function getTargetLink()
+  {
+    return $this->targetLink;
   }
   public function setZone($zone)
   {
@@ -792,3 +828,21 @@ class Google_Service_Container_Operation extends Google_Model
     return $this->zone;
   }
 }
+
+class Google_Service_Container_UpdateClusterRequest extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  protected $updateType = 'Google_Service_Container_ClusterUpdate';
+  protected $updateDataType = '';
+
+
+  public function setUpdate(Google_Service_Container_ClusterUpdate $update)
+  {
+    $this->update = $update;
+  }
+  public function getUpdate()
+  {
+    return $this->update;
+  }
+}

lib/google/src/Google/Service/Coordinate.php

@@ -41,6 +41,7 @@ class Google_Service_Coordinate extends Google_Service
   public $jobs;
   public $location;
   public $schedule;
+  public $team;
   public $worker;
   
 
@@ -52,7 +53,8 @@ class Google_Service_Coordinate extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
-    $this->servicePath = 'coordinate/v1/teams/';
+    $this->rootUrl = 'https://www.googleapis.com/';
+    $this->servicePath = 'coordinate/v1/';
     $this->version = 'v1';
     $this->serviceName = 'coordinate';
 
@@ -63,7 +65,7 @@ class Google_Service_Coordinate extends Google_Service
         array(
           'methods' => array(
             'list' => array(
-              'path' => '{teamId}/custom_fields',
+              'path' => 'teams/{teamId}/custom_fields',
               'httpMethod' => 'GET',
               'parameters' => array(
                 'teamId' => array(
@@ -83,7 +85,7 @@ class Google_Service_Coordinate extends Google_Service
         array(
           'methods' => array(
             'get' => array(
-              'path' => '{teamId}/jobs/{jobId}',
+              'path' => 'teams/{teamId}/jobs/{jobId}',
               'httpMethod' => 'GET',
               'parameters' => array(
                 'teamId' => array(
@@ -98,7 +100,7 @@ class Google_Service_Coordinate extends Google_Service
                 ),
               ),
             ),'insert' => array(
-              'path' => '{teamId}/jobs',
+              'path' => 'teams/{teamId}/jobs',
               'httpMethod' => 'POST',
               'parameters' => array(
                 'teamId' => array(
@@ -149,7 +151,7 @@ class Google_Service_Coordinate extends Google_Service
                 ),
               ),
             ),'list' => array(
-              'path' => '{teamId}/jobs',
+              'path' => 'teams/{teamId}/jobs',
               'httpMethod' => 'GET',
               'parameters' => array(
                 'teamId' => array(
@@ -171,7 +173,7 @@ class Google_Service_Coordinate extends Google_Service
                 ),
               ),
             ),'patch' => array(
-              'path' => '{teamId}/jobs/{jobId}',
+              'path' => 'teams/{teamId}/jobs/{jobId}',
               'httpMethod' => 'PATCH',
               'parameters' => array(
                 'teamId' => array(
@@ -227,7 +229,7 @@ class Google_Service_Coordinate extends Google_Service
                 ),
               ),
             ),'update' => array(
-              'path' => '{teamId}/jobs/{jobId}',
+              'path' => 'teams/{teamId}/jobs/{jobId}',
               'httpMethod' => 'PUT',
               'parameters' => array(
                 'teamId' => array(
@@ -293,7 +295,7 @@ class Google_Service_Coordinate extends Google_Service
         array(
           'methods' => array(
             'list' => array(
-              'path' => '{teamId}/workers/{workerEmail}/locations',
+              'path' => 'teams/{teamId}/workers/{workerEmail}/locations',
               'httpMethod' => 'GET',
               'parameters' => array(
                 'teamId' => array(
@@ -331,7 +333,7 @@ class Google_Service_Coordinate extends Google_Service
         array(
           'methods' => array(
             'get' => array(
-              'path' => '{teamId}/jobs/{jobId}/schedule',
+              'path' => 'teams/{teamId}/jobs/{jobId}/schedule',
               'httpMethod' => 'GET',
               'parameters' => array(
                 'teamId' => array(
@@ -346,7 +348,7 @@ class Google_Service_Coordinate extends Google_Service
                 ),
               ),
             ),'patch' => array(
-              'path' => '{teamId}/jobs/{jobId}/schedule',
+              'path' => 'teams/{teamId}/jobs/{jobId}/schedule',
               'httpMethod' => 'PATCH',
               'parameters' => array(
                 'teamId' => array(
@@ -377,7 +379,7 @@ class Google_Service_Coordinate extends Google_Service
                 ),
               ),
             ),'update' => array(
-              'path' => '{teamId}/jobs/{jobId}/schedule',
+              'path' => 'teams/{teamId}/jobs/{jobId}/schedule',
               'httpMethod' => 'PUT',
               'parameters' => array(
                 'teamId' => array(
@@ -411,6 +413,33 @@ class Google_Service_Coordinate extends Google_Service
           )
         )
     );
+    $this->team = new Google_Service_Coordinate_Team_Resource(
+        $this,
+        $this->serviceName,
+        'team',
+        array(
+          'methods' => array(
+            'list' => array(
+              'path' => 'teams',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'admin' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'worker' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'dispatcher' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+              ),
+            ),
+          )
+        )
+    );
     $this->worker = new Google_Service_Coordinate_Worker_Resource(
         $this,
         $this->serviceName,
@@ -418,7 +447,7 @@ class Google_Service_Coordinate extends Google_Service
         array(
           'methods' => array(
             'list' => array(
-              'path' => '{teamId}/workers',
+              'path' => 'teams/{teamId}/workers',
               'httpMethod' => 'GET',
               'parameters' => array(
                 'teamId' => array(
@@ -505,8 +534,12 @@ class Google_Service_Coordinate_Jobs_Resource extends Google_Service_Resource
    * @opt_param string assignee Assignee email address, or empty string to
    * unassign.
    * @opt_param string customerPhoneNumber Customer phone number
-   * @opt_param string customField Map from custom field id (from
-   * /team//custom_fields) to the field value. For example '123=Alice'
+   * @opt_param string customField Sets the value of custom fields. To set a
+   * custom field, pass the field id (from /team/teamId/custom_fields), a URL
+   * escaped '=' character, and the desired value as a parameter. For example,
+   * customField=12%3DAlice. Repeat the parameter for each custom field. Note that
+   * '=' cannot appear in the parameter value. Specifying an invalid, or inactive
+   * enum field will result in an error 500.
    * @return Google_Service_Coordinate_Job
    */
   public function insert($teamId, $address, $lat, $lng, $title, Google_Service_Coordinate_Job $postBody, $optParams = array())
@@ -554,8 +587,12 @@ class Google_Service_Coordinate_Jobs_Resource extends Google_Service_Resource
    * @opt_param double lat The latitude coordinate of this job's location.
    * @opt_param string progress Job progress
    * @opt_param double lng The longitude coordinate of this job's location.
-   * @opt_param string customField Map from custom field id (from
-   * /team//custom_fields) to the field value. For example '123=Alice'
+   * @opt_param string customField Sets the value of custom fields. To set a
+   * custom field, pass the field id (from /team/teamId/custom_fields), a URL
+   * escaped '=' character, and the desired value as a parameter. For example,
+   * customField=12%3DAlice. Repeat the parameter for each custom field. Note that
+   * '=' cannot appear in the parameter value. Specifying an invalid, or inactive
+   * enum field will result in an error 500.
    * @return Google_Service_Coordinate_Job
    */
   public function patch($teamId, $jobId, Google_Service_Coordinate_Job $postBody, $optParams = array())
@@ -584,8 +621,12 @@ class Google_Service_Coordinate_Jobs_Resource extends Google_Service_Resource
    * @opt_param double lat The latitude coordinate of this job's location.
    * @opt_param string progress Job progress
    * @opt_param double lng The longitude coordinate of this job's location.
-   * @opt_param string customField Map from custom field id (from
-   * /team//custom_fields) to the field value. For example '123=Alice'
+   * @opt_param string customField Sets the value of custom fields. To set a
+   * custom field, pass the field id (from /team/teamId/custom_fields), a URL
+   * escaped '=' character, and the desired value as a parameter. For example,
+   * customField=12%3DAlice. Repeat the parameter for each custom field. Note that
+   * '=' cannot appear in the parameter value. Specifying an invalid, or inactive
+   * enum field will result in an error 500.
    * @return Google_Service_Coordinate_Job
    */
   public function update($teamId, $jobId, Google_Service_Coordinate_Job $postBody, $optParams = array())
@@ -700,6 +741,38 @@ class Google_Service_Coordinate_Schedule_Resource extends Google_Service_Resourc
   }
 }
 
+/**
+ * The "team" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $coordinateService = new Google_Service_Coordinate(...);
+ *   $team = $coordinateService->team;
+ *  </code>
+ */
+class Google_Service_Coordinate_Team_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Retrieves a list of teams for a user. (team.listTeam)
+   *
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool admin Whether to include teams for which the user has the
+   * Admin role.
+   * @opt_param bool worker Whether to include teams for which the user has the
+   * Worker role.
+   * @opt_param bool dispatcher Whether to include teams for which the user has
+   * the Dispatcher role.
+   * @return Google_Service_Coordinate_TeamListResponse
+   */
+  public function listTeam($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Coordinate_TeamListResponse");
+  }
+}
+
 /**
  * The "worker" collection of methods.
  * Typical usage is:
@@ -764,11 +837,14 @@ class Google_Service_Coordinate_CustomField extends Google_Model
   }
 }
 
-class Google_Service_Coordinate_CustomFieldDef extends Google_Model
+class Google_Service_Coordinate_CustomFieldDef extends Google_Collection
 {
+  protected $collection_key = 'enumitems';
   protected $internal_gapi_mappings = array(
   );
   public $enabled;
+  protected $enumitemsType = 'Google_Service_Coordinate_EnumItemDef';
+  protected $enumitemsDataType = 'array';
   public $id;
   public $kind;
   public $name;
@@ -784,6 +860,14 @@ class Google_Service_Coordinate_CustomFieldDef extends Google_Model
   {
     return $this->enabled;
   }
+  public function setEnumitems($enumitems)
+  {
+    $this->enumitems = $enumitems;
+  }
+  public function getEnumitems()
+  {
+    return $this->enumitems;
+  }
   public function setId($id)
   {
     $this->id = $id;
@@ -882,6 +966,41 @@ class Google_Service_Coordinate_CustomFields extends Google_Collection
   }
 }
 
+class Google_Service_Coordinate_EnumItemDef extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $active;
+  public $kind;
+  public $value;
+
+
+  public function setActive($active)
+  {
+    $this->active = $active;
+  }
+  public function getActive()
+  {
+    return $this->active;
+  }
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+  public function setValue($value)
+  {
+    $this->value = $value;
+  }
+  public function getValue()
+  {
+    return $this->value;
+  }
+}
+
 class Google_Service_Coordinate_Job extends Google_Collection
 {
   protected $collection_key = 'jobChange';
@@ -1292,6 +1411,69 @@ class Google_Service_Coordinate_Schedule extends Google_Model
   }
 }
 
+class Google_Service_Coordinate_Team extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $id;
+  public $kind;
+  public $name;
+
+
+  public function setId($id)
+  {
+    $this->id = $id;
+  }
+  public function getId()
+  {
+    return $this->id;
+  }
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+  public function setName($name)
+  {
+    $this->name = $name;
+  }
+  public function getName()
+  {
+    return $this->name;
+  }
+}
+
+class Google_Service_Coordinate_TeamListResponse extends Google_Collection
+{
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $itemsType = 'Google_Service_Coordinate_Team';
+  protected $itemsDataType = 'array';
+  public $kind;
+
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+  public function getItems()
+  {
+    return $this->items;
+  }
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+}
+
 class Google_Service_Coordinate_TokenPagination extends Google_Model
 {
   protected $internal_gapi_mappings = array(

lib/google/src/Google/Service/Customsearch.php

@@ -43,6 +43,7 @@ class Google_Service_Customsearch extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'customsearch/';
     $this->version = 'v1';
     $this->serviceName = 'customsearch';

lib/google/src/Google/Service/Datastore.php

@@ -51,6 +51,7 @@ class Google_Service_Datastore extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'datastore/v1beta2/datasets/';
     $this->version = 'v1beta2';
     $this->serviceName = 'datastore';

lib/google/src/Google/Service/Directory.php

@@ -115,6 +115,7 @@ class Google_Service_Directory extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'admin/directory/v1/';
     $this->version = 'directory_v1';
     $this->serviceName = 'admin';
@@ -1936,7 +1937,7 @@ class Google_Service_Directory_Orgunits_Resource extends Google_Service_Resource
    * Remove Organization Unit (orgunits.delete)
    *
    * @param string $customerId Immutable id of the Google Apps account
-   * @param string $orgUnitPath Full path of the organization unit
+   * @param string $orgUnitPath Full path of the organization unit or its Id
    * @param array $optParams Optional parameters.
    */
   public function delete($customerId, $orgUnitPath, $optParams = array())
@@ -1950,7 +1951,7 @@ class Google_Service_Directory_Orgunits_Resource extends Google_Service_Resource
    * Retrieve Organization Unit (orgunits.get)
    *
    * @param string $customerId Immutable id of the Google Apps account
-   * @param string $orgUnitPath Full path of the organization unit
+   * @param string $orgUnitPath Full path of the organization unit or its Id
    * @param array $optParams Optional parameters.
    * @return Google_Service_Directory_OrgUnit
    */
@@ -1984,7 +1985,8 @@ class Google_Service_Directory_Orgunits_Resource extends Google_Service_Resource
    *
    * @opt_param string type Whether to return all sub-organizations or just
    * immediate children
-   * @opt_param string orgUnitPath the URL-encoded organization unit
+   * @opt_param string orgUnitPath the URL-encoded organization unit's path or its
+   * Id
    * @return Google_Service_Directory_OrgUnits
    */
   public function listOrgunits($customerId, $optParams = array())
@@ -1999,7 +2001,7 @@ class Google_Service_Directory_Orgunits_Resource extends Google_Service_Resource
    * (orgunits.patch)
    *
    * @param string $customerId Immutable id of the Google Apps account
-   * @param string $orgUnitPath Full path of the organization unit
+   * @param string $orgUnitPath Full path of the organization unit or its Id
    * @param Google_OrgUnit $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Directory_OrgUnit
@@ -2015,7 +2017,7 @@ class Google_Service_Directory_Orgunits_Resource extends Google_Service_Resource
    * Update Organization Unit (orgunits.update)
    *
    * @param string $customerId Immutable id of the Google Apps account
-   * @param string $orgUnitPath Full path of the organization unit
+   * @param string $orgUnitPath Full path of the organization unit or its Id
    * @param Google_OrgUnit $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Directory_OrgUnit
@@ -2902,6 +2904,7 @@ class Google_Service_Directory_ChromeOsDevice extends Google_Collection
   );
   protected $activeTimeRangesType = 'Google_Service_Directory_ChromeOsDeviceActiveTimeRanges';
   protected $activeTimeRangesDataType = 'array';
+  public $annotatedAssetId;
   public $annotatedLocation;
   public $annotatedUser;
   public $bootMode;
@@ -2936,6 +2939,14 @@ class Google_Service_Directory_ChromeOsDevice extends Google_Collection
   {
     return $this->activeTimeRanges;
   }
+  public function setAnnotatedAssetId($annotatedAssetId)
+  {
+    $this->annotatedAssetId = $annotatedAssetId;
+  }
+  public function getAnnotatedAssetId()
+  {
+    return $this->annotatedAssetId;
+  }
   public function setAnnotatedLocation($annotatedLocation)
   {
     $this->annotatedLocation = $annotatedLocation;
@@ -3978,7 +3989,9 @@ class Google_Service_Directory_OrgUnit extends Google_Model
   public $etag;
   public $kind;
   public $name;
+  public $orgUnitId;
   public $orgUnitPath;
+  public $parentOrgUnitId;
   public $parentOrgUnitPath;
 
 
@@ -4022,6 +4035,14 @@ class Google_Service_Directory_OrgUnit extends Google_Model
   {
     return $this->name;
   }
+  public function setOrgUnitId($orgUnitId)
+  {
+    $this->orgUnitId = $orgUnitId;
+  }
+  public function getOrgUnitId()
+  {
+    return $this->orgUnitId;
+  }
   public function setOrgUnitPath($orgUnitPath)
   {
     $this->orgUnitPath = $orgUnitPath;
@@ -4030,6 +4051,14 @@ class Google_Service_Directory_OrgUnit extends Google_Model
   {
     return $this->orgUnitPath;
   }
+  public function setParentOrgUnitId($parentOrgUnitId)
+  {
+    $this->parentOrgUnitId = $parentOrgUnitId;
+  }
+  public function getParentOrgUnitId()
+  {
+    return $this->parentOrgUnitId;
+  }
   public function setParentOrgUnitPath($parentOrgUnitPath)
   {
     $this->parentOrgUnitPath = $parentOrgUnitPath;
@@ -4432,6 +4461,7 @@ class Google_Service_Directory_User extends Google_Collection
   protected $nameType = 'Google_Service_Directory_UserName';
   protected $nameDataType = '';
   public $nonEditableAliases;
+  public $notes;
   public $orgUnitPath;
   public $organizations;
   public $password;
@@ -4440,7 +4470,9 @@ class Google_Service_Directory_User extends Google_Collection
   public $relations;
   public $suspended;
   public $suspensionReason;
+  public $thumbnailPhotoEtag;
   public $thumbnailPhotoUrl;
+  public $websites;
 
 
   public function setAddresses($addresses)
@@ -4627,6 +4659,14 @@ class Google_Service_Directory_User extends Google_Collection
   {
     return $this->nonEditableAliases;
   }
+  public function setNotes($notes)
+  {
+    $this->notes = $notes;
+  }
+  public function getNotes()
+  {
+    return $this->notes;
+  }
   public function setOrgUnitPath($orgUnitPath)
   {
     $this->orgUnitPath = $orgUnitPath;
@@ -4691,6 +4731,14 @@ class Google_Service_Directory_User extends Google_Collection
   {
     return $this->suspensionReason;
   }
+  public function setThumbnailPhotoEtag($thumbnailPhotoEtag)
+  {
+    $this->thumbnailPhotoEtag = $thumbnailPhotoEtag;
+  }
+  public function getThumbnailPhotoEtag()
+  {
+    return $this->thumbnailPhotoEtag;
+  }
   public function setThumbnailPhotoUrl($thumbnailPhotoUrl)
   {
     $this->thumbnailPhotoUrl = $thumbnailPhotoUrl;
@@ -4699,6 +4747,40 @@ class Google_Service_Directory_User extends Google_Collection
   {
     return $this->thumbnailPhotoUrl;
   }
+  public function setWebsites($websites)
+  {
+    $this->websites = $websites;
+  }
+  public function getWebsites()
+  {
+    return $this->websites;
+  }
+}
+
+class Google_Service_Directory_UserAbout extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $contentType;
+  public $value;
+
+
+  public function setContentType($contentType)
+  {
+    $this->contentType = $contentType;
+  }
+  public function getContentType()
+  {
+    return $this->contentType;
+  }
+  public function setValue($value)
+  {
+    $this->value = $value;
+  }
+  public function getValue()
+  {
+    return $this->value;
+  }
 }
 
 class Google_Service_Directory_UserAddress extends Google_Model
@@ -5310,6 +5392,50 @@ class Google_Service_Directory_UserUndelete extends Google_Model
   }
 }
 
+class Google_Service_Directory_UserWebsite extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $customType;
+  public $primary;
+  public $type;
+  public $value;
+
+
+  public function setCustomType($customType)
+  {
+    $this->customType = $customType;
+  }
+  public function getCustomType()
+  {
+    return $this->customType;
+  }
+  public function setPrimary($primary)
+  {
+    $this->primary = $primary;
+  }
+  public function getPrimary()
+  {
+    return $this->primary;
+  }
+  public function setType($type)
+  {
+    $this->type = $type;
+  }
+  public function getType()
+  {
+    return $this->type;
+  }
+  public function setValue($value)
+  {
+    $this->value = $value;
+  }
+  public function getValue()
+  {
+    return $this->value;
+  }
+}
+
 class Google_Service_Directory_Users extends Google_Collection
 {
   protected $collection_key = 'users';

lib/google/src/Google/Service/Dns.php

@@ -16,7 +16,7 @@
  */
 
 /**
- * Service definition for Dns (v1beta1).
+ * Service definition for Dns (v1).
  *
  * <p>
  * The Google Cloud DNS API provides services for configuring and serving
@@ -55,8 +55,9 @@ class Google_Service_Dns extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
-    $this->servicePath = 'dns/v1beta1/projects/';
-    $this->version = 'v1beta1';
+    $this->rootUrl = 'https://www.googleapis.com/';
+    $this->servicePath = 'dns/v1/projects/';
+    $this->version = 'v1';
     $this->serviceName = 'dns';
 
     $this->changes = new Google_Service_Dns_Changes_Resource(
@@ -601,6 +602,7 @@ class Google_Service_Dns_ManagedZone extends Google_Collection
   public $id;
   public $kind;
   public $name;
+  public $nameServerSet;
   public $nameServers;
 
 
@@ -652,6 +654,14 @@ class Google_Service_Dns_ManagedZone extends Google_Collection
   {
     return $this->name;
   }
+  public function setNameServerSet($nameServerSet)
+  {
+    $this->nameServerSet = $nameServerSet;
+  }
+  public function getNameServerSet()
+  {
+    return $this->nameServerSet;
+  }
   public function setNameServers($nameServers)
   {
     $this->nameServers = $nameServers;

lib/google/src/Google/Service/DoubleClickBidManager.php

@@ -46,6 +46,7 @@ class Google_Service_DoubleClickBidManager extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'doubleclickbidmanager/v1/';
     $this->version = 'v1';
     $this->serviceName = 'doubleclickbidmanager';
@@ -573,6 +574,7 @@ class Google_Service_DoubleClickBidManager_QueryMetadata extends Google_Collecti
   public $googleCloudStoragePathForLatestReport;
   public $googleDrivePathForLatestReport;
   public $latestReportRunTimeMs;
+  public $locale;
   public $reportCount;
   public $running;
   public $sendNotification;
@@ -620,6 +622,14 @@ class Google_Service_DoubleClickBidManager_QueryMetadata extends Google_Collecti
   {
     return $this->latestReportRunTimeMs;
   }
+  public function setLocale($locale)
+  {
+    $this->locale = $locale;
+  }
+  public function getLocale()
+  {
+    return $this->locale;
+  }
   public function setReportCount($reportCount)
   {
     $this->reportCount = $reportCount;

lib/google/src/Google/Service/Doubleclicksearch.php

@@ -48,6 +48,7 @@ class Google_Service_Doubleclicksearch extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'doubleclicksearch/v2/';
     $this->version = 'v2';
     $this->serviceName = 'doubleclicksearch';
@@ -392,7 +393,7 @@ class Google_Service_Doubleclicksearch_Reports_Resource extends Google_Service_R
   }
 
   /**
-   * Downloads a report file. (reports.getFile)
+   * Downloads a report file encoded in UTF-8. (reports.getFile)
    *
    * @param string $reportId ID of the report.
    * @param int $reportFragment The index of the report fragment to download.
@@ -524,6 +525,7 @@ class Google_Service_Doubleclicksearch_Conversion extends Google_Collection
   public $agencyId;
   public $attributionModel;
   public $campaignId;
+  public $channel;
   public $clickId;
   public $conversionId;
   public $conversionModifiedTimestamp;
@@ -535,15 +537,22 @@ class Google_Service_Doubleclicksearch_Conversion extends Google_Collection
   protected $customDimensionDataType = 'array';
   protected $customMetricType = 'Google_Service_Doubleclicksearch_CustomMetric';
   protected $customMetricDataType = 'array';
+  public $deviceType;
   public $dsConversionId;
   public $engineAccountId;
   public $floodlightOrderId;
+  public $inventoryAccountId;
+  public $productCountry;
+  public $productGroupId;
+  public $productId;
+  public $productLanguage;
   public $quantityMillis;
   public $revenueMicros;
   public $segmentationId;
   public $segmentationName;
   public $segmentationType;
   public $state;
+  public $storeId;
   public $type;
 
 
@@ -595,6 +604,14 @@ class Google_Service_Doubleclicksearch_Conversion extends Google_Collection
   {
     return $this->campaignId;
   }
+  public function setChannel($channel)
+  {
+    $this->channel = $channel;
+  }
+  public function getChannel()
+  {
+    return $this->channel;
+  }
   public function setClickId($clickId)
   {
     $this->clickId = $clickId;
@@ -667,6 +684,14 @@ class Google_Service_Doubleclicksearch_Conversion extends Google_Collection
   {
     return $this->customMetric;
   }
+  public function setDeviceType($deviceType)
+  {
+    $this->deviceType = $deviceType;
+  }
+  public function getDeviceType()
+  {
+    return $this->deviceType;
+  }
   public function setDsConversionId($dsConversionId)
   {
     $this->dsConversionId = $dsConversionId;
@@ -691,6 +716,46 @@ class Google_Service_Doubleclicksearch_Conversion extends Google_Collection
   {
     return $this->floodlightOrderId;
   }
+  public function setInventoryAccountId($inventoryAccountId)
+  {
+    $this->inventoryAccountId = $inventoryAccountId;
+  }
+  public function getInventoryAccountId()
+  {
+    return $this->inventoryAccountId;
+  }
+  public function setProductCountry($productCountry)
+  {
+    $this->productCountry = $productCountry;
+  }
+  public function getProductCountry()
+  {
+    return $this->productCountry;
+  }
+  public function setProductGroupId($productGroupId)
+  {
+    $this->productGroupId = $productGroupId;
+  }
+  public function getProductGroupId()
+  {
+    return $this->productGroupId;
+  }
+  public function setProductId($productId)
+  {
+    $this->productId = $productId;
+  }
+  public function getProductId()
+  {
+    return $this->productId;
+  }
+  public function setProductLanguage($productLanguage)
+  {
+    $this->productLanguage = $productLanguage;
+  }
+  public function getProductLanguage()
+  {
+    return $this->productLanguage;
+  }
   public function setQuantityMillis($quantityMillis)
   {
     $this->quantityMillis = $quantityMillis;
@@ -739,6 +804,14 @@ class Google_Service_Doubleclicksearch_Conversion extends Google_Collection
   {
     return $this->state;
   }
+  public function setStoreId($storeId)
+  {
+    $this->storeId = $storeId;
+  }
+  public function getStoreId()
+  {
+    return $this->storeId;
+  }
   public function setType($type)
   {
     $this->type = $type;

lib/google/src/Google/Service/Drive.php

@@ -30,7 +30,7 @@
  */
 class Google_Service_Drive extends Google_Service
 {
-  /** View and manage the files and documents in your Google Drive. */
+  /** View and manage the files in your Google Drive. */
   const DRIVE =
       "https://www.googleapis.com/auth/drive";
   /** View and manage its own configuration data in your Google Drive. */
@@ -39,13 +39,19 @@ class Google_Service_Drive extends Google_Service
   /** View your Google Drive apps. */
   const DRIVE_APPS_READONLY =
       "https://www.googleapis.com/auth/drive.apps.readonly";
-  /** View and manage Google Drive files that you have opened or created with this app. */
+  /** View and manage Google Drive files and folders that you have opened or created with this app. */
   const DRIVE_FILE =
       "https://www.googleapis.com/auth/drive.file";
-  /** View metadata for files and documents in your Google Drive. */
+  /** View and manage metadata of files in your Google Drive. */
+  const DRIVE_METADATA =
+      "https://www.googleapis.com/auth/drive.metadata";
+  /** View metadata for files in your Google Drive. */
   const DRIVE_METADATA_READONLY =
       "https://www.googleapis.com/auth/drive.metadata.readonly";
-  /** View the files and documents in your Google Drive. */
+  /** View the photos, videos and albums in your Google Photos. */
+  const DRIVE_PHOTOS_READONLY =
+      "https://www.googleapis.com/auth/drive.photos.readonly";
+  /** View the files in your Google Drive. */
   const DRIVE_READONLY =
       "https://www.googleapis.com/auth/drive.readonly";
   /** Modify your Google Apps Script scripts' behavior. */
@@ -75,6 +81,7 @@ class Google_Service_Drive extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'drive/v2/';
     $this->version = 'v2';
     $this->serviceName = 'drive';
@@ -167,10 +174,6 @@ class Google_Service_Drive extends Google_Service
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
-                'startChangeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
                 'includeDeleted' => array(
                   'location' => 'query',
                   'type' => 'boolean',
@@ -183,6 +186,14 @@ class Google_Service_Drive extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'spaces' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'startChangeId' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
               ),
             ),'watch' => array(
               'path' => 'changes/watch',
@@ -192,10 +203,6 @@ class Google_Service_Drive extends Google_Service
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
-                'startChangeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
                 'includeDeleted' => array(
                   'location' => 'query',
                   'type' => 'boolean',
@@ -208,6 +215,14 @@ class Google_Service_Drive extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'spaces' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'startChangeId' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
               ),
             ),
           )
@@ -282,7 +297,7 @@ class Google_Service_Drive extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
-                'q' => array(
+                'orderBy' => array(
                   'location' => 'query',
                   'type' => 'string',
                 ),
@@ -290,6 +305,10 @@ class Google_Service_Drive extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'q' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'maxResults' => array(
                   'location' => 'query',
                   'type' => 'integer',
@@ -467,6 +486,19 @@ class Google_Service_Drive extends Google_Service
               'path' => 'files/trash',
               'httpMethod' => 'DELETE',
               'parameters' => array(),
+            ),'generateIds' => array(
+              'path' => 'files/generateIds',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'maxResults' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+                'space' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
             ),'get' => array(
               'path' => 'files/{fileId}',
               'httpMethod' => 'GET',
@@ -484,6 +516,10 @@ class Google_Service_Drive extends Google_Service
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
+                'revisionId' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'projection' => array(
                   'location' => 'query',
                   'type' => 'string',
@@ -530,15 +566,7 @@ class Google_Service_Drive extends Google_Service
               'path' => 'files',
               'httpMethod' => 'GET',
               'parameters' => array(
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'corpus' => array(
+                'orderBy' => array(
                   'location' => 'query',
                   'type' => 'string',
                 ),
@@ -550,6 +578,22 @@ class Google_Service_Drive extends Google_Service
                   'location' => 'query',
                   'type' => 'integer',
                 ),
+                'q' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'pageToken' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'spaces' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'corpus' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
               ),
             ),'patch' => array(
               'path' => 'files/{fileId}',
@@ -564,23 +608,27 @@ class Google_Service_Drive extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
-                'updateViewedDate' => array(
+                'modifiedDateBehavior' => array(
                   'location' => 'query',
-                  'type' => 'boolean',
+                  'type' => 'string',
                 ),
                 'removeParents' => array(
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'updateViewedDate' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
                 'setModifiedDate' => array(
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
-                'convert' => array(
+                'useContentAsIndexableText' => array(
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
-                'useContentAsIndexableText' => array(
+                'convert' => array(
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
@@ -652,23 +700,27 @@ class Google_Service_Drive extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
-                'updateViewedDate' => array(
+                'modifiedDateBehavior' => array(
                   'location' => 'query',
-                  'type' => 'boolean',
+                  'type' => 'string',
                 ),
                 'removeParents' => array(
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'updateViewedDate' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
                 'setModifiedDate' => array(
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
-                'convert' => array(
+                'useContentAsIndexableText' => array(
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
-                'useContentAsIndexableText' => array(
+                'convert' => array(
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
@@ -714,6 +766,10 @@ class Google_Service_Drive extends Google_Service
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
+                'revisionId' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'projection' => array(
                   'location' => 'query',
                   'type' => 'string',
@@ -1386,10 +1442,12 @@ class Google_Service_Drive_Changes_Resource extends Google_Service_Resource
    * has opened and shared files. When set to false, the list only includes owned
    * files plus any shared or public files the user has explicitly added to a
    * folder they own.
-   * @opt_param string startChangeId Change ID to start listing changes from.
    * @opt_param bool includeDeleted Whether to include deleted items.
    * @opt_param int maxResults Maximum number of changes to return.
    * @opt_param string pageToken Page token for changes.
+   * @opt_param string spaces A comma-separated list of spaces to query. Supported
+   * values are 'drive', 'appDataFolder' and 'photos'.
+   * @opt_param string startChangeId Change ID to start listing changes from.
    * @return Google_Service_Drive_ChangeList
    */
   public function listChanges($optParams = array())
@@ -1409,10 +1467,12 @@ class Google_Service_Drive_Changes_Resource extends Google_Service_Resource
    * has opened and shared files. When set to false, the list only includes owned
    * files plus any shared or public files the user has explicitly added to a
    * folder they own.
-   * @opt_param string startChangeId Change ID to start listing changes from.
    * @opt_param bool includeDeleted Whether to include deleted items.
    * @opt_param int maxResults Maximum number of changes to return.
    * @opt_param string pageToken Page token for changes.
+   * @opt_param string spaces A comma-separated list of spaces to query. Supported
+   * values are 'drive', 'appDataFolder' and 'photos'.
+   * @opt_param string startChangeId Change ID to start listing changes from.
    * @return Google_Service_Drive_Channel
    */
   public function watch(Google_Service_Drive_Channel $postBody, $optParams = array())
@@ -1509,8 +1569,15 @@ class Google_Service_Drive_Children_Resource extends Google_Service_Resource
    * @param string $folderId The ID of the folder.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string q Query string for searching children.
+   * @opt_param string orderBy A comma-separated list of sort keys. Valid keys are
+   * 'createdDate', 'folder', 'lastViewedByMeDate', 'modifiedByMeDate',
+   * 'modifiedDate', 'quotaBytesUsed', 'recency', 'sharedWithMeDate', 'starred',
+   * and 'title'. Each key sorts ascending by default, but may be reversed with
+   * the 'desc' modifier. Example usage: ?orderBy=folder,modifiedDate desc,title.
+   * Please note that there is a current limitation for users with approximately
+   * one million files in which the requested sort order is ignored.
    * @opt_param string pageToken Page token for children.
+   * @opt_param string q Query string for searching children.
    * @opt_param int maxResults Maximum number of children to return.
    * @return Google_Service_Drive_ChildList
    */
@@ -1659,7 +1726,7 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    * @opt_param bool convert Whether to convert this file to the corresponding
    * Google Docs format.
    * @opt_param string ocrLanguage If ocr is true, hints at the language to use.
-   * Valid values are ISO 639-1 codes.
+   * Valid values are BCP 47 codes.
    * @opt_param string visibility The visibility of the new file. This parameter
    * is only relevant when the source is not a native Google Doc and
    * convert=false.
@@ -1679,7 +1746,8 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
   }
 
   /**
-   * Permanently deletes a file by ID. Skips the trash. (files.delete)
+   * Permanently deletes a file by ID. Skips the trash. The currently
+   * authenticated user must own the file. (files.delete)
    *
    * @param string $fileId The ID of the file to delete.
    * @param array $optParams Optional parameters.
@@ -1703,6 +1771,24 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
     return $this->call('emptyTrash', array($params));
   }
 
+  /**
+   * Generates a set of file IDs which can be provided in insert requests.
+   * (files.generateIds)
+   *
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param int maxResults Maximum number of IDs to return.
+   * @opt_param string space The space in which the IDs can be used to create new
+   * files. Supported values are 'drive' and 'appDataFolder'.
+   * @return Google_Service_Drive_GeneratedIds
+   */
+  public function generateIds($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('generateIds', array($params), "Google_Service_Drive_GeneratedIds");
+  }
+
   /**
    * Gets a file's metadata by ID. (files.get)
    *
@@ -1713,6 +1799,8 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    * of downloading known malware or other abusive files.
    * @opt_param bool updateViewedDate Whether to update the view date after
    * successfully retrieving the file.
+   * @opt_param string revisionId Specifies the Revision ID that should be
+   * downloaded. Ignored unless alt=media is specified.
    * @opt_param string projection This parameter is deprecated and has no
    * function.
    * @return Google_Service_Drive_DriveFile
@@ -1735,7 +1823,7 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    * @opt_param bool useContentAsIndexableText Whether to use the content as
    * indexable text.
    * @opt_param string ocrLanguage If ocr is true, hints at the language to use.
-   * Valid values are ISO 639-1 codes.
+   * Valid values are BCP 47 codes.
    * @opt_param string visibility The visibility of the new file. This parameter
    * is only relevant when convert=false.
    * @opt_param bool pinned Whether to pin the head revision of the uploaded file.
@@ -1758,13 +1846,22 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    *
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string q Query string for searching files.
-   * @opt_param string pageToken Page token for files.
-   * @opt_param string corpus The body of items (files/documents) to which the
-   * query applies.
+   * @opt_param string orderBy A comma-separated list of sort keys. Valid keys are
+   * 'createdDate', 'folder', 'lastViewedByMeDate', 'modifiedByMeDate',
+   * 'modifiedDate', 'quotaBytesUsed', 'recency', 'sharedWithMeDate', 'starred',
+   * and 'title'. Each key sorts ascending by default, but may be reversed with
+   * the 'desc' modifier. Example usage: ?orderBy=folder,modifiedDate desc,title.
+   * Please note that there is a current limitation for users with approximately
+   * one million files in which the requested sort order is ignored.
    * @opt_param string projection This parameter is deprecated and has no
    * function.
    * @opt_param int maxResults Maximum number of files to return.
+   * @opt_param string q Query string for searching files.
+   * @opt_param string pageToken Page token for files.
+   * @opt_param string spaces A comma-separated list of spaces to query. Supported
+   * values are 'drive', 'appDataFolder' and 'photos'.
+   * @opt_param string corpus The body of items (files/documents) to which the
+   * query applies.
    * @return Google_Service_Drive_FileList
    */
   public function listFiles($optParams = array())
@@ -1783,24 +1880,27 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    * @param array $optParams Optional parameters.
    *
    * @opt_param string addParents Comma-separated list of parent IDs to add.
+   * @opt_param string modifiedDateBehavior Determines the behavior in which
+   * modifiedDate is updated. This overrides setModifiedDate.
+   * @opt_param string removeParents Comma-separated list of parent IDs to remove.
    * @opt_param bool updateViewedDate Whether to update the view date after
    * successfully updating the file.
-   * @opt_param string removeParents Comma-separated list of parent IDs to remove.
    * @opt_param bool setModifiedDate Whether to set the modified date with the
    * supplied modified date.
-   * @opt_param bool convert Whether to convert this file to the corresponding
-   * Google Docs format.
    * @opt_param bool useContentAsIndexableText Whether to use the content as
    * indexable text.
+   * @opt_param bool convert This parameter is deprecated and has no function.
    * @opt_param string ocrLanguage If ocr is true, hints at the language to use.
-   * Valid values are ISO 639-1 codes.
+   * Valid values are BCP 47 codes.
    * @opt_param bool pinned Whether to pin the new revision. A file can have a
    * maximum of 200 pinned revisions.
    * @opt_param bool newRevision Whether a blob upload should create a new
    * revision. If false, the blob data in the current head revision is replaced.
    * If true or not set, a new blob is created as head revision, and previous
-   * revisions are preserved (causing increased use of the user's data storage
-   * quota).
+   * unpinned revisions are preserved for a short period of time. Pinned revisions
+   * are stored indefinitely, using additional storage quota, up to a maximum of
+   * 200 revisions. For details on how revisions are retained, see the Drive Help
+   * Center.
    * @opt_param bool ocr Whether to attempt OCR on .jpg, .png, .gif, or .pdf
    * uploads.
    * @opt_param string timedTextLanguage The language of the timed text.
@@ -1829,7 +1929,8 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
   }
 
   /**
-   * Moves a file to the trash. (files.trash)
+   * Moves a file to the trash. The currently authenticated user must own the
+   * file. (files.trash)
    *
    * @param string $fileId The ID of the file to trash.
    * @param array $optParams Optional parameters.
@@ -1864,24 +1965,27 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    * @param array $optParams Optional parameters.
    *
    * @opt_param string addParents Comma-separated list of parent IDs to add.
+   * @opt_param string modifiedDateBehavior Determines the behavior in which
+   * modifiedDate is updated. This overrides setModifiedDate.
+   * @opt_param string removeParents Comma-separated list of parent IDs to remove.
    * @opt_param bool updateViewedDate Whether to update the view date after
    * successfully updating the file.
-   * @opt_param string removeParents Comma-separated list of parent IDs to remove.
    * @opt_param bool setModifiedDate Whether to set the modified date with the
    * supplied modified date.
-   * @opt_param bool convert Whether to convert this file to the corresponding
-   * Google Docs format.
    * @opt_param bool useContentAsIndexableText Whether to use the content as
    * indexable text.
+   * @opt_param bool convert This parameter is deprecated and has no function.
    * @opt_param string ocrLanguage If ocr is true, hints at the language to use.
-   * Valid values are ISO 639-1 codes.
+   * Valid values are BCP 47 codes.
    * @opt_param bool pinned Whether to pin the new revision. A file can have a
    * maximum of 200 pinned revisions.
    * @opt_param bool newRevision Whether a blob upload should create a new
    * revision. If false, the blob data in the current head revision is replaced.
    * If true or not set, a new blob is created as head revision, and previous
-   * revisions are preserved (causing increased use of the user's data storage
-   * quota).
+   * unpinned revisions are preserved for a short period of time. Pinned revisions
+   * are stored indefinitely, using additional storage quota, up to a maximum of
+   * 200 revisions. For details on how revisions are retained, see the Drive Help
+   * Center.
    * @opt_param bool ocr Whether to attempt OCR on .jpg, .png, .gif, or .pdf
    * uploads.
    * @opt_param string timedTextLanguage The language of the timed text.
@@ -1906,6 +2010,8 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    * of downloading known malware or other abusive files.
    * @opt_param bool updateViewedDate Whether to update the view date after
    * successfully retrieving the file.
+   * @opt_param string revisionId Specifies the Revision ID that should be
+   * downloaded. Ignored unless alt=media is specified.
    * @opt_param string projection This parameter is deprecated and has no
    * function.
    * @return Google_Service_Drive_Channel
@@ -2086,8 +2192,9 @@ class Google_Service_Drive_Permissions_Resource extends Google_Service_Resource
    * @param Google_Permission $postBody
    * @param array $optParams Optional parameters.
    *
-   * @opt_param bool transferOwnership Whether changing a role to 'owner' should
-   * also downgrade the current owners to writers.
+   * @opt_param bool transferOwnership Whether changing a role to 'owner'
+   * downgrades the current owners to writers. Does nothing if the specified role
+   * is not 'owner'.
    * @return Google_Service_Drive_Permission
    */
   public function patch($fileId, $permissionId, Google_Service_Drive_Permission $postBody, $optParams = array())
@@ -2105,8 +2212,9 @@ class Google_Service_Drive_Permissions_Resource extends Google_Service_Resource
    * @param Google_Permission $postBody
    * @param array $optParams Optional parameters.
    *
-   * @opt_param bool transferOwnership Whether changing a role to 'owner' should
-   * also downgrade the current owners to writers.
+   * @opt_param bool transferOwnership Whether changing a role to 'owner'
+   * downgrades the current owners to writers. Does nothing if the specified role
+   * is not 'owner'.
    * @return Google_Service_Drive_Permission
    */
   public function update($fileId, $permissionId, Google_Service_Drive_Permission $postBody, $optParams = array())
@@ -2503,6 +2611,7 @@ class Google_Service_Drive_About extends Google_Collection
   protected $exportFormatsDataType = 'array';
   protected $featuresType = 'Google_Service_Drive_AboutFeatures';
   protected $featuresDataType = 'array';
+  public $folderColorPalette;
   protected $importFormatsType = 'Google_Service_Drive_AboutImportFormats';
   protected $importFormatsDataType = 'array';
   public $isCurrentAppInstalled;
@@ -2567,6 +2676,14 @@ class Google_Service_Drive_About extends Google_Collection
   {
     return $this->features;
   }
+  public function setFolderColorPalette($folderColorPalette)
+  {
+    $this->folderColorPalette = $folderColorPalette;
+  }
+  public function getFolderColorPalette()
+  {
+    return $this->folderColorPalette;
+  }
   public function setImportFormats($importFormats)
   {
     $this->importFormats = $importFormats;
@@ -3946,11 +4063,12 @@ class Google_Service_Drive_CommentReplyList extends Google_Collection
 
 class Google_Service_Drive_DriveFile extends Google_Collection
 {
-  protected $collection_key = 'properties';
+  protected $collection_key = 'spaces';
   protected $internal_gapi_mappings = array(
   );
   public $alternateLink;
   public $appDataContents;
+  public $canComment;
   public $copyable;
   public $createdDate;
   public $defaultOpenWithLink;
@@ -3963,6 +4081,8 @@ class Google_Service_Drive_DriveFile extends Google_Collection
   public $exportLinks;
   public $fileExtension;
   public $fileSize;
+  public $folderColorRgb;
+  public $fullFileExtension;
   public $headRevisionId;
   public $iconLink;
   public $id;
@@ -3984,6 +4104,7 @@ class Google_Service_Drive_DriveFile extends Google_Collection
   public $modifiedDate;
   public $openWithLinks;
   public $originalFilename;
+  public $ownedByMe;
   public $ownerNames;
   protected $ownersType = 'Google_Service_Drive_User';
   protected $ownersDataType = 'array';
@@ -3995,10 +4116,12 @@ class Google_Service_Drive_DriveFile extends Google_Collection
   protected $propertiesDataType = 'array';
   public $quotaBytesUsed;
   public $selfLink;
+  public $shareable;
   public $shared;
   public $sharedWithMeDate;
   protected $sharingUserType = 'Google_Service_Drive_User';
   protected $sharingUserDataType = '';
+  public $spaces;
   protected $thumbnailType = 'Google_Service_Drive_DriveFileThumbnail';
   protected $thumbnailDataType = '';
   public $thumbnailLink;
@@ -4029,6 +4152,14 @@ class Google_Service_Drive_DriveFile extends Google_Collection
   {
     return $this->appDataContents;
   }
+  public function setCanComment($canComment)
+  {
+    $this->canComment = $canComment;
+  }
+  public function getCanComment()
+  {
+    return $this->canComment;
+  }
   public function setCopyable($copyable)
   {
     $this->copyable = $copyable;
@@ -4125,6 +4256,22 @@ class Google_Service_Drive_DriveFile extends Google_Collection
   {
     return $this->fileSize;
   }
+  public function setFolderColorRgb($folderColorRgb)
+  {
+    $this->folderColorRgb = $folderColorRgb;
+  }
+  public function getFolderColorRgb()
+  {
+    return $this->folderColorRgb;
+  }
+  public function setFullFileExtension($fullFileExtension)
+  {
+    $this->fullFileExtension = $fullFileExtension;
+  }
+  public function getFullFileExtension()
+  {
+    return $this->fullFileExtension;
+  }
   public function setHeadRevisionId($headRevisionId)
   {
     $this->headRevisionId = $headRevisionId;
@@ -4261,6 +4408,14 @@ class Google_Service_Drive_DriveFile extends Google_Collection
   {
     return $this->originalFilename;
   }
+  public function setOwnedByMe($ownedByMe)
+  {
+    $this->ownedByMe = $ownedByMe;
+  }
+  public function getOwnedByMe()
+  {
+    return $this->ownedByMe;
+  }
   public function setOwnerNames($ownerNames)
   {
     $this->ownerNames = $ownerNames;
@@ -4317,6 +4472,14 @@ class Google_Service_Drive_DriveFile extends Google_Collection
   {
     return $this->selfLink;
   }
+  public function setShareable($shareable)
+  {
+    $this->shareable = $shareable;
+  }
+  public function getShareable()
+  {
+    return $this->shareable;
+  }
   public function setShared($shared)
   {
     $this->shared = $shared;
@@ -4341,6 +4504,14 @@ class Google_Service_Drive_DriveFile extends Google_Collection
   {
     return $this->sharingUser;
   }
+  public function setSpaces($spaces)
+  {
+    $this->spaces = $spaces;
+  }
+  public function getSpaces()
+  {
+    return $this->spaces;
+  }
   public function setThumbnail(Google_Service_Drive_DriveFileThumbnail $thumbnail)
   {
     $this->thumbnail = $thumbnail;
@@ -4851,6 +5022,42 @@ class Google_Service_Drive_FileList extends Google_Collection
   }
 }
 
+class Google_Service_Drive_GeneratedIds extends Google_Collection
+{
+  protected $collection_key = 'ids';
+  protected $internal_gapi_mappings = array(
+  );
+  public $ids;
+  public $kind;
+  public $space;
+
+
+  public function setIds($ids)
+  {
+    $this->ids = $ids;
+  }
+  public function getIds()
+  {
+    return $this->ids;
+  }
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+  public function setSpace($space)
+  {
+    $this->space = $space;
+  }
+  public function getSpace()
+  {
+    return $this->space;
+  }
+}
+
 class Google_Service_Drive_ParentList extends Google_Collection
 {
   protected $collection_key = 'items';

lib/google/src/Google/Service/Exception.php

@@ -1,8 +1,25 @@
 <?php
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+if (!class_exists('Google_Client')) {
+  require_once dirname(__FILE__) . '/../autoload.php';
+}
 
-class Google_Service_Exception extends Google_Exception
+class Google_Service_Exception extends Google_Exception implements Google_Task_Retryable
 {
   /**
    * Optional list of errors returned in a JSON body of an HTTP error response.
@@ -10,19 +27,27 @@ class Google_Service_Exception extends Google_Exception
   protected $errors = array();
 
   /**
-   * Override default constructor to add ability to set $errors.
+   * @var array $retryMap Map of errors with retry counts.
+   */
+  private $retryMap = array();
+
+  /**
+   * Override default constructor to add the ability to set $errors and a retry
+   * map.
    *
    * @param string $message
    * @param int $code
    * @param Exception|null $previous
    * @param [{string, string}] errors List of errors returned in an HTTP
    * response.  Defaults to [].
+   * @param array|null $retryMap Map of errors with retry counts.
    */
   public function __construct(
       $message,
       $code = 0,
       Exception $previous = null,
-      $errors = array()
+      $errors = array(),
+      array $retryMap = null
   ) {
     if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
       parent::__construct($message, $code, $previous);
@@ -31,6 +56,10 @@ class Google_Service_Exception extends Google_Exception
     }
 
     $this->errors = $errors;
+
+    if (is_array($retryMap)) {
+      $this->retryMap = $retryMap;
+    }
   }
 
   /**
@@ -50,4 +79,27 @@ class Google_Service_Exception extends Google_Exception
   {
     return $this->errors;
   }
+
+  /**
+   * Gets the number of times the associated task can be retried.
+   *
+   * NOTE: -1 is returned if the task can be retried indefinitely
+   *
+   * @return integer
+   */
+  public function allowedRetries()
+  {
+    if (isset($this->retryMap[$this->code])) {
+      return $this->retryMap[$this->code];
+    }
+
+    $errors = $this->getErrors();
+
+    if (!empty($errors) && isset($errors[0]['reason']) &&
+        isset($this->retryMap[$errors[0]['reason']])) {
+      return $this->retryMap[$errors[0]['reason']];
+    }
+
+    return 0;
+  }
 }

lib/google/src/Google/Service/Fitness.php

@@ -51,6 +51,7 @@ class Google_Service_Fitness extends Google_Service
 
   public $users_dataSources;
   public $users_dataSources_datasets;
+  public $users_dataset;
   public $users_sessions;
   
 
@@ -62,6 +63,7 @@ class Google_Service_Fitness extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'fitness/v1/users/';
     $this->version = 'v1';
     $this->serviceName = 'fitness';
@@ -82,6 +84,21 @@ class Google_Service_Fitness extends Google_Service
                   'required' => true,
                 ),
               ),
+            ),'delete' => array(
+              'path' => '{userId}/dataSources/{dataSourceId}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'userId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'dataSourceId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
             ),'get' => array(
               'path' => '{userId}/dataSources/{dataSourceId}',
               'httpMethod' => 'GET',
@@ -236,6 +253,26 @@ class Google_Service_Fitness extends Google_Service
           )
         )
     );
+    $this->users_dataset = new Google_Service_Fitness_UsersDataset_Resource(
+        $this,
+        $this->serviceName,
+        'dataset',
+        array(
+          'methods' => array(
+            'aggregate' => array(
+              'path' => '{userId}/dataset:aggregate',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'userId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
     $this->users_sessions = new Google_Service_Fitness_UsersSessions_Resource(
         $this,
         $this->serviceName,
@@ -360,6 +397,23 @@ class Google_Service_Fitness_UsersDataSources_Resource extends Google_Service_Re
     return $this->call('create', array($params), "Google_Service_Fitness_DataSource");
   }
 
+  /**
+   * Delete the data source if there are no datapoints associated with it
+   * (dataSources.delete)
+   *
+   * @param string $userId Retrieve a data source for the person identified. Use
+   * me to indicate the authenticated user. Only me is supported at this time.
+   * @param string $dataSourceId The data stream ID of the data source to delete.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Fitness_DataSource
+   */
+  public function delete($userId, $dataSourceId, $optParams = array())
+  {
+    $params = array('userId' => $userId, 'dataSourceId' => $dataSourceId);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params), "Google_Service_Fitness_DataSource");
+  }
+
   /**
    * Returns a data source identified by a data stream ID. (dataSources.get)
    *
@@ -549,6 +603,32 @@ class Google_Service_Fitness_UsersDataSourcesDatasets_Resource extends Google_Se
     return $this->call('patch', array($params), "Google_Service_Fitness_Dataset");
   }
 }
+/**
+ * The "dataset" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $fitnessService = new Google_Service_Fitness(...);
+ *   $dataset = $fitnessService->dataset;
+ *  </code>
+ */
+class Google_Service_Fitness_UsersDataset_Resource extends Google_Service_Resource
+{
+
+  /**
+   * (dataset.aggregate)
+   *
+   * @param string $userId
+   * @param Google_AggregateRequest $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Fitness_AggregateResponse
+   */
+  public function aggregate($userId, Google_Service_Fitness_AggregateRequest $postBody, $optParams = array())
+  {
+    $params = array('userId' => $userId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('aggregate', array($params), "Google_Service_Fitness_AggregateResponse");
+  }
+}
 /**
  * The "sessions" collection of methods.
  * Typical usage is:
@@ -628,6 +708,211 @@ class Google_Service_Fitness_UsersSessions_Resource extends Google_Service_Resou
 
 
 
+class Google_Service_Fitness_AggregateBucket extends Google_Collection
+{
+  protected $collection_key = 'dataset';
+  protected $internal_gapi_mappings = array(
+  );
+  public $activity;
+  protected $datasetType = 'Google_Service_Fitness_Dataset';
+  protected $datasetDataType = 'array';
+  public $endTimeMillis;
+  protected $sessionType = 'Google_Service_Fitness_Session';
+  protected $sessionDataType = '';
+  public $startTimeMillis;
+  public $type;
+
+
+  public function setActivity($activity)
+  {
+    $this->activity = $activity;
+  }
+  public function getActivity()
+  {
+    return $this->activity;
+  }
+  public function setDataset($dataset)
+  {
+    $this->dataset = $dataset;
+  }
+  public function getDataset()
+  {
+    return $this->dataset;
+  }
+  public function setEndTimeMillis($endTimeMillis)
+  {
+    $this->endTimeMillis = $endTimeMillis;
+  }
+  public function getEndTimeMillis()
+  {
+    return $this->endTimeMillis;
+  }
+  public function setSession(Google_Service_Fitness_Session $session)
+  {
+    $this->session = $session;
+  }
+  public function getSession()
+  {
+    return $this->session;
+  }
+  public function setStartTimeMillis($startTimeMillis)
+  {
+    $this->startTimeMillis = $startTimeMillis;
+  }
+  public function getStartTimeMillis()
+  {
+    return $this->startTimeMillis;
+  }
+  public function setType($type)
+  {
+    $this->type = $type;
+  }
+  public function getType()
+  {
+    return $this->type;
+  }
+}
+
+class Google_Service_Fitness_AggregateBy extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $dataSourceId;
+  public $dataTypeName;
+  public $outputDataSourceId;
+  public $outputDataTypeName;
+
+
+  public function setDataSourceId($dataSourceId)
+  {
+    $this->dataSourceId = $dataSourceId;
+  }
+  public function getDataSourceId()
+  {
+    return $this->dataSourceId;
+  }
+  public function setDataTypeName($dataTypeName)
+  {
+    $this->dataTypeName = $dataTypeName;
+  }
+  public function getDataTypeName()
+  {
+    return $this->dataTypeName;
+  }
+  public function setOutputDataSourceId($outputDataSourceId)
+  {
+    $this->outputDataSourceId = $outputDataSourceId;
+  }
+  public function getOutputDataSourceId()
+  {
+    return $this->outputDataSourceId;
+  }
+  public function setOutputDataTypeName($outputDataTypeName)
+  {
+    $this->outputDataTypeName = $outputDataTypeName;
+  }
+  public function getOutputDataTypeName()
+  {
+    return $this->outputDataTypeName;
+  }
+}
+
+class Google_Service_Fitness_AggregateRequest extends Google_Collection
+{
+  protected $collection_key = 'aggregateBy';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $aggregateByType = 'Google_Service_Fitness_AggregateBy';
+  protected $aggregateByDataType = 'array';
+  protected $bucketByActivitySegmentType = 'Google_Service_Fitness_BucketByActivity';
+  protected $bucketByActivitySegmentDataType = '';
+  protected $bucketByActivityTypeType = 'Google_Service_Fitness_BucketByActivity';
+  protected $bucketByActivityTypeDataType = '';
+  protected $bucketBySessionType = 'Google_Service_Fitness_BucketBySession';
+  protected $bucketBySessionDataType = '';
+  protected $bucketByTimeType = 'Google_Service_Fitness_BucketByTime';
+  protected $bucketByTimeDataType = '';
+  public $endTimeMillis;
+  public $startTimeMillis;
+
+
+  public function setAggregateBy($aggregateBy)
+  {
+    $this->aggregateBy = $aggregateBy;
+  }
+  public function getAggregateBy()
+  {
+    return $this->aggregateBy;
+  }
+  public function setBucketByActivitySegment(Google_Service_Fitness_BucketByActivity $bucketByActivitySegment)
+  {
+    $this->bucketByActivitySegment = $bucketByActivitySegment;
+  }
+  public function getBucketByActivitySegment()
+  {
+    return $this->bucketByActivitySegment;
+  }
+  public function setBucketByActivityType(Google_Service_Fitness_BucketByActivity $bucketByActivityType)
+  {
+    $this->bucketByActivityType = $bucketByActivityType;
+  }
+  public function getBucketByActivityType()
+  {
+    return $this->bucketByActivityType;
+  }
+  public function setBucketBySession(Google_Service_Fitness_BucketBySession $bucketBySession)
+  {
+    $this->bucketBySession = $bucketBySession;
+  }
+  public function getBucketBySession()
+  {
+    return $this->bucketBySession;
+  }
+  public function setBucketByTime(Google_Service_Fitness_BucketByTime $bucketByTime)
+  {
+    $this->bucketByTime = $bucketByTime;
+  }
+  public function getBucketByTime()
+  {
+    return $this->bucketByTime;
+  }
+  public function setEndTimeMillis($endTimeMillis)
+  {
+    $this->endTimeMillis = $endTimeMillis;
+  }
+  public function getEndTimeMillis()
+  {
+    return $this->endTimeMillis;
+  }
+  public function setStartTimeMillis($startTimeMillis)
+  {
+    $this->startTimeMillis = $startTimeMillis;
+  }
+  public function getStartTimeMillis()
+  {
+    return $this->startTimeMillis;
+  }
+}
+
+class Google_Service_Fitness_AggregateResponse extends Google_Collection
+{
+  protected $collection_key = 'bucket';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $bucketType = 'Google_Service_Fitness_AggregateBucket';
+  protected $bucketDataType = 'array';
+
+
+  public function setBucket($bucket)
+  {
+    $this->bucket = $bucket;
+  }
+  public function getBucket()
+  {
+    return $this->bucket;
+  }
+}
+
 class Google_Service_Fitness_Application extends Google_Model
 {
   protected $internal_gapi_mappings = array(
@@ -672,6 +957,66 @@ class Google_Service_Fitness_Application extends Google_Model
   }
 }
 
+class Google_Service_Fitness_BucketByActivity extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $activityDataSourceId;
+  public $minDurationMillis;
+
+
+  public function setActivityDataSourceId($activityDataSourceId)
+  {
+    $this->activityDataSourceId = $activityDataSourceId;
+  }
+  public function getActivityDataSourceId()
+  {
+    return $this->activityDataSourceId;
+  }
+  public function setMinDurationMillis($minDurationMillis)
+  {
+    $this->minDurationMillis = $minDurationMillis;
+  }
+  public function getMinDurationMillis()
+  {
+    return $this->minDurationMillis;
+  }
+}
+
+class Google_Service_Fitness_BucketBySession extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $minDurationMillis;
+
+
+  public function setMinDurationMillis($minDurationMillis)
+  {
+    $this->minDurationMillis = $minDurationMillis;
+  }
+  public function getMinDurationMillis()
+  {
+    return $this->minDurationMillis;
+  }
+}
+
+class Google_Service_Fitness_BucketByTime extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $durationMillis;
+
+
+  public function setDurationMillis($durationMillis)
+  {
+    $this->durationMillis = $durationMillis;
+  }
+  public function getDurationMillis()
+  {
+    return $this->durationMillis;
+  }
+}
+
 class Google_Service_Fitness_DataPoint extends Google_Collection
 {
   protected $collection_key = 'value';
@@ -862,6 +1207,7 @@ class Google_Service_Fitness_DataTypeField extends Google_Model
   );
   public $format;
   public $name;
+  public $optional;
 
 
   public function setFormat($format)
@@ -880,6 +1226,14 @@ class Google_Service_Fitness_DataTypeField extends Google_Model
   {
     return $this->name;
   }
+  public function setOptional($optional)
+  {
+    $this->optional = $optional;
+  }
+  public function getOptional()
+  {
+    return $this->optional;
+  }
 }
 
 class Google_Service_Fitness_Dataset extends Google_Collection
@@ -1051,6 +1405,7 @@ class Google_Service_Fitness_Session extends Google_Model
 {
   protected $internal_gapi_mappings = array(
   );
+  public $activeTimeMillis;
   public $activityType;
   protected $applicationType = 'Google_Service_Fitness_Application';
   protected $applicationDataType = '';
@@ -1062,6 +1417,14 @@ class Google_Service_Fitness_Session extends Google_Model
   public $startTimeMillis;
 
 
+  public function setActiveTimeMillis($activeTimeMillis)
+  {
+    $this->activeTimeMillis = $activeTimeMillis;
+  }
+  public function getActiveTimeMillis()
+  {
+    return $this->activeTimeMillis;
+  }
   public function setActivityType($activityType)
   {
     $this->activityType = $activityType;

lib/google/src/Google/Service/Freebase.php

@@ -43,6 +43,7 @@ class Google_Service_Freebase extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'freebase/v1/';
     $this->version = 'v1';
     $this->serviceName = 'freebase';

lib/google/src/Google/Service/Fusiontables.php

@@ -53,6 +53,7 @@ class Google_Service_Fusiontables extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'fusiontables/v2/';
     $this->version = 'v2';
     $this->serviceName = 'fusiontables';
@@ -642,7 +643,7 @@ class Google_Service_Fusiontables_Column_Resource extends Google_Service_Resourc
 {
 
   /**
-   * Deletes the column. (column.delete)
+   * Deletes the specified column. (column.delete)
    *
    * @param string $tableId Table from which the column is being deleted.
    * @param string $columnId Name or identifier for the column being deleted.
@@ -656,7 +657,7 @@ class Google_Service_Fusiontables_Column_Resource extends Google_Service_Resourc
   }
 
   /**
-   * Retrieves a specific column by its id. (column.get)
+   * Retrieves a specific column by its ID. (column.get)
    *
    * @param string $tableId Table to which the column belongs.
    * @param string $columnId Name or identifier for the column that is being
@@ -753,17 +754,17 @@ class Google_Service_Fusiontables_Query_Resource extends Google_Service_Resource
 {
 
   /**
-   * Executes an SQL SELECT/INSERT/UPDATE/DELETE/SHOW/DESCRIBE/CREATE statement.
-   * (query.sql)
+   * Executes a Fusion Tables SQL statement, which can be any of - SELECT - INSERT
+   * - UPDATE - DELETE - SHOW - DESCRIBE - CREATE statement. (query.sql)
    *
-   * @param string $sql An SQL SELECT/SHOW/DESCRIBE/INSERT/UPDATE/DELETE/CREATE
-   * statement.
+   * @param string $sql A Fusion Tables SQL statement, which can be any of -
+   * SELECT - INSERT - UPDATE - DELETE - SHOW - DESCRIBE - CREATE
    * @param array $optParams Optional parameters.
    *
-   * @opt_param bool typed Should typed values be returned in the (JSON) response
-   * -- numbers for numeric values and parsed geometries for KML values? Default
-   * is true.
-   * @opt_param bool hdrs Should column names be included (in the first row)?.
+   * @opt_param bool typed Whether typed values are returned in the (JSON)
+   * response: numbers for numeric values and parsed geometries for KML values.
+   * Default is true.
+   * @opt_param bool hdrs Whether column names are included in the first row.
    * Default is true.
    * @return Google_Service_Fusiontables_Sqlresponse
    */
@@ -775,15 +776,17 @@ class Google_Service_Fusiontables_Query_Resource extends Google_Service_Resource
   }
 
   /**
-   * Executes an SQL SELECT/SHOW/DESCRIBE statement. (query.sqlGet)
+   * Executes a SQL statement which can be any of - SELECT - SHOW - DESCRIBE
+   * (query.sqlGet)
    *
-   * @param string $sql An SQL SELECT/SHOW/DESCRIBE statement.
+   * @param string $sql A SQL statement which can be any of - SELECT - SHOW -
+   * DESCRIBE
    * @param array $optParams Optional parameters.
    *
-   * @opt_param bool typed Should typed values be returned in the (JSON) response
-   * -- numbers for numeric values and parsed geometries for KML values? Default
-   * is true.
-   * @opt_param bool hdrs Should column names be included (in the first row)?.
+   * @opt_param bool typed Whether typed values are returned in the (JSON)
+   * response: numbers for numeric values and parsed geometries for KML values.
+   * Default is true.
+   * @opt_param bool hdrs Whether column names are included (in the first row).
    * Default is true.
    * @return Google_Service_Fusiontables_Sqlresponse
    */
@@ -934,7 +937,7 @@ class Google_Service_Fusiontables_Table_Resource extends Google_Service_Resource
   /**
    * Deletes a table. (table.delete)
    *
-   * @param string $tableId ID of the table that is being deleted.
+   * @param string $tableId ID of the table to be deleted.
    * @param array $optParams Optional parameters.
    */
   public function delete($tableId, $optParams = array())
@@ -945,9 +948,9 @@ class Google_Service_Fusiontables_Table_Resource extends Google_Service_Resource
   }
 
   /**
-   * Retrieves a specific table by its id. (table.get)
+   * Retrieves a specific table by its ID. (table.get)
    *
-   * @param string $tableId Identifier(ID) for the table being requested.
+   * @param string $tableId Identifier for the table being requested.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Fusiontables_Table
    */
@@ -959,28 +962,24 @@ class Google_Service_Fusiontables_Table_Resource extends Google_Service_Resource
   }
 
   /**
-   * Import more rows into a table. (table.importRows)
+   * Imports more rows into a table. (table.importRows)
    *
    * @param string $tableId The table into which new rows are being imported.
    * @param array $optParams Optional parameters.
    *
    * @opt_param int startLine The index of the first line from which to start
    * importing, inclusive. Default is 0.
-   * @opt_param bool isStrict Whether the CSV must have the same number of values
-   * for each row. If false, rows with fewer values will be padded with empty
-   * values. Default is true.
+   * @opt_param bool isStrict Whether the imported CSV must have the same number
+   * of values for each row. If false, rows with fewer values will be padded with
+   * empty values. Default is true.
    * @opt_param string encoding The encoding of the content. Default is UTF-8. Use
-   * 'auto-detect' if you are unsure of the encoding.
+   * auto-detect if you are unsure of the encoding.
    * @opt_param string delimiter The delimiter used to separate cell values. This
-   * can only consist of a single character. Default is ','.
-   * @opt_param int endLine The index of the last line from which to start
-   * importing, exclusive. Thus, the number of imported lines is endLine -
-   * startLine. If this parameter is not provided, the file will be imported until
-   * the last line of the file. If endLine is negative, then the imported content
-   * will exclude the last endLine lines. That is, if endline is negative, no line
-   * will be imported whose index is greater than N + endLine where N is the
-   * number of lines in the file, and the number of imported lines will be N +
-   * endLine - startLine.
+   * can only consist of a single character. Default is ,.
+   * @opt_param int endLine The index of the line up to which data will be
+   * imported. Default is to import the entire file. If endLine is negative, it is
+   * an offset from the end of the file; the imported content will exclude the
+   * last endLine lines.
    * @return Google_Service_Fusiontables_Import
    */
   public function importRows($tableId, $optParams = array())
@@ -991,15 +990,15 @@ class Google_Service_Fusiontables_Table_Resource extends Google_Service_Resource
   }
 
   /**
-   * Import a new table. (table.importTable)
+   * Imports a new table. (table.importTable)
    *
    * @param string $name The name to be assigned to the new table.
    * @param array $optParams Optional parameters.
    *
    * @opt_param string delimiter The delimiter used to separate cell values. This
-   * can only consist of a single character. Default is ','.
+   * can only consist of a single character. Default is ,.
    * @opt_param string encoding The encoding of the content. Default is UTF-8. Use
-   * 'auto-detect' if you are unsure of the encoding.
+   * auto-detect if you are unsure of the encoding.
    * @return Google_Service_Fusiontables_Table
    */
   public function importTable($name, $optParams = array())
@@ -1029,9 +1028,9 @@ class Google_Service_Fusiontables_Table_Resource extends Google_Service_Resource
    * @param array $optParams Optional parameters.
    *
    * @opt_param string pageToken Continuation token specifying which result page
-   * to return. Optional.
-   * @opt_param string maxResults Maximum number of styles to return. Optional.
-   * Default is 5.
+   * to return.
+   * @opt_param string maxResults Maximum number of tables to return. Default is
+   * 5.
    * @return Google_Service_Fusiontables_TableList
    */
   public function listTable($optParams = array())
@@ -1050,8 +1049,8 @@ class Google_Service_Fusiontables_Table_Resource extends Google_Service_Resource
    * @param Google_Table $postBody
    * @param array $optParams Optional parameters.
    *
-   * @opt_param bool replaceViewDefinition Should the view definition also be
-   * updated? The specified view definition replaces the existing one. Only a view
+   * @opt_param bool replaceViewDefinition Whether the view definition is also
+   * updated. The specified view definition replaces the existing one. Only a view
    * can be updated with a new definition.
    * @return Google_Service_Fusiontables_Table
    */
@@ -1071,18 +1070,18 @@ class Google_Service_Fusiontables_Table_Resource extends Google_Service_Resource
    *
    * @opt_param int startLine The index of the first line from which to start
    * importing, inclusive. Default is 0.
-   * @opt_param bool isStrict Whether the CSV must have the same number of column
-   * values for each row. If true, throws an exception if the CSV does not not
-   * have the same number of columns. If false, rows with fewer column values will
-   * be padded with empty values. Default is true.
+   * @opt_param bool isStrict Whether the imported CSV must have the same number
+   * of column values for each row. If true, throws an exception if the CSV does
+   * not have the same number of columns. If false, rows with fewer column values
+   * will be padded with empty values. Default is true.
    * @opt_param string encoding The encoding of the content. Default is UTF-8. Use
    * 'auto-detect' if you are unsure of the encoding.
    * @opt_param string delimiter The delimiter used to separate cell values. This
-   * can only consist of a single character. Default is ','.
-   * @opt_param int endLine The index of the last line to import, exclusive.
-   * 'endLine - startLine' rows will be imported. Default is to import through the
-   * end of the file. If endLine is negative, it is an offset from the end of the
-   * file; the imported content will exclude the last endLine lines.
+   * can only consist of a single character. Default is ,.
+   * @opt_param int endLine The index of the line up to which data will be
+   * imported. Default is to import the entire file. If endLine is negative, it is
+   * an offset from the end of the file; the imported content will exclude the
+   * last endLine lines.
    * @return Google_Service_Fusiontables_Task
    */
   public function replaceRows($tableId, $optParams = array())
@@ -1100,8 +1099,8 @@ class Google_Service_Fusiontables_Table_Resource extends Google_Service_Resource
    * @param Google_Table $postBody
    * @param array $optParams Optional parameters.
    *
-   * @opt_param bool replaceViewDefinition Should the view definition also be
-   * updated? The specified view definition replaces the existing one. Only a view
+   * @opt_param bool replaceViewDefinition Whether the view definition is also
+   * updated. The specified view definition replaces the existing one. Only a view
    * can be updated with a new definition.
    * @return Google_Service_Fusiontables_Table
    */
@@ -1125,10 +1124,11 @@ class Google_Service_Fusiontables_Task_Resource extends Google_Service_Resource
 {
 
   /**
-   * Deletes the task, unless already started. (task.delete)
+   * Deletes a specific task by its ID, unless that task has already started
+   * running. (task.delete)
    *
    * @param string $tableId Table from which the task is being deleted.
-   * @param string $taskId
+   * @param string $taskId The identifier of the task to delete.
    * @param array $optParams Optional parameters.
    */
   public function delete($tableId, $taskId, $optParams = array())
@@ -1139,10 +1139,10 @@ class Google_Service_Fusiontables_Task_Resource extends Google_Service_Resource
   }
 
   /**
-   * Retrieves a specific task by its id. (task.get)
+   * Retrieves a specific task by its ID. (task.get)
    *
    * @param string $tableId Table to which the task belongs.
-   * @param string $taskId
+   * @param string $taskId The identifier of the task to get.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Fusiontables_Task
    */

lib/google/src/Google/Service/Games.php

@@ -65,6 +65,7 @@ class Google_Service_Games extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'games/v1/';
     $this->version = 'v1';
     $this->serviceName = 'games';

lib/google/src/Google/Service/GamesManagement.php

@@ -55,6 +55,7 @@ class Google_Service_GamesManagement extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'games/v1management/';
     $this->version = 'v1management';
     $this->serviceName = 'gamesManagement';

lib/google/src/Google/Service/Gmail.php

@@ -36,6 +36,12 @@ class Google_Service_Gmail extends Google_Service
   /** Manage drafts and send emails. */
   const GMAIL_COMPOSE =
       "https://www.googleapis.com/auth/gmail.compose";
+  /** Insert mail into your mailbox. */
+  const GMAIL_INSERT =
+      "https://www.googleapis.com/auth/gmail.insert";
+  /** Manage mailbox labels. */
+  const GMAIL_LABELS =
+      "https://www.googleapis.com/auth/gmail.labels";
   /** View and modify but not delete your email. */
   const GMAIL_MODIFY =
       "https://www.googleapis.com/auth/gmail.modify";
@@ -60,6 +66,7 @@ class Google_Service_Gmail extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'gmail/v1/users/';
     $this->version = 'v1';
     $this->serviceName = 'gmail';
@@ -80,6 +87,26 @@ class Google_Service_Gmail extends Google_Service
                   'required' => true,
                 ),
               ),
+            ),'stop' => array(
+              'path' => '{userId}/stop',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'userId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'watch' => array(
+              'path' => '{userId}/watch',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'userId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
             ),
           )
         )
@@ -361,10 +388,22 @@ class Google_Service_Gmail extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
+                'deleted' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'processForCalendar' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
                 'internalDateSource' => array(
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'neverMarkSpam' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
               ),
             ),'insert' => array(
               'path' => '{userId}/messages',
@@ -375,6 +414,10 @@ class Google_Service_Gmail extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
+                'deleted' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
                 'internalDateSource' => array(
                   'location' => 'query',
                   'type' => 'string',
@@ -654,6 +697,37 @@ class Google_Service_Gmail_Users_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('getProfile', array($params), "Google_Service_Gmail_Profile");
   }
+
+  /**
+   * Stop receiving push notifications for the given user mailbox. (users.stop)
+   *
+   * @param string $userId The user's email address. The special value me can be
+   * used to indicate the authenticated user.
+   * @param array $optParams Optional parameters.
+   */
+  public function stop($userId, $optParams = array())
+  {
+    $params = array('userId' => $userId);
+    $params = array_merge($params, $optParams);
+    return $this->call('stop', array($params));
+  }
+
+  /**
+   * Set up or update a push notification watch on the given user mailbox.
+   * (users.watch)
+   *
+   * @param string $userId The user's email address. The special value me can be
+   * used to indicate the authenticated user.
+   * @param Google_WatchRequest $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Gmail_WatchResponse
+   */
+  public function watch($userId, Google_Service_Gmail_WatchRequest $postBody, $optParams = array())
+  {
+    $params = array('userId' => $userId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('watch', array($params), "Google_Service_Gmail_WatchResponse");
+  }
 }
 
 /**
@@ -800,10 +874,11 @@ class Google_Service_Gmail_UsersHistory_Resource extends Google_Service_Resource
    * increase chronologically but are not contiguous with random gaps in between
    * valid IDs. Supplying an invalid or out of date startHistoryId typically
    * returns an HTTP 404 error code. A historyId is typically valid for at least a
-   * week, but in some circumstances may be valid for only a few hours. If you
-   * receive an HTTP 404 error response, your application should perform a full
-   * sync. If you receive no nextPageToken in the response, there are no updates
-   * to retrieve and you can store the returned historyId for a future request.
+   * week, but in some rare circumstances may be valid for only a few hours. If
+   * you receive an HTTP 404 error response, your application should perform a
+   * full sync. If you receive no nextPageToken in the response, there are no
+   * updates to retrieve and you can store the returned historyId for a future
+   * request.
    * @return Google_Service_Gmail_ListHistoryResponse
    */
   public function listUsersHistory($userId, $optParams = array())
@@ -979,8 +1054,15 @@ class Google_Service_Gmail_UsersMessages_Resource extends Google_Service_Resourc
    * @param Google_Message $postBody
    * @param array $optParams Optional parameters.
    *
+   * @opt_param bool deleted Mark the email as permanently deleted (not TRASH) and
+   * only visible in Google Apps Vault to a Vault administrator. Only used for
+   * Google Apps for Work accounts.
+   * @opt_param bool processForCalendar Process calendar invites in the email and
+   * add any extracted meetings to the Google Calendar for this user.
    * @opt_param string internalDateSource Source for Gmail's internal date of the
    * message.
+   * @opt_param bool neverMarkSpam Ignore the Gmail spam classifier decision and
+   * never mark this email as SPAM in the mailbox.
    * @return Google_Service_Gmail_Message
    */
   public function import($userId, Google_Service_Gmail_Message $postBody, $optParams = array())
@@ -1000,6 +1082,9 @@ class Google_Service_Gmail_UsersMessages_Resource extends Google_Service_Resourc
    * @param Google_Message $postBody
    * @param array $optParams Optional parameters.
    *
+   * @opt_param bool deleted Mark the email as permanently deleted (not TRASH) and
+   * only visible in Google Apps Vault to a Vault administrator. Only used for
+   * Google Apps for Work accounts.
    * @opt_param string internalDateSource Source for Gmail's internal date of the
    * message.
    * @return Google_Service_Gmail_Message
@@ -1288,12 +1373,20 @@ class Google_Service_Gmail_Draft extends Google_Model
 
 class Google_Service_Gmail_History extends Google_Collection
 {
-  protected $collection_key = 'messages';
+  protected $collection_key = 'messagesDeleted';
   protected $internal_gapi_mappings = array(
   );
   public $id;
+  protected $labelsAddedType = 'Google_Service_Gmail_HistoryLabelAdded';
+  protected $labelsAddedDataType = 'array';
+  protected $labelsRemovedType = 'Google_Service_Gmail_HistoryLabelRemoved';
+  protected $labelsRemovedDataType = 'array';
   protected $messagesType = 'Google_Service_Gmail_Message';
   protected $messagesDataType = 'array';
+  protected $messagesAddedType = 'Google_Service_Gmail_HistoryMessageAdded';
+  protected $messagesAddedDataType = 'array';
+  protected $messagesDeletedType = 'Google_Service_Gmail_HistoryMessageDeleted';
+  protected $messagesDeletedDataType = 'array';
 
 
   public function setId($id)
@@ -1304,6 +1397,22 @@ class Google_Service_Gmail_History extends Google_Collection
   {
     return $this->id;
   }
+  public function setLabelsAdded($labelsAdded)
+  {
+    $this->labelsAdded = $labelsAdded;
+  }
+  public function getLabelsAdded()
+  {
+    return $this->labelsAdded;
+  }
+  public function setLabelsRemoved($labelsRemoved)
+  {
+    $this->labelsRemoved = $labelsRemoved;
+  }
+  public function getLabelsRemoved()
+  {
+    return $this->labelsRemoved;
+  }
   public function setMessages($messages)
   {
     $this->messages = $messages;
@@ -1312,6 +1421,114 @@ class Google_Service_Gmail_History extends Google_Collection
   {
     return $this->messages;
   }
+  public function setMessagesAdded($messagesAdded)
+  {
+    $this->messagesAdded = $messagesAdded;
+  }
+  public function getMessagesAdded()
+  {
+    return $this->messagesAdded;
+  }
+  public function setMessagesDeleted($messagesDeleted)
+  {
+    $this->messagesDeleted = $messagesDeleted;
+  }
+  public function getMessagesDeleted()
+  {
+    return $this->messagesDeleted;
+  }
+}
+
+class Google_Service_Gmail_HistoryLabelAdded extends Google_Collection
+{
+  protected $collection_key = 'labelIds';
+  protected $internal_gapi_mappings = array(
+  );
+  public $labelIds;
+  protected $messageType = 'Google_Service_Gmail_Message';
+  protected $messageDataType = '';
+
+
+  public function setLabelIds($labelIds)
+  {
+    $this->labelIds = $labelIds;
+  }
+  public function getLabelIds()
+  {
+    return $this->labelIds;
+  }
+  public function setMessage(Google_Service_Gmail_Message $message)
+  {
+    $this->message = $message;
+  }
+  public function getMessage()
+  {
+    return $this->message;
+  }
+}
+
+class Google_Service_Gmail_HistoryLabelRemoved extends Google_Collection
+{
+  protected $collection_key = 'labelIds';
+  protected $internal_gapi_mappings = array(
+  );
+  public $labelIds;
+  protected $messageType = 'Google_Service_Gmail_Message';
+  protected $messageDataType = '';
+
+
+  public function setLabelIds($labelIds)
+  {
+    $this->labelIds = $labelIds;
+  }
+  public function getLabelIds()
+  {
+    return $this->labelIds;
+  }
+  public function setMessage(Google_Service_Gmail_Message $message)
+  {
+    $this->message = $message;
+  }
+  public function getMessage()
+  {
+    return $this->message;
+  }
+}
+
+class Google_Service_Gmail_HistoryMessageAdded extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  protected $messageType = 'Google_Service_Gmail_Message';
+  protected $messageDataType = '';
+
+
+  public function setMessage(Google_Service_Gmail_Message $message)
+  {
+    $this->message = $message;
+  }
+  public function getMessage()
+  {
+    return $this->message;
+  }
+}
+
+class Google_Service_Gmail_HistoryMessageDeleted extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  protected $messageType = 'Google_Service_Gmail_Message';
+  protected $messageDataType = '';
+
+
+  public function setMessage(Google_Service_Gmail_Message $message)
+  {
+    $this->message = $message;
+  }
+  public function getMessage()
+  {
+    return $this->message;
+  }
 }
 
 class Google_Service_Gmail_Label extends Google_Model
@@ -1577,6 +1794,7 @@ class Google_Service_Gmail_Message extends Google_Collection
   );
   public $historyId;
   public $id;
+  public $internalDate;
   public $labelIds;
   protected $payloadType = 'Google_Service_Gmail_MessagePart';
   protected $payloadDataType = '';
@@ -1602,6 +1820,14 @@ class Google_Service_Gmail_Message extends Google_Collection
   {
     return $this->id;
   }
+  public function setInternalDate($internalDate)
+  {
+    $this->internalDate = $internalDate;
+  }
+  public function getInternalDate()
+  {
+    return $this->internalDate;
+  }
   public function setLabelIds($labelIds)
   {
     $this->labelIds = $labelIds;
@@ -1922,3 +2148,65 @@ class Google_Service_Gmail_Thread extends Google_Collection
     return $this->snippet;
   }
 }
+
+class Google_Service_Gmail_WatchRequest extends Google_Collection
+{
+  protected $collection_key = 'labelIds';
+  protected $internal_gapi_mappings = array(
+  );
+  public $labelFilterAction;
+  public $labelIds;
+  public $topicName;
+
+
+  public function setLabelFilterAction($labelFilterAction)
+  {
+    $this->labelFilterAction = $labelFilterAction;
+  }
+  public function getLabelFilterAction()
+  {
+    return $this->labelFilterAction;
+  }
+  public function setLabelIds($labelIds)
+  {
+    $this->labelIds = $labelIds;
+  }
+  public function getLabelIds()
+  {
+    return $this->labelIds;
+  }
+  public function setTopicName($topicName)
+  {
+    $this->topicName = $topicName;
+  }
+  public function getTopicName()
+  {
+    return $this->topicName;
+  }
+}
+
+class Google_Service_Gmail_WatchResponse extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $expiration;
+  public $historyId;
+
+
+  public function setExpiration($expiration)
+  {
+    $this->expiration = $expiration;
+  }
+  public function getExpiration()
+  {
+    return $this->expiration;
+  }
+  public function setHistoryId($historyId)
+  {
+    $this->historyId = $historyId;
+  }
+  public function getHistoryId()
+  {
+    return $this->historyId;
+  }
+}

lib/google/src/Google/Service/GroupsMigration.php

@@ -30,7 +30,9 @@
  */
 class Google_Service_GroupsMigration extends Google_Service
 {
-
+  /** Manage messages in groups on your domain. */
+  const APPS_GROUPS_MIGRATION =
+      "https://www.googleapis.com/auth/apps.groups.migration";
 
   public $archive;
   
@@ -43,6 +45,7 @@ class Google_Service_GroupsMigration extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'groups/v1/groups/';
     $this->version = 'v1';
     $this->serviceName = 'groupsmigration';

lib/google/src/Google/Service/Groupssettings.php

@@ -45,6 +45,7 @@ class Google_Service_Groupssettings extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'groups/v1/groups/';
     $this->version = 'v1';
     $this->serviceName = 'groupssettings';

lib/google/src/Google/Service/IdentityToolkit.php

@@ -43,6 +43,7 @@ class Google_Service_IdentityToolkit extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'identitytoolkit/v3/relyingparty/';
     $this->version = 'v3';
     $this->serviceName = 'identitytoolkit';
@@ -77,6 +78,10 @@ class Google_Service_IdentityToolkit extends Google_Service
               'path' => 'publicKeys',
               'httpMethod' => 'GET',
               'parameters' => array(),
+            ),'getRecaptchaParam' => array(
+              'path' => 'getRecaptchaParam',
+              'httpMethod' => 'GET',
+              'parameters' => array(),
             ),'resetPassword' => array(
               'path' => 'resetPassword',
               'httpMethod' => 'POST',
@@ -201,6 +206,19 @@ class Google_Service_IdentityToolkit_Relyingparty_Resource extends Google_Servic
     return $this->call('getPublicKeys', array($params), "Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyGetPublicKeysResponse");
   }
 
+  /**
+   * Get recaptcha secure param. (relyingparty.getRecaptchaParam)
+   *
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_IdentityToolkit_GetRecaptchaParamResponse
+   */
+  public function getRecaptchaParam($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('getRecaptchaParam', array($params), "Google_Service_IdentityToolkit_GetRecaptchaParamResponse");
+  }
+
   /**
    * Reset password for a user. (relyingparty.resetPassword)
    *
@@ -445,6 +463,41 @@ class Google_Service_IdentityToolkit_GetOobConfirmationCodeResponse extends Goog
   }
 }
 
+class Google_Service_IdentityToolkit_GetRecaptchaParamResponse extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $kind;
+  public $recaptchaSiteKey;
+  public $recaptchaStoken;
+
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+  public function setRecaptchaSiteKey($recaptchaSiteKey)
+  {
+    $this->recaptchaSiteKey = $recaptchaSiteKey;
+  }
+  public function getRecaptchaSiteKey()
+  {
+    return $this->recaptchaSiteKey;
+  }
+  public function setRecaptchaStoken($recaptchaStoken)
+  {
+    $this->recaptchaStoken = $recaptchaStoken;
+  }
+  public function getRecaptchaStoken()
+  {
+    return $this->recaptchaStoken;
+  }
+}
+
 class Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyCreateAuthUriRequest extends Google_Model
 {
   protected $internal_gapi_mappings = array(
@@ -454,6 +507,8 @@ class Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyCreateAuthUriReq
   public $context;
   public $continueUri;
   public $identifier;
+  public $oauthConsumerKey;
+  public $oauthScope;
   public $openidRealm;
   public $otaApp;
   public $providerId;
@@ -499,6 +554,22 @@ class Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyCreateAuthUriReq
   {
     return $this->identifier;
   }
+  public function setOauthConsumerKey($oauthConsumerKey)
+  {
+    $this->oauthConsumerKey = $oauthConsumerKey;
+  }
+  public function getOauthConsumerKey()
+  {
+    return $this->oauthConsumerKey;
+  }
+  public function setOauthScope($oauthScope)
+  {
+    $this->oauthScope = $oauthScope;
+  }
+  public function getOauthScope()
+  {
+    return $this->oauthScope;
+  }
   public function setOpenidRealm($openidRealm)
   {
     $this->openidRealm = $openidRealm;
@@ -659,6 +730,7 @@ class Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySetAccountInfoRe
   );
   public $captchaChallenge;
   public $captchaResponse;
+  public $disableUser;
   public $displayName;
   public $email;
   public $emailVerified;
@@ -668,6 +740,7 @@ class Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySetAccountInfoRe
   public $password;
   public $provider;
   public $upgradeToFederatedLogin;
+  public $validSince;
 
 
   public function setCaptchaChallenge($captchaChallenge)
@@ -686,6 +759,14 @@ class Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySetAccountInfoRe
   {
     return $this->captchaResponse;
   }
+  public function setDisableUser($disableUser)
+  {
+    $this->disableUser = $disableUser;
+  }
+  public function getDisableUser()
+  {
+    return $this->disableUser;
+  }
   public function setDisplayName($displayName)
   {
     $this->displayName = $displayName;
@@ -758,6 +839,14 @@ class Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySetAccountInfoRe
   {
     return $this->upgradeToFederatedLogin;
   }
+  public function setValidSince($validSince)
+  {
+    $this->validSince = $validSince;
+  }
+  public function getValidSince()
+  {
+    return $this->validSince;
+  }
 }
 
 class Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyUploadAccountRequest extends Google_Collection
@@ -831,6 +920,7 @@ class Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyVerifyAssertionR
   public $pendingIdToken;
   public $postBody;
   public $requestUri;
+  public $returnRefreshToken;
 
 
   public function setPendingIdToken($pendingIdToken)
@@ -857,6 +947,14 @@ class Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyVerifyAssertionR
   {
     return $this->requestUri;
   }
+  public function setReturnRefreshToken($returnRefreshToken)
+  {
+    $this->returnRefreshToken = $returnRefreshToken;
+  }
+  public function getReturnRefreshToken()
+  {
+    return $this->returnRefreshToken;
+  }
 }
 
 class Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyVerifyPasswordRequest extends Google_Model
@@ -1167,6 +1265,7 @@ class Google_Service_IdentityToolkit_UserInfo extends Google_Collection
   protected $collection_key = 'providerUserInfo';
   protected $internal_gapi_mappings = array(
   );
+  public $disabled;
   public $displayName;
   public $email;
   public $emailVerified;
@@ -1177,9 +1276,18 @@ class Google_Service_IdentityToolkit_UserInfo extends Google_Collection
   protected $providerUserInfoType = 'Google_Service_IdentityToolkit_UserInfoProviderUserInfo';
   protected $providerUserInfoDataType = 'array';
   public $salt;
+  public $validSince;
   public $version;
 
 
+  public function setDisabled($disabled)
+  {
+    $this->disabled = $disabled;
+  }
+  public function getDisabled()
+  {
+    return $this->disabled;
+  }
   public function setDisplayName($displayName)
   {
     $this->displayName = $displayName;
@@ -1252,6 +1360,14 @@ class Google_Service_IdentityToolkit_UserInfo extends Google_Collection
   {
     return $this->salt;
   }
+  public function setValidSince($validSince)
+  {
+    $this->validSince = $validSince;
+  }
+  public function getValidSince()
+  {
+    return $this->validSince;
+  }
   public function setVersion($version)
   {
     $this->version = $version;
@@ -1331,6 +1447,9 @@ class Google_Service_IdentityToolkit_VerifyAssertionResponse extends Google_Coll
   public $localId;
   public $needConfirmation;
   public $nickName;
+  public $oauthAccessToken;
+  public $oauthAuthorizationCode;
+  public $oauthExpireIn;
   public $oauthRequestToken;
   public $oauthScope;
   public $originalEmail;
@@ -1500,6 +1619,30 @@ class Google_Service_IdentityToolkit_VerifyAssertionResponse extends Google_Coll
   {
     return $this->nickName;
   }
+  public function setOauthAccessToken($oauthAccessToken)
+  {
+    $this->oauthAccessToken = $oauthAccessToken;
+  }
+  public function getOauthAccessToken()
+  {
+    return $this->oauthAccessToken;
+  }
+  public function setOauthAuthorizationCode($oauthAuthorizationCode)
+  {
+    $this->oauthAuthorizationCode = $oauthAuthorizationCode;
+  }
+  public function getOauthAuthorizationCode()
+  {
+    return $this->oauthAuthorizationCode;
+  }
+  public function setOauthExpireIn($oauthExpireIn)
+  {
+    $this->oauthExpireIn = $oauthExpireIn;
+  }
+  public function getOauthExpireIn()
+  {
+    return $this->oauthExpireIn;
+  }
   public function setOauthRequestToken($oauthRequestToken)
   {
     $this->oauthRequestToken = $oauthRequestToken;

lib/google/src/Google/Service/Licensing.php

@@ -30,7 +30,9 @@
  */
 class Google_Service_Licensing extends Google_Service
 {
-
+  /** View and manage Google Apps licenses for your domain. */
+  const APPS_LICENSING =
+      "https://www.googleapis.com/auth/apps.licensing";
 
   public $licenseAssignments;
   
@@ -43,6 +45,7 @@ class Google_Service_Licensing extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'apps/licensing/v1/product/';
     $this->version = 'v1';
     $this->serviceName = 'licensing';

lib/google/src/Google/Service/Manager.php

@@ -62,6 +62,7 @@ class Google_Service_Manager extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'manager/v1beta2/projects/';
     $this->version = 'v1beta2';
     $this->serviceName = 'manager';

lib/google/src/Google/Service/MapsEngine.php

@@ -71,6 +71,7 @@ class Google_Service_MapsEngine extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'mapsengine/v1/';
     $this->version = 'v1';
     $this->serviceName = 'mapsengine';

lib/google/src/Google/Service/Mirror.php

@@ -54,6 +54,7 @@ class Google_Service_Mirror extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'mirror/v1/';
     $this->version = 'v1';
     $this->serviceName = 'mirror';

lib/google/src/Google/Service/Oauth2.php

@@ -55,6 +55,7 @@ class Google_Service_Oauth2 extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = '';
     $this->version = 'v2';
     $this->serviceName = 'oauth2';
@@ -93,7 +94,11 @@ class Google_Service_Oauth2 extends Google_Service
         '',
         array(
           'methods' => array(
-            'tokeninfo' => array(
+            'getCertForOpenIdConnect' => array(
+              'path' => 'oauth2/v2/certs',
+              'httpMethod' => 'GET',
+              'parameters' => array(),
+            ),'tokeninfo' => array(
               'path' => 'oauth2/v2/tokeninfo',
               'httpMethod' => 'POST',
               'parameters' => array(
@@ -105,12 +110,28 @@ class Google_Service_Oauth2 extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'token_handle' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
               ),
             ),
           )
         )
     );
   }
+  /**
+   * (getCertForOpenIdConnect)
+   *
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Oauth2_Jwk
+   */
+  public function getCertForOpenIdConnect($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->base_methods->call('getCertForOpenIdConnect', array($params), "Google_Service_Oauth2_Jwk");
+  }
   /**
    * (tokeninfo)
    *
@@ -118,6 +139,7 @@ class Google_Service_Oauth2 extends Google_Service
    *
    * @opt_param string access_token
    * @opt_param string id_token
+   * @opt_param string token_handle
    * @return Google_Service_Oauth2_Tokeninfo
    */
   public function tokeninfo($optParams = array())
@@ -194,12 +216,94 @@ class Google_Service_Oauth2_UserinfoV2Me_Resource extends Google_Service_Resourc
 
 
 
+class Google_Service_Oauth2_Jwk extends Google_Collection
+{
+  protected $collection_key = 'keys';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $keysType = 'Google_Service_Oauth2_JwkKeys';
+  protected $keysDataType = 'array';
+
+
+  public function setKeys($keys)
+  {
+    $this->keys = $keys;
+  }
+  public function getKeys()
+  {
+    return $this->keys;
+  }
+}
+
+class Google_Service_Oauth2_JwkKeys extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $alg;
+  public $e;
+  public $kid;
+  public $kty;
+  public $n;
+  public $use;
+
+
+  public function setAlg($alg)
+  {
+    $this->alg = $alg;
+  }
+  public function getAlg()
+  {
+    return $this->alg;
+  }
+  public function setE($e)
+  {
+    $this->e = $e;
+  }
+  public function getE()
+  {
+    return $this->e;
+  }
+  public function setKid($kid)
+  {
+    $this->kid = $kid;
+  }
+  public function getKid()
+  {
+    return $this->kid;
+  }
+  public function setKty($kty)
+  {
+    $this->kty = $kty;
+  }
+  public function getKty()
+  {
+    return $this->kty;
+  }
+  public function setN($n)
+  {
+    $this->n = $n;
+  }
+  public function getN()
+  {
+    return $this->n;
+  }
+  public function setUse($use)
+  {
+    $this->use = $use;
+  }
+  public function getUse()
+  {
+    return $this->use;
+  }
+}
+
 class Google_Service_Oauth2_Tokeninfo extends Google_Model
 {
   protected $internal_gapi_mappings = array(
         "accessType" => "access_type",
         "expiresIn" => "expires_in",
         "issuedTo" => "issued_to",
+        "tokenHandle" => "token_handle",
         "userId" => "user_id",
         "verifiedEmail" => "verified_email",
   );
@@ -209,6 +313,7 @@ class Google_Service_Oauth2_Tokeninfo extends Google_Model
   public $expiresIn;
   public $issuedTo;
   public $scope;
+  public $tokenHandle;
   public $userId;
   public $verifiedEmail;
 
@@ -261,6 +366,14 @@ class Google_Service_Oauth2_Tokeninfo extends Google_Model
   {
     return $this->scope;
   }
+  public function setTokenHandle($tokenHandle)
+  {
+    $this->tokenHandle = $tokenHandle;
+  }
+  public function getTokenHandle()
+  {
+    return $this->tokenHandle;
+  }
   public function setUserId($userId)
   {
     $this->userId = $userId;

lib/google/src/Google/Service/Pagespeedonline.php

@@ -16,7 +16,7 @@
  */
 
 /**
- * Service definition for Pagespeedonline (v1).
+ * Service definition for Pagespeedonline (v2).
  *
  * <p>
  * Lets you analyze the performance of a web page and get tailored suggestions
@@ -24,7 +24,7 @@
  *
  * <p>
  * For more information about this service, see the API
- * <a href="https://developers.google.com/speed/docs/insights/v1/getting_started" target="_blank">Documentation</a>
+ * <a href="https://developers.google.com/speed/docs/insights/v2/getting-started" target="_blank">Documentation</a>
  * </p>
  *
  * @author Google, Inc.
@@ -44,8 +44,9 @@ class Google_Service_Pagespeedonline extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
-    $this->servicePath = 'pagespeedonline/v1/';
-    $this->version = 'v1';
+    $this->rootUrl = 'https://www.googleapis.com/';
+    $this->servicePath = 'pagespeedonline/v2/';
+    $this->version = 'v2';
     $this->serviceName = 'pagespeedonline';
 
     $this->pagespeedapi = new Google_Service_Pagespeedonline_Pagespeedapi_Resource(
@@ -105,8 +106,8 @@ class Google_Service_Pagespeedonline_Pagespeedapi_Resource extends Google_Servic
 {
 
   /**
-   * Runs Page Speed analysis on the page at the specified URL, and returns a Page
-   * Speed score, a list of suggestions to make that page faster, and other
+   * Runs PageSpeed analysis on the page at the specified URL, and returns
+   * PageSpeed scores, a list of suggestions to make that page faster, and other
    * information. (pagespeedapi.runpagespeed)
    *
    * @param string $url The URL to fetch and analyze
@@ -115,7 +116,7 @@ class Google_Service_Pagespeedonline_Pagespeedapi_Resource extends Google_Servic
    * @opt_param bool screenshot Indicates if binary data containing a screenshot
    * should be included
    * @opt_param string locale The locale used to localize formatted results
-   * @opt_param string rule A Page Speed rule to run; if none are given, all rules
+   * @opt_param string rule A PageSpeed rule to run; if none are given, all rules
    * are run
    * @opt_param string strategy The analysis strategy to use
    * @opt_param bool filter_third_party_resources Indicates if third party
@@ -133,6 +134,288 @@ class Google_Service_Pagespeedonline_Pagespeedapi_Resource extends Google_Servic
 
 
 
+class Google_Service_Pagespeedonline_PagespeedApiFormatStringV2 extends Google_Collection
+{
+  protected $collection_key = 'args';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $argsType = 'Google_Service_Pagespeedonline_PagespeedApiFormatStringV2Args';
+  protected $argsDataType = 'array';
+  public $format;
+
+
+  public function setArgs($args)
+  {
+    $this->args = $args;
+  }
+  public function getArgs()
+  {
+    return $this->args;
+  }
+  public function setFormat($format)
+  {
+    $this->format = $format;
+  }
+  public function getFormat()
+  {
+    return $this->format;
+  }
+}
+
+class Google_Service_Pagespeedonline_PagespeedApiFormatStringV2Args extends Google_Collection
+{
+  protected $collection_key = 'secondary_rects';
+  protected $internal_gapi_mappings = array(
+        "secondaryRects" => "secondary_rects",
+  );
+  public $key;
+  protected $rectsType = 'Google_Service_Pagespeedonline_PagespeedApiFormatStringV2ArgsRects';
+  protected $rectsDataType = 'array';
+  protected $secondaryRectsType = 'Google_Service_Pagespeedonline_PagespeedApiFormatStringV2ArgsSecondaryRects';
+  protected $secondaryRectsDataType = 'array';
+  public $type;
+  public $value;
+
+
+  public function setKey($key)
+  {
+    $this->key = $key;
+  }
+  public function getKey()
+  {
+    return $this->key;
+  }
+  public function setRects($rects)
+  {
+    $this->rects = $rects;
+  }
+  public function getRects()
+  {
+    return $this->rects;
+  }
+  public function setSecondaryRects($secondaryRects)
+  {
+    $this->secondaryRects = $secondaryRects;
+  }
+  public function getSecondaryRects()
+  {
+    return $this->secondaryRects;
+  }
+  public function setType($type)
+  {
+    $this->type = $type;
+  }
+  public function getType()
+  {
+    return $this->type;
+  }
+  public function setValue($value)
+  {
+    $this->value = $value;
+  }
+  public function getValue()
+  {
+    return $this->value;
+  }
+}
+
+class Google_Service_Pagespeedonline_PagespeedApiFormatStringV2ArgsRects extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $height;
+  public $left;
+  public $top;
+  public $width;
+
+
+  public function setHeight($height)
+  {
+    $this->height = $height;
+  }
+  public function getHeight()
+  {
+    return $this->height;
+  }
+  public function setLeft($left)
+  {
+    $this->left = $left;
+  }
+  public function getLeft()
+  {
+    return $this->left;
+  }
+  public function setTop($top)
+  {
+    $this->top = $top;
+  }
+  public function getTop()
+  {
+    return $this->top;
+  }
+  public function setWidth($width)
+  {
+    $this->width = $width;
+  }
+  public function getWidth()
+  {
+    return $this->width;
+  }
+}
+
+class Google_Service_Pagespeedonline_PagespeedApiFormatStringV2ArgsSecondaryRects extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $height;
+  public $left;
+  public $top;
+  public $width;
+
+
+  public function setHeight($height)
+  {
+    $this->height = $height;
+  }
+  public function getHeight()
+  {
+    return $this->height;
+  }
+  public function setLeft($left)
+  {
+    $this->left = $left;
+  }
+  public function getLeft()
+  {
+    return $this->left;
+  }
+  public function setTop($top)
+  {
+    $this->top = $top;
+  }
+  public function getTop()
+  {
+    return $this->top;
+  }
+  public function setWidth($width)
+  {
+    $this->width = $width;
+  }
+  public function getWidth()
+  {
+    return $this->width;
+  }
+}
+
+class Google_Service_Pagespeedonline_PagespeedApiImageV2 extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+        "mimeType" => "mime_type",
+        "pageRect" => "page_rect",
+  );
+  public $data;
+  public $height;
+  public $key;
+  public $mimeType;
+  protected $pageRectType = 'Google_Service_Pagespeedonline_PagespeedApiImageV2PageRect';
+  protected $pageRectDataType = '';
+  public $width;
+
+
+  public function setData($data)
+  {
+    $this->data = $data;
+  }
+  public function getData()
+  {
+    return $this->data;
+  }
+  public function setHeight($height)
+  {
+    $this->height = $height;
+  }
+  public function getHeight()
+  {
+    return $this->height;
+  }
+  public function setKey($key)
+  {
+    $this->key = $key;
+  }
+  public function getKey()
+  {
+    return $this->key;
+  }
+  public function setMimeType($mimeType)
+  {
+    $this->mimeType = $mimeType;
+  }
+  public function getMimeType()
+  {
+    return $this->mimeType;
+  }
+  public function setPageRect(Google_Service_Pagespeedonline_PagespeedApiImageV2PageRect $pageRect)
+  {
+    $this->pageRect = $pageRect;
+  }
+  public function getPageRect()
+  {
+    return $this->pageRect;
+  }
+  public function setWidth($width)
+  {
+    $this->width = $width;
+  }
+  public function getWidth()
+  {
+    return $this->width;
+  }
+}
+
+class Google_Service_Pagespeedonline_PagespeedApiImageV2PageRect extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $height;
+  public $left;
+  public $top;
+  public $width;
+
+
+  public function setHeight($height)
+  {
+    $this->height = $height;
+  }
+  public function getHeight()
+  {
+    return $this->height;
+  }
+  public function setLeft($left)
+  {
+    $this->left = $left;
+  }
+  public function getLeft()
+  {
+    return $this->left;
+  }
+  public function setTop($top)
+  {
+    $this->top = $top;
+  }
+  public function getTop()
+  {
+    return $this->top;
+  }
+  public function setWidth($width)
+  {
+    $this->width = $width;
+  }
+  public function getWidth()
+  {
+    return $this->width;
+  }
+}
+
 class Google_Service_Pagespeedonline_Result extends Google_Collection
 {
   protected $collection_key = 'invalidRules';
@@ -146,8 +429,9 @@ class Google_Service_Pagespeedonline_Result extends Google_Collection
   protected $pageStatsType = 'Google_Service_Pagespeedonline_ResultPageStats';
   protected $pageStatsDataType = '';
   public $responseCode;
-  public $score;
-  protected $screenshotType = 'Google_Service_Pagespeedonline_ResultScreenshot';
+  protected $ruleGroupsType = 'Google_Service_Pagespeedonline_ResultRuleGroupsElement';
+  protected $ruleGroupsDataType = 'map';
+  protected $screenshotType = 'Google_Service_Pagespeedonline_PagespeedApiImageV2';
   protected $screenshotDataType = '';
   public $title;
   protected $versionType = 'Google_Service_Pagespeedonline_ResultVersion';
@@ -202,15 +486,15 @@ class Google_Service_Pagespeedonline_Result extends Google_Collection
   {
     return $this->responseCode;
   }
-  public function setScore($score)
+  public function setRuleGroups($ruleGroups)
   {
-    $this->score = $score;
+    $this->ruleGroups = $ruleGroups;
   }
-  public function getScore()
+  public function getRuleGroups()
   {
-    return $this->score;
+    return $this->ruleGroups;
   }
-  public function setScreenshot(Google_Service_Pagespeedonline_ResultScreenshot $screenshot)
+  public function setScreenshot(Google_Service_Pagespeedonline_PagespeedApiImageV2 $screenshot)
   {
     $this->screenshot = $screenshot;
   }
@@ -272,12 +556,23 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElement ex
   protected $collection_key = 'urlBlocks';
   protected $internal_gapi_mappings = array(
   );
+  public $groups;
   public $localizedRuleName;
   public $ruleImpact;
+  protected $summaryType = 'Google_Service_Pagespeedonline_PagespeedApiFormatStringV2';
+  protected $summaryDataType = '';
   protected $urlBlocksType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocks';
   protected $urlBlocksDataType = 'array';
 
 
+  public function setGroups($groups)
+  {
+    $this->groups = $groups;
+  }
+  public function getGroups()
+  {
+    return $this->groups;
+  }
   public function setLocalizedRuleName($localizedRuleName)
   {
     $this->localizedRuleName = $localizedRuleName;
@@ -294,6 +589,14 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElement ex
   {
     return $this->ruleImpact;
   }
+  public function setSummary(Google_Service_Pagespeedonline_PagespeedApiFormatStringV2 $summary)
+  {
+    $this->summary = $summary;
+  }
+  public function getSummary()
+  {
+    return $this->summary;
+  }
   public function setUrlBlocks($urlBlocks)
   {
     $this->urlBlocks = $urlBlocks;
@@ -309,13 +612,13 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
   protected $collection_key = 'urls';
   protected $internal_gapi_mappings = array(
   );
-  protected $headerType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksHeader';
+  protected $headerType = 'Google_Service_Pagespeedonline_PagespeedApiFormatStringV2';
   protected $headerDataType = '';
   protected $urlsType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrls';
   protected $urlsDataType = 'array';
 
 
-  public function setHeader(Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksHeader $header)
+  public function setHeader(Google_Service_Pagespeedonline_PagespeedApiFormatStringV2 $header)
   {
     $this->header = $header;
   }
@@ -333,68 +636,14 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
   }
 }
 
-class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksHeader extends Google_Collection
-{
-  protected $collection_key = 'args';
-  protected $internal_gapi_mappings = array(
-  );
-  protected $argsType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksHeaderArgs';
-  protected $argsDataType = 'array';
-  public $format;
-
-
-  public function setArgs($args)
-  {
-    $this->args = $args;
-  }
-  public function getArgs()
-  {
-    return $this->args;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-}
-
-class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksHeaderArgs extends Google_Model
-{
-  protected $internal_gapi_mappings = array(
-  );
-  public $type;
-  public $value;
-
-
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
-
 class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrls extends Google_Collection
 {
   protected $collection_key = 'details';
   protected $internal_gapi_mappings = array(
   );
-  protected $detailsType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsDetails';
+  protected $detailsType = 'Google_Service_Pagespeedonline_PagespeedApiFormatStringV2';
   protected $detailsDataType = 'array';
-  protected $resultType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsResult';
+  protected $resultType = 'Google_Service_Pagespeedonline_PagespeedApiFormatStringV2';
   protected $resultDataType = '';
 
 
@@ -406,7 +655,7 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
   {
     return $this->details;
   }
-  public function setResult(Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsResult $result)
+  public function setResult(Google_Service_Pagespeedonline_PagespeedApiFormatStringV2 $result)
   {
     $this->result = $result;
   }
@@ -416,114 +665,6 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
   }
 }
 
-class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsDetails extends Google_Collection
-{
-  protected $collection_key = 'args';
-  protected $internal_gapi_mappings = array(
-  );
-  protected $argsType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsDetailsArgs';
-  protected $argsDataType = 'array';
-  public $format;
-
-
-  public function setArgs($args)
-  {
-    $this->args = $args;
-  }
-  public function getArgs()
-  {
-    return $this->args;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-}
-
-class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsDetailsArgs extends Google_Model
-{
-  protected $internal_gapi_mappings = array(
-  );
-  public $type;
-  public $value;
-
-
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
-
-class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsResult extends Google_Collection
-{
-  protected $collection_key = 'args';
-  protected $internal_gapi_mappings = array(
-  );
-  protected $argsType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsResultArgs';
-  protected $argsDataType = 'array';
-  public $format;
-
-
-  public function setArgs($args)
-  {
-    $this->args = $args;
-  }
-  public function getArgs()
-  {
-    return $this->args;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-}
-
-class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsResultArgs extends Google_Model
-{
-  protected $internal_gapi_mappings = array(
-  );
-  public $type;
-  public $value;
-
-
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
-
 class Google_Service_Pagespeedonline_ResultPageStats extends Google_Model
 {
   protected $internal_gapi_mappings = array(
@@ -649,48 +790,24 @@ class Google_Service_Pagespeedonline_ResultPageStats extends Google_Model
   }
 }
 
-class Google_Service_Pagespeedonline_ResultScreenshot extends Google_Model
+class Google_Service_Pagespeedonline_ResultRuleGroups extends Google_Model
+{
+}
+
+class Google_Service_Pagespeedonline_ResultRuleGroupsElement extends Google_Model
 {
   protected $internal_gapi_mappings = array(
-        "mimeType" => "mime_type",
   );
-  public $data;
-  public $height;
-  public $mimeType;
-  public $width;
+  public $score;
 
 
-  public function setData($data)
+  public function setScore($score)
   {
-    $this->data = $data;
+    $this->score = $score;
   }
-  public function getData()
+  public function getScore()
   {
-    return $this->data;
-  }
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
+    return $this->score;
   }
 }
 

lib/google/src/Google/Service/Playmoviespartner.php

@@ -0,0 +1,53 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * Service definition for Playmoviespartner (v1).
+ *
+ * <p>
+ * An API providing Google Play Movies Partners a way to get the delivery status
+ * of their titles.</p>
+ *
+ * <p>
+ * For more information about this service, see the API
+ * <a href="" target="_blank">Documentation</a>
+ * </p>
+ *
+ * @author Google, Inc.
+ */
+class Google_Service_Playmoviespartner extends Google_Service
+{
+
+
+
+  
+
+  /**
+   * Constructs the internal representation of the Playmoviespartner service.
+   *
+   * @param Google_Client $client
+   */
+  public function __construct(Google_Client $client)
+  {
+    parent::__construct($client);
+    $this->rootUrl = 'https://playmoviespartner.googleapis.com/';
+    $this->servicePath = '';
+    $this->version = 'v1';
+    $this->serviceName = 'playmoviespartner';
+
+  }
+}

lib/google/src/Google/Service/Plus.php

@@ -57,6 +57,7 @@ class Google_Service_Plus extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'plus/v1/';
     $this->version = 'v1';
     $this->serviceName = 'plus';

lib/google/src/Google/Service/PlusDomains.php

@@ -77,6 +77,7 @@ class Google_Service_PlusDomains extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'plusDomains/v1/';
     $this->version = 'v1';
     $this->serviceName = 'plusDomains';

lib/google/src/Google/Service/Prediction.php

@@ -56,6 +56,7 @@ class Google_Service_Prediction extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'prediction/v1.6/projects/';
     $this->version = 'v1.6';
     $this->serviceName = 'prediction';

lib/google/src/Google/Service/QPXExpress.php

@@ -44,6 +44,7 @@ class Google_Service_QPXExpress extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'qpxExpress/v1/trips/';
     $this->version = 'v1';
     $this->serviceName = 'qpxExpress';

lib/google/src/Google/Service/Replicapool.php

@@ -53,6 +53,7 @@ class Google_Service_Replicapool extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'replicapool/v1beta2/projects/';
     $this->version = 'v1beta2';
     $this->serviceName = 'replicapool';
@@ -393,8 +394,8 @@ class Google_Service_Replicapool_InstanceGroupManagers_Resource extends Google_S
   }
 
   /**
-   * Deletes the specified instances. The instances are removed from the instance
-   * group and any target pools of which they are a member, then deleted. The
+   * Deletes the specified instances. The instances are deleted, then removed from
+   * the instance group and any target pools of which they were a member. The
    * targetSize of the instance group manager is reduced by the number of
    * instances deleted. (instanceGroupManagers.deleteInstances)
    *
@@ -617,6 +618,8 @@ class Google_Service_Replicapool_InstanceGroupManager extends Google_Collection
   protected $collection_key = 'targetPools';
   protected $internal_gapi_mappings = array(
   );
+  protected $autoHealingPoliciesType = 'Google_Service_Replicapool_ReplicaPoolAutoHealingPolicy';
+  protected $autoHealingPoliciesDataType = 'array';
   public $baseInstanceName;
   public $creationTimestamp;
   public $currentSize;
@@ -632,6 +635,14 @@ class Google_Service_Replicapool_InstanceGroupManager extends Google_Collection
   public $targetSize;
 
 
+  public function setAutoHealingPolicies($autoHealingPolicies)
+  {
+    $this->autoHealingPolicies = $autoHealingPolicies;
+  }
+  public function getAutoHealingPolicies()
+  {
+    return $this->autoHealingPolicies;
+  }
   public function setBaseInstanceName($baseInstanceName)
   {
     $this->baseInstanceName = $baseInstanceName;
@@ -1271,3 +1282,29 @@ class Google_Service_Replicapool_OperationWarningsData extends Google_Model
     return $this->value;
   }
 }
+
+class Google_Service_Replicapool_ReplicaPoolAutoHealingPolicy extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $actionType;
+  public $healthCheck;
+
+
+  public function setActionType($actionType)
+  {
+    $this->actionType = $actionType;
+  }
+  public function getActionType()
+  {
+    return $this->actionType;
+  }
+  public function setHealthCheck($healthCheck)
+  {
+    $this->healthCheck = $healthCheck;
+  }
+  public function getHealthCheck()
+  {
+    return $this->healthCheck;
+  }
+}

lib/google/src/Google/Service/Reports.php

@@ -52,6 +52,7 @@ class Google_Service_Reports extends Google_Service
   public function __construct(Google_Client $client)
   {
     parent::__construct($client);
+    $this->rootUrl = 'https://www.googleapis.com/';
     $this->servicePath = 'admin/reports/v1/';
     $this->version = 'reports_v1';
     $this->serviceName = 'admin';