13 files changed, 42 insertions, 87 deletions
diff --git a/templates/src/core/lib/surface/version.c.template b/templates/src/core/lib/surface/version.cc.template
index d2efa565e5..d9fa4479db 100644
--- a/templates/src/core/lib/surface/version.c.template
+++ b/templates/src/core/lib/surface/version.cc.template
@@ -23,6 +23,6 @@
 
   #include <grpc/grpc.h>
 
-  const char *grpc_version_string(void) { return "${settings.core_version}"; }
+  const char* grpc_version_string(void) { return "${settings.core_version}"; }
 
-  const char *grpc_g_stands_for(void) { return "${settings.g_stands_for}"; }
+  const char* grpc_g_stands_for(void) { return "${settings.g_stands_for}"; }
diff --git a/templates/src/core/plugin_registry.template b/templates/src/core/plugin_registry.template
index cf0f4f523e..805ae9049f 100644
--- a/templates/src/core/plugin_registry.template
+++ b/templates/src/core/plugin_registry.template
@@ -2,7 +2,7 @@
 ---
 foreach: libs
 cond: selected.get('generate_plugin_registry', False)
-output_name: ${selected.name}_plugin_registry.c
+output_name: ${selected.name}_plugin_registry.cc
 template: |
   /*
    *
@@ -25,8 +25,8 @@ template: |
   #include <grpc/grpc.h>
 
   %for plugin in selected.plugins:
-  extern void ${plugin}_init(void);
-  extern void ${plugin}_shutdown(void);
+  void ${plugin}_init(void);
+  void ${plugin}_shutdown(void);
   %endfor
 
   void grpc_register_built_in_plugins(void) {
diff --git a/templates/src/cpp/common/version_cc.cc.template b/templates/src/cpp/common/version_cc.cc.template
index d2e19fe264..9882878727 100644
--- a/templates/src/cpp/common/version_cc.cc.template
+++ b/templates/src/cpp/common/version_cc.cc.template
@@ -25,4 +25,4 @@
 
   namespace grpc {
   grpc::string Version() { return "${settings.cpp_version}"; }
-  }
+  }  // namespace grpc
diff --git a/templates/src/node/health_check/package.json.template b/templates/src/node/health_check/package.json.template
deleted file mode 100644
index 2bc6b13632..0000000000
--- a/templates/src/node/health_check/package.json.template
+++ /dev/null
@@ -1,31 +0,0 @@
-%YAML 1.2
---- |
-  {
-    "name": "grpc-health-check",
-    "version": "${settings.node_version}",
-    "author": "Google Inc.",
-    "description": "Health check service for use with gRPC",
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/grpc/grpc.git"
-    },
-    "bugs": "https://github.com/grpc/grpc/issues",
-    "contributors": [
-      {
-        "name": "Michael Lumish",
-        "email": "mlumish@google.com"
-      }
-    ],
-    "dependencies": {
-      "grpc": "^${settings.node_version}",
-      "lodash": "^3.9.3",
-      "google-protobuf": "^3.0.0"
-    },
-    "files": [
-      "LICENSE",
-      "health.js",
-      "v1"
-    ],
-    "main": "src/node/index.js",
-    "license": "Apache-2.0"
-  }
diff --git a/templates/src/node/tools/package.json.template b/templates/src/node/tools/package.json.template
deleted file mode 100644
index 74f68e4b81..0000000000
--- a/templates/src/node/tools/package.json.template
+++ /dev/null
@@ -1,43 +0,0 @@
-%YAML 1.2
---- |
-  {
-    "name": "grpc-tools",
-    "version": "${settings.node_version}",
-    "author": "Google Inc.",
-    "description": "Tools for developing with gRPC on Node.js",
-    "homepage": "https://grpc.io/",
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/grpc/grpc.git"
-    },
-    "bugs": "https://github.com/grpc/grpc/issues",
-    "contributors": [
-      {
-        "name": "Michael Lumish",
-        "email": "mlumish@google.com"
-      }
-    ],
-    "bin": {
-      "grpc_tools_node_protoc": "./bin/protoc.js",
-      "grpc_tools_node_protoc_plugin": "./bin/protoc_plugin.js"
-    },
-    "scripts": {
-      "install": "./node_modules/.bin/node-pre-gyp install"
-    },
-    "bundledDependencies": ["node-pre-gyp"],
-    "binary": {
-      "module_name": "grpc_tools",
-      "host": "https://storage.googleapis.com/",
-      "remote_path": "grpc-precompiled-binaries/node/{name}/v{version}",
-      "package_name": "{platform}-{arch}.tar.gz",
-      "module_path": "bin"
-    },
-    "files": [
-      "index.js",
-      "bin/protoc.js",
-      "bin/protoc_plugin.js",
-      "bin/google/protobuf",
-      "LICENSE"
-    ],
-    "main": "index.js"
-  }
diff --git a/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template b/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template
index 196c405468..5c1358f7c3 100644
--- a/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template
+++ b/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template
@@ -103,7 +103,7 @@
     s.preserve_paths = plugin
 
     # Restrict the protoc version to the one supported by this plugin.
-    s.dependency '!ProtoCompiler', '3.4.0'
+    s.dependency '!ProtoCompiler', '3.5.0'
     # For the Protobuf dependency not to complain:
     s.ios.deployment_target = '7.0'
     s.osx.deployment_target = '10.9'
diff --git a/templates/src/objective-c/tests/version.h.template b/templates/src/objective-c/tests/version.h.template
new file mode 100644
index 0000000000..72774ab99c
--- /dev/null
+++ b/templates/src/objective-c/tests/version.h.template
@@ -0,0 +1,29 @@
+%YAML 1.2
+--- |
+  /*
+   *
+   * Copyright 2015 gRPC authors.
+   *
+   * 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.
+   *
+   */
+
+  // This file is autogenerated from a template file. Please make
+  // modifications to
+  // `templates/src/objective-c/GRPCClient/private/version.h.template`
+  // instead. This file can be regenerated from the template by running
+  // `tools/buildgen/generate_projects.sh`.
+
+
+  #define GRPC_OBJC_VERSION_STRING @"${settings.version}"
+  #define GRPC_C_VERSION_STRING @"${settings.core_version}"
diff --git a/templates/src/python/grpcio/grpc_core_dependencies.py.template b/templates/src/python/grpcio/grpc_core_dependencies.py.template
index 02e066cf8f..6295ed3081 100644
--- a/templates/src/python/grpcio/grpc_core_dependencies.py.template
+++ b/templates/src/python/grpcio/grpc_core_dependencies.py.template
@@ -20,7 +20,7 @@
   % for lib in libs:
   % if lib.name in python_dependencies.transitive_deps:
   % for src in lib.src:
-    '${src}',
+      '${src}',
   % endfor
   % endif
   % endfor
diff --git a/templates/src/python/grpcio/grpc_version.py.template b/templates/src/python/grpcio/grpc_version.py.template
index 38ae54d619..5e5d22126e 100644
--- a/templates/src/python/grpcio/grpc_version.py.template
+++ b/templates/src/python/grpcio/grpc_version.py.template
@@ -16,4 +16,4 @@
 
   # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
 
-  VERSION='${settings.python_version.pep440()}'
+  VERSION = '${settings.python_version.pep440()}'
diff --git a/templates/src/python/grpcio_health_checking/grpc_version.py.template b/templates/src/python/grpcio_health_checking/grpc_version.py.template
index 558b2d152b..ffb81acc89 100644
--- a/templates/src/python/grpcio_health_checking/grpc_version.py.template
+++ b/templates/src/python/grpcio_health_checking/grpc_version.py.template
@@ -16,4 +16,4 @@
 
   # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
 
-  VERSION='${settings.python_version.pep440()}'
+  VERSION = '${settings.python_version.pep440()}'
diff --git a/templates/src/python/grpcio_reflection/grpc_version.py.template b/templates/src/python/grpcio_reflection/grpc_version.py.template
index 8fb42a4859..cc99533a43 100644
--- a/templates/src/python/grpcio_reflection/grpc_version.py.template
+++ b/templates/src/python/grpcio_reflection/grpc_version.py.template
@@ -16,4 +16,4 @@
 
   # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
 
-  VERSION='${settings.python_version.pep440()}'
+  VERSION = '${settings.python_version.pep440()}'
diff --git a/templates/src/python/grpcio_testing/grpc_version.py.template b/templates/src/python/grpcio_testing/grpc_version.py.template
index 74db811d60..a49392e5b1 100644
--- a/templates/src/python/grpcio_testing/grpc_version.py.template
+++ b/templates/src/python/grpcio_testing/grpc_version.py.template
@@ -16,4 +16,4 @@
 
   # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!
 
-  VERSION='${settings.python_version.pep440()}'
+  VERSION = '${settings.python_version.pep440()}'
diff --git a/templates/src/python/grpcio_tests/grpc_version.py.template b/templates/src/python/grpcio_tests/grpc_version.py.template
index 16fc92e536..851fb7bce1 100644
--- a/templates/src/python/grpcio_tests/grpc_version.py.template
+++ b/templates/src/python/grpcio_tests/grpc_version.py.template
@@ -16,4 +16,4 @@
 
   # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
 
-  VERSION='${settings.python_version.pep440()}'
+  VERSION = '${settings.python_version.pep440()}'