Fix code generator and samples for latest gRPC API.

Examples/Echo/Generated/echo.grpc.swift

@@ -494,7 +494,7 @@ internal protocol Echo_EchoSession {
 }
 
 fileprivate class Echo_EchoSessionImpl: Echo_EchoSession {
-  var handler : gRPC.Handler
+  var handler : Handler
   var requestMetadata : Metadata { return handler.requestMetadata }
 
   var statusCode : StatusCode = .ok
@@ -502,7 +502,7 @@ fileprivate class Echo_EchoSessionImpl: Echo_EchoSession {
   var initialMetadata : Metadata = Metadata()
   var trailingMetadata : Metadata = Metadata()
 
-  init(handler:gRPC.Handler) {
+  init(handler:Handler) {
     self.handler = handler
   }
 }
@@ -515,7 +515,7 @@ fileprivate final class Echo_EchoGetSessionImpl : Echo_EchoSessionImpl, Echo_Ech
   private var provider : Echo_EchoProvider
 
   /// Create a session.
-  init(handler:gRPC.Handler, provider: Echo_EchoProvider) {
+  init(handler:Handler, provider: Echo_EchoProvider) {
     self.provider = provider
     super.init(handler:handler)
   }
@@ -546,7 +546,7 @@ fileprivate final class Echo_EchoExpandSessionImpl : Echo_EchoSessionImpl, Echo_
   private var provider : Echo_EchoProvider
 
   /// Create a session.
-  init(handler:gRPC.Handler, provider: Echo_EchoProvider) {
+  init(handler:Handler, provider: Echo_EchoProvider) {
     self.provider = provider
     super.init(handler:handler)
   }
@@ -596,7 +596,7 @@ fileprivate final class Echo_EchoCollectSessionImpl : Echo_EchoSessionImpl, Echo
   private var provider : Echo_EchoProvider
 
   /// Create a session.
-  init(handler:gRPC.Handler, provider: Echo_EchoProvider) {
+  init(handler:Handler, provider: Echo_EchoProvider) {
     self.provider = provider
     super.init(handler:handler)
   }
@@ -655,7 +655,7 @@ fileprivate final class Echo_EchoUpdateSessionImpl : Echo_EchoSessionImpl, Echo_
   private var provider : Echo_EchoProvider
 
   /// Create a session.
-  init(handler:gRPC.Handler, provider: Echo_EchoProvider) {
+  init(handler:Handler, provider: Echo_EchoProvider) {
     self.provider = provider
     super.init(handler:handler)
   }
@@ -714,7 +714,7 @@ fileprivate final class Echo_EchoUpdateSessionImpl : Echo_EchoSessionImpl, Echo_
 /// Main server for generated service
 internal final class Echo_EchoServer {
   private var address: String
-  private var server: gRPC.Server
+  private var server: Server
   private var provider: Echo_EchoProvider?
 
   /// Create a server that accepts insecure connections.
@@ -723,7 +723,7 @@ internal final class Echo_EchoServer {
     gRPC.initialize()
     self.address = address
     self.provider = provider
-    self.server = gRPC.Server(address:address)
+    self.server = Server(address:address)
   }
 
   /// Create a server that accepts secure connections.
@@ -740,7 +740,7 @@ internal final class Echo_EchoServer {
       else {
         return nil
     }
-    self.server = gRPC.Server(address:address, key:key, certs:certificate)
+    self.server = Server(address:address, key:key, certs:certificate)
   }
 
   /// Start the server.

Examples/Echo/PackageManager/Package.swift

@@ -1,5 +1,7 @@
+// swift-tools-version:4.0
+
 /*
- * Copyright 2016, gRPC Authors All rights reserved.
+ * Copyright 2017, gRPC Authors All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +16,20 @@
  * limitations under the License.
  */
 import PackageDescription
-let package = Package (
-    name: "Echo",
-    dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,3,3)),
-        .Package(url: "https://github.com/apple/swift-protobuf.git", Version(1,0,2)),
-        .Package(url: "https://github.com/kylef/Commander.git", Version(0,8,0)),
-    ]
-)
+
+let package = Package(
+  name: "Echo",
+  dependencies: [
+    .package(url: "../../..", .branch("HEAD")),
+    .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.0.2"),
+    .package(url: "https://github.com/kylef/Commander.git", from: "0.8.0")
+  ],
+  targets: [
+    .target(name: "Echo",
+            dependencies: [
+              "SwiftGRPC",
+              "SwiftProtobuf",
+              "Commander"
+            ],
+	    path: "Sources")
+  ])

Examples/Echo/PackageManager/Sources/main.swift

@@ -33,17 +33,17 @@ let messageOption = Option("message",
 
 // Helper function for client actions
 func buildEchoService(_ ssl: Bool, _ address: String, _ port: String, _: String)
-  -> Echo_EchoService {
-  var service: Echo_EchoService
+  -> Echo_EchoServiceClient {
+  var service: Echo_EchoServiceClient
   if ssl {
     let certificateURL = URL(fileURLWithPath: "ssl.crt")
     let certificates = try! String(contentsOf: certificateURL)
-    service = Echo_EchoService(address: address + ":" + port,
+    service = Echo_EchoServiceClient(address: address + ":" + port,
                                certificates: certificates,
                                host: "example.com")
     service.host = "example.com"
   } else {
-    service = Echo_EchoService(address: address + ":" + port, secure: false)
+    service = Echo_EchoServiceClient(address: address + ":" + port, secure: false)
   }
   service.metadata = Metadata([
     "x-goog-api-key": "YOUR_API_KEY",

Plugin/Templates/server-session-bidistreaming.swift

@@ -14,7 +14,7 @@ fileprivate final class {{ .|session:file,service,method }}Impl : {{ .|service:f
   private var provider : {{ .|provider:file,service }}
 
   /// Create a session.
-  init(handler:gRPC.Handler, provider: {{ .|provider:file,service }}) {
+  init(handler:Handler, provider: {{ .|provider:file,service }}) {
     self.provider = provider
     super.init(handler:handler)
   }

Plugin/Templates/server-session-clientstreaming.swift

@@ -11,7 +11,7 @@ fileprivate final class {{ .|session:file,service,method }}Impl : {{ .|service:f
   private var provider : {{ .|provider:file,service }}
 
   /// Create a session.
-  init(handler:gRPC.Handler, provider: {{ .|provider:file,service }}) {
+  init(handler:Handler, provider: {{ .|provider:file,service }}) {
     self.provider = provider
     super.init(handler:handler)
   }

Plugin/Templates/server-session-serverstreaming.swift

@@ -8,7 +8,7 @@ fileprivate final class {{ .|session:file,service,method }}Impl : {{ .|service:f
   private var provider : {{ .|provider:file,service }}
 
   /// Create a session.
-  init(handler:gRPC.Handler, provider: {{ .|provider:file,service }}) {
+  init(handler:Handler, provider: {{ .|provider:file,service }}) {
     self.provider = provider
     super.init(handler:handler)
   }

Plugin/Templates/server-session-unary.swift

@@ -5,7 +5,7 @@ fileprivate final class {{ .|session:file,service,method }}Impl : {{ .|service:f
   private var provider : {{ .|provider:file,service }}
 
   /// Create a session.
-  init(handler:gRPC.Handler, provider: {{ .|provider:file,service }}) {
+  init(handler:Handler, provider: {{ .|provider:file,service }}) {
     self.provider = provider
     super.init(handler:handler)
   }

Plugin/Templates/server.swift

@@ -34,7 +34,7 @@
 }
 
 fileprivate class {{ .|service:file,service }}SessionImpl: {{ .|service:file,service }}Session {
-  var handler : gRPC.Handler
+  var handler : Handler
   var requestMetadata : Metadata { return handler.requestMetadata }
 
   var statusCode : StatusCode = .ok
@@ -42,7 +42,7 @@ fileprivate class {{ .|service:file,service }}SessionImpl: {{ .|service:file,ser
   var initialMetadata : Metadata = Metadata()
   var trailingMetadata : Metadata = Metadata()
 
-  init(handler:gRPC.Handler) {
+  init(handler:Handler) {
     self.handler = handler
   }
 }
@@ -76,7 +76,7 @@ class {{ .|service:file,service }}SessionTestStub: {{ .|service:file,service }}S
 /// Main server for generated service
 {{ access }} final class {{ .|server:file,service }} {
   private var address: String
-  private var server: gRPC.Server
+  private var server: Server
   private var provider: {{ .|provider:file,service }}?
 
   /// Create a server that accepts insecure connections.
@@ -85,7 +85,7 @@ class {{ .|service:file,service }}SessionTestStub: {{ .|service:file,service }}S
     gRPC.initialize()
     self.address = address
     self.provider = provider
-    self.server = gRPC.Server(address:address)
+    self.server = Server(address:address)
   }
 
   /// Create a server that accepts secure connections.
@@ -102,7 +102,7 @@ class {{ .|service:file,service }}SessionTestStub: {{ .|service:file,service }}S
       else {
         return nil
     }
-    self.server = gRPC.Server(address:address, key:key, certs:certificate)
+    self.server = Server(address:address, key:key, certs:certificate)
   }
 
   /// Start the server.