Merge pull request #40 from SurferJeffAtGoogle/fixCurl

Fix curl.

CMakeLists.txt

@@ -35,7 +35,6 @@ set(GOOGLEAPIS_EXTERNAL_DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/external_dependenci
 endif()
 
 find_package(Threads)
-find_package(curl)
 find_package(gflags)
 
 if (MSVC)

prepare_dependencies.py

@@ -1060,7 +1060,7 @@ def __init__(self, config, restricted_package_names):
           # The OpenSslCodec is not requird so if you get an https transport
           # from somewhere else then you do not need this dependency.
           'openssl': (OpenSslPackageInstaller(
-              config, 'http://www.openssl.org/source/openssl-1.0.1m.tar.gz')),
+              config, 'https://www.openssl.org/source/openssl-1.1.0e.tar.gz')),
           })
 
     self._url_map.update({
@@ -1099,7 +1099,7 @@ def __init__(self, config, restricted_package_names):
         #   'https://github.com/cesanta/mongoose/archive/master.zip')),
 
         'curl': (CurlPackageInstaller(
-            config, 'http://curl.haxx.se/download/curl-7.42.1.tar.gz')),
+            config, 'https://github.com/curl/curl/releases/download/curl-7_54_0/curl-7.54.0.tar.gz')),
         })
 
     # make sure cmake occurs first since others may depend on it

service_apis/calendar/descriptor.json

@@ -1,35 +1,35 @@
 {
-  "discoveryLink": "./apis/calendar/v3/rest", 
   "kind": "discovery#directoryItem", 
-  "description": "Lets you manipulate events and other calendar data.", 
+  "id": "calendar:v3", 
+  "name": "calendar", 
+  "version": "v3", 
   "title": "Calendar API", 
+  "description": "Manipulates events and other calendar data.", 
   "discoveryRestUrl": "https://www.googleapis.com/discovery/v1/apis/calendar/v3/rest", 
-  "preferred": true, 
-  "version": "v3", 
+  "discoveryLink": "./apis/calendar/v3/rest", 
   "icons": {
-    "x32": "http://www.google.com/images/icons/product/calendar-32.png", 
-    "x16": "http://www.google.com/images/icons/product/calendar-16.png"
+    "x16": "http://www.google.com/images/icons/product/calendar-16.png", 
+    "x32": "http://www.google.com/images/icons/product/calendar-32.png"
   }, 
   "documentationLink": "https://developers.google.com/google-apps/calendar/firstapp", 
-  "id": "calendar:v3", 
-  "name": "calendar", 
+  "preferred": true, 
   "packagePath": null, 
   "canonicalName": null, 
   "files": [
     {
-      "downloadUrl": "/downloads/calendar/v3/137/cpp/0.1.3/google-calendar-v3-rev137-cpp-0.1.3-doc.zip", 
-      "path": "google-calendar-v3-rev137-cpp-0.1.3-doc.zip", 
+      "downloadUrl": "/downloads/calendar/v3/243/cpp/0.1.4/google-calendar-v3-rev243-cpp-0.1.4-doc.zip", 
+      "path": "google-calendar-v3-rev243-cpp-0.1.4-doc.zip", 
       "type": "documentation", 
-      "timestamp": "2015-08-25 03:54"
+      "timestamp": "2017-04-06 03:08"
     }, 
     {
-      "downloadUrl": "/downloads/calendar/v3/137/cpp/0.1.3/google-calendar-v3-rev137-cpp-0.1.3-src.zip", 
+      "downloadUrl": "/downloads/calendar/v3/243/cpp/0.1.4/google-calendar-v3-rev243-cpp-0.1.4-src.zip", 
       "path": "", 
       "type": "source", 
-      "timestamp": "2015-08-25 03:53"
+      "timestamp": "2017-04-06 03:08"
     }
   ], 
-  "revision": 137, 
+  "revision": 243, 
   "language": "cpp", 
-  "language_version": "0.1.3"
+  "language_version": "0.1.4"
 }

service_apis/calendar/google/calendar_api/CMakeLists.txt

@@ -19,18 +19,24 @@ add_library(google_calendar_api STATIC
             channel.cc
             color_definition.cc
             colors.cc
+            deep_link_data.cc
+            display_info.cc
             error.cc
             event.cc
             event_attachment.cc
             event_attendee.cc
             event_date_time.cc
+            event_habit_instance.cc
             event_reminder.cc
             events.cc
             free_busy_calendar.cc
             free_busy_group.cc
             free_busy_request.cc
             free_busy_request_item.cc
             free_busy_response.cc
+            habit_instance_data.cc
+            launch_info.cc
+            link.cc
             setting.cc
             settings.cc
             time_period.cc

service_apis/calendar/google/calendar_api/acl.cc

@@ -1,5 +1,3 @@
-// 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
@@ -13,14 +11,13 @@
 // the License.
 
 // This code was generated by google-apis-code-generator 1.5.1
-//   C++ generator version: 0.1.3
 
 // ----------------------------------------------------------------------------
 // NOTE: This file is generated from Google APIs Discovery Service.
 // Service:
 //   Calendar API (calendar/v3)
 // Description:
-//   Lets you manipulate events and other calendar data.
+//   Manipulates events and other calendar data.
 // Classes:
 //   Acl
 // Documentation:
@@ -59,4 +56,16 @@ Acl::Acl(Json::Value* storage)
 // Standard destructor.
 Acl::~Acl() {
 }
+
+// Properties.
+
+const client::JsonCppArray<AclRule > Acl::get_items() const {
+   const Json::Value& storage = Storage("items");
+   return client::JsonValueToCppValueHelper<client::JsonCppArray<AclRule > >(storage);
+}
+
+client::JsonCppArray<AclRule > Acl::mutable_items(){
+  Json::Value* storage = MutableStorage("items");
+  return client::JsonValueToMutableCppValueHelper<client::JsonCppArray<AclRule > >(storage);
+}
 }  // namespace google_calendar_api

service_apis/calendar/google/calendar_api/acl.h

@@ -1,5 +1,3 @@
-// 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
@@ -13,17 +11,17 @@
 // the License.
 
 // This code was generated by google-apis-code-generator 1.5.1
-//   C++ generator version: 0.1.3
 
 // ----------------------------------------------------------------------------
 // NOTE: This file is generated from Google APIs Discovery Service.
 // Service:
 //   Calendar API (calendar/v3)
 // Generated from:
 //   Version: v3
+//   Revision: 20170402
 // Generated by:
 //    Tool: google-apis-code-generator 1.5.1
-//     C++: 0.1.3
+//     C++: 0.1.4
 #ifndef  GOOGLE_CALENDAR_API_ACL_H_
 #define  GOOGLE_CALENDAR_API_ACL_H_
 

service_apis/calendar/google/calendar_api/acl_rule.cc

@@ -1,5 +1,3 @@
-// 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
@@ -13,14 +11,13 @@
 // the License.
 
 // This code was generated by google-apis-code-generator 1.5.1
-//   C++ generator version: 0.1.3
 
 // ----------------------------------------------------------------------------
 // NOTE: This file is generated from Google APIs Discovery Service.
 // Service:
 //   Calendar API (calendar/v3)
 // Description:
-//   Lets you manipulate events and other calendar data.
+//   Manipulates events and other calendar data.
 // Classes:
 //   AclRule
 // Documentation:
@@ -58,6 +55,8 @@ AclRule::AclRuleScope::AclRuleScope(Json::Value* storage)
 // Standard destructor.
 AclRule::AclRuleScope::~AclRuleScope() {
 }
+
+// Properties.
 // Object factory method (static).
 AclRule* AclRule::New() {
   return new client::JsonCppCapsule<AclRule>;
@@ -76,4 +75,6 @@ AclRule::AclRule(Json::Value* storage)
 // Standard destructor.
 AclRule::~AclRule() {
 }
+
+// Properties.
 }  // namespace google_calendar_api

service_apis/calendar/google/calendar_api/acl_rule.h

@@ -1,5 +1,3 @@
-// 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
@@ -13,17 +11,17 @@
 // the License.
 
 // This code was generated by google-apis-code-generator 1.5.1
-//   C++ generator version: 0.1.3
 
 // ----------------------------------------------------------------------------
 // NOTE: This file is generated from Google APIs Discovery Service.
 // Service:
 //   Calendar API (calendar/v3)
 // Generated from:
 //   Version: v3
+//   Revision: 20170402
 // Generated by:
 //    Tool: google-apis-code-generator 1.5.1
-//     C++: 0.1.3
+//     C++: 0.1.4
 #ifndef  GOOGLE_CALENDAR_API_ACL_RULE_H_
 #define  GOOGLE_CALENDAR_API_ACL_RULE_H_
 

service_apis/calendar/google/calendar_api/calendar.cc

@@ -1,5 +1,3 @@
-// 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
@@ -13,14 +11,13 @@
 // the License.
 
 // This code was generated by google-apis-code-generator 1.5.1
-//   C++ generator version: 0.1.3
 
 // ----------------------------------------------------------------------------
 // NOTE: This file is generated from Google APIs Discovery Service.
 // Service:
 //   Calendar API (calendar/v3)
 // Description:
-//   Lets you manipulate events and other calendar data.
+//   Manipulates events and other calendar data.
 // Classes:
 //   Calendar
 // Documentation:
@@ -57,4 +54,6 @@ Calendar::Calendar(Json::Value* storage)
 // Standard destructor.
 Calendar::~Calendar() {
 }
+
+// Properties.
 }  // namespace google_calendar_api

service_apis/calendar/google/calendar_api/calendar.h

@@ -1,5 +1,3 @@
-// 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
@@ -13,17 +11,17 @@
 // the License.
 
 // This code was generated by google-apis-code-generator 1.5.1
-//   C++ generator version: 0.1.3
 
 // ----------------------------------------------------------------------------
 // NOTE: This file is generated from Google APIs Discovery Service.
 // Service:
 //   Calendar API (calendar/v3)
 // Generated from:
 //   Version: v3
+//   Revision: 20170402
 // Generated by:
 //    Tool: google-apis-code-generator 1.5.1
-//     C++: 0.1.3
+//     C++: 0.1.4
 #ifndef  GOOGLE_CALENDAR_API_CALENDAR_H_
 #define  GOOGLE_CALENDAR_API_CALENDAR_H_
 

service_apis/calendar/google/calendar_api/calendar_api.h

@@ -1,5 +1,3 @@
-// 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
@@ -12,7 +10,6 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 // This code was generated by google-apis-code-generator 1.5.1
-//   C++ generator version: 0.1.3
 
 #ifndef  GOOGLE_CALENDAR_API_CALENDAR_API_H_
 #define  GOOGLE_CALENDAR_API_CALENDAR_API_H_
@@ -27,11 +24,17 @@
 #include "google/calendar_api/channel.h"
 #include "google/calendar_api/color_definition.h"
 #include "google/calendar_api/colors.h"
+#include "google/calendar_api/display_info.h"
+#include "google/calendar_api/launch_info.h"
+#include "google/calendar_api/link.h"
+#include "google/calendar_api/deep_link_data.h"
 #include "google/calendar_api/error.h"
 #include "google/calendar_api/event_attachment.h"
 #include "google/calendar_api/event_attendee.h"
 #include "google/calendar_api/event_date_time.h"
 #include "google/calendar_api/event.h"
+#include "google/calendar_api/habit_instance_data.h"
+#include "google/calendar_api/event_habit_instance.h"
 #include "google/calendar_api/events.h"
 #include "google/calendar_api/time_period.h"
 #include "google/calendar_api/free_busy_calendar.h"

service_apis/calendar/google/calendar_api/calendar_list.cc

@@ -1,5 +1,3 @@
-// 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
@@ -13,14 +11,13 @@
 // the License.
 
 // This code was generated by google-apis-code-generator 1.5.1
-//   C++ generator version: 0.1.3
 
 // ----------------------------------------------------------------------------
 // NOTE: This file is generated from Google APIs Discovery Service.
 // Service:
 //   Calendar API (calendar/v3)
 // Description:
-//   Lets you manipulate events and other calendar data.
+//   Manipulates events and other calendar data.
 // Classes:
 //   CalendarList
 // Documentation:
@@ -59,4 +56,16 @@ CalendarList::CalendarList(Json::Value* storage)
 // Standard destructor.
 CalendarList::~CalendarList() {
 }
+
+// Properties.
+
+const client::JsonCppArray<CalendarListEntry > CalendarList::get_items() const {
+   const Json::Value& storage = Storage("items");
+   return client::JsonValueToCppValueHelper<client::JsonCppArray<CalendarListEntry > >(storage);
+}
+
+client::JsonCppArray<CalendarListEntry > CalendarList::mutable_items(){
+  Json::Value* storage = MutableStorage("items");
+  return client::JsonValueToMutableCppValueHelper<client::JsonCppArray<CalendarListEntry > >(storage);
+}
 }  // namespace google_calendar_api

service_apis/calendar/google/calendar_api/calendar_list.h

@@ -1,5 +1,3 @@
-// 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
@@ -13,17 +11,17 @@
 // the License.
 
 // This code was generated by google-apis-code-generator 1.5.1
-//   C++ generator version: 0.1.3
 
 // ----------------------------------------------------------------------------
 // NOTE: This file is generated from Google APIs Discovery Service.
 // Service:
 //   Calendar API (calendar/v3)
 // Generated from:
 //   Version: v3
+//   Revision: 20170402
 // Generated by:
 //    Tool: google-apis-code-generator 1.5.1
-//     C++: 0.1.3
+//     C++: 0.1.4
 #ifndef  GOOGLE_CALENDAR_API_CALENDAR_LIST_H_
 #define  GOOGLE_CALENDAR_API_CALENDAR_LIST_H_