Merge pull request #274 from tikidunpon/master

Remove CzLib from dependencies

Examples/EchoXcode/Echo.xcodeproj/project.pbxproj

@@ -16,7 +16,6 @@
 		D35C9FC81D74B0C1000443CD /* EchoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D35C9FC71D74B0C1000443CD /* EchoViewController.swift */; };
 		D36AB73D1F58DF10007D7184 /* BoringSSL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D36AB7281F58DEDB007D7184 /* BoringSSL.framework */; };
 		D36AB73E1F58DF10007D7184 /* CgRPC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D36AB7261F58DEDB007D7184 /* CgRPC.framework */; };
-		D36AB73F1F58DF10007D7184 /* Czlib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D36AB7241F58DEDB007D7184 /* Czlib.framework */; };
 		D36AB7401F58DF10007D7184 /* SwiftGRPC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D36AB72A1F58DEDB007D7184 /* SwiftGRPC.framework */; };
 		D36AB7411F58DF10007D7184 /* SwiftProtobuf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D36AB7341F58DEDB007D7184 /* SwiftProtobuf.framework */; };
 		D3971E211D89132E001A0B3F /* ssl.key in Resources */ = {isa = PBXBuildFile; fileRef = D3971E201D89132E001A0B3F /* ssl.key */; };
@@ -104,7 +103,6 @@
 			files = (
 				D36AB73D1F58DF10007D7184 /* BoringSSL.framework in Frameworks */,
 				D36AB73E1F58DF10007D7184 /* CgRPC.framework in Frameworks */,
-				D36AB73F1F58DF10007D7184 /* Czlib.framework in Frameworks */,
 				D36AB7401F58DF10007D7184 /* gRPC.framework in Frameworks */,
 				D36AB7411F58DF10007D7184 /* SwiftProtobuf.framework in Frameworks */,
 			);
@@ -173,7 +171,6 @@
 			isa = PBXGroup;
 			children = (
 				D36AB7221F58DEDB007D7184 /* zlib-example */,
-				D36AB7241F58DEDB007D7184 /* Czlib.framework */,
 				D36AB7261F58DEDB007D7184 /* CgRPC.framework */,
 				D36AB7281F58DEDB007D7184 /* BoringSSL.framework */,
 				D36AB72A1F58DEDB007D7184 /* gRPC.framework */,
@@ -342,10 +339,6 @@
 			name = SwiftProtobuf_macOS;
 			targetProxy = D315DEF71EE8B2C1007670CE /* PBXContainerItemProxy */;
 		};
-		D315DEFA1EE8B2C7007670CE /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = Czlib;
-		};
 		D315DEFC1EE8B2C7007670CE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = CgRPC;
@@ -358,11 +351,6 @@
 			isa = PBXTargetDependency;
 			name = gRPC;
 		};
-		D36AB7361F58DF02007D7184 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = Czlib;
-			targetProxy = D36AB7351F58DF02007D7184 /* PBXContainerItemProxy */;
-		};
 		D36AB7381F58DF02007D7184 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = CgRPC;
@@ -492,6 +480,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = EQHXZ8M8AV;
+				HEADER_SEARCH_PATHS = ../../Sources/CgRPC/include;
 				INFOPLIST_FILE = Echo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.Echo;
@@ -506,6 +495,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = EQHXZ8M8AV;
+				HEADER_SEARCH_PATHS = ../../Sources/CgRPC/include;
 				INFOPLIST_FILE = Echo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.Echo;

Examples/EchoXcode/Echo/AppDelegate.swift

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import Cocoa
+import SwiftGRPC
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {

Examples/EchoXcode/Echo/EchoViewController.swift

@@ -112,11 +112,12 @@ class EchoViewController: NSViewController, NSTextFieldDelegate {
       let certificateURL = Bundle.main.url(forResource: "ssl",
                                            withExtension: "crt")!
       let certificates = try! String(contentsOf: certificateURL)
-      service = Echo_EchoServiceClient(address: address, certificates: certificates, host: host)
+      let arguments: [Channel.Argument] = [.sslTargetNameOverride(host)]
+      service =  Echo_EchoServiceClient(address: address, certificates: certificates, arguments: arguments)
     }
     if let service = service {
       service.host = "example.com" // sample override
-      service.metadata = Metadata([
+      service.metadata = try! Metadata([
         "x-goog-api-key": "YOUR_API_KEY",
         "x-ios-bundle-identifier": Bundle.main.bundleIdentifier!
       ])
@@ -197,17 +198,13 @@ class EchoViewController: NSViewController, NSTextFieldDelegate {
     guard let expandCall = expandCall else {
       return
     }
-    try expandCall.receive { response, error in
-      if let responseMessage = response {
-        self.displayMessageReceived(responseMessage.text)
+    
+    try expandCall.receive { (response) in
+      if case let result?? = response.result  {
+        self.displayMessageReceived(result.text)
         try! self.receiveExpandMessages()
-      } else if let error = error {
-        switch error {
-        case .endOfStream:
-          self.displayMessageReceived("Done.")
-        default:
-          self.displayMessageReceived("No message received. \(error)")
-        }
+      } else if let error = response.error {
+        self.displayMessageReceived("No message received. \(error)")
       }
     }
   }
@@ -217,7 +214,11 @@ class EchoViewController: NSViewController, NSTextFieldDelegate {
       var requestMessage = Echo_EchoRequest()
       requestMessage.text = messageField.stringValue
       displayMessageSent(requestMessage.text)
-      try collectCall.send(requestMessage) { error in print(error) }
+      try collectCall.send(requestMessage) { (error) in
+        if let error = error {
+          print(error)
+        }
+      }
     }
   }
 
@@ -226,7 +227,11 @@ class EchoViewController: NSViewController, NSTextFieldDelegate {
       var requestMessage = Echo_EchoRequest()
       requestMessage.text = messageField.stringValue
       displayMessageSent(requestMessage.text)
-      try updateCall.send(requestMessage) { error in print(error) }
+      try updateCall.send(requestMessage) { (error) in
+        if let error = error {
+          print(error)
+        }
+      }
     }
   }
 
@@ -234,17 +239,13 @@ class EchoViewController: NSViewController, NSTextFieldDelegate {
     guard let updateCall = updateCall else {
       return
     }
-    try updateCall.receive { response, error in
-      if let responseMessage = response {
-        self.displayMessageReceived(responseMessage.text)
+    
+    try updateCall.receive { (response) in
+      if case let result?? = response.result {
+        self.displayMessageReceived(result.text)
         try! self.receiveUpdateMessages()
-      } else if let error = error {
-        switch error {
-        case .endOfStream:
-          self.displayMessageReceived("Done.")
-        default:
-          self.displayMessageReceived("No message received. \(error)")
-        }
+      } else if let error = response.error {
+        self.displayMessageReceived("No message received. \(error)")
       }
     }
   }
@@ -261,10 +262,10 @@ class EchoViewController: NSViewController, NSTextFieldDelegate {
     }
     if let collectCall = collectCall {
       do {
-        try collectCall.closeAndReceive { response, error in
-          if let response = response {
-            self.displayMessageReceived(response.text)
-          } else if let error = error {
+        try collectCall.closeAndReceive { (response) in
+          if let result = response.result {
+            self.displayMessageReceived(result.text)
+          } else if let error = response.error {
             self.displayMessageReceived("No message received. \(error)")
           }
           self.collectCall = nil

Examples/EchoXcode/README.md

@@ -6,5 +6,5 @@ on the gRPC Xcode project, which requires a local build of the
 gRPC Core C library. To build that, please run "make" in the
 root of your gRPC distribution. Next use Xcode's "Add Files..."
 command to add the SwiftGRPC.xcodeproj to your project and
-then add the CzLib, gRPC, CgRPC, and BoringSSL libraries
+then add the gRPC, CgRPC, and BoringSSL libraries
 to the target dependencies of "Echo".

Examples/SimpleXcode/Simple.xcodeproj/project.pbxproj

@@ -267,10 +267,6 @@
 			isa = PBXTargetDependency;
 			name = gRPC;
 		};
-		D394EF201F58DB9800E99633 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = Czlib;
-		};
 		D394EF221F58DB9800E99633 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = CgRPC;
@@ -291,10 +287,6 @@
 			isa = PBXTargetDependency;
 			name = CgRPC;
 		};
-		D3E1EA811EE8B0120024A93A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = Czlib;
-		};
 		D3E1EA831EE8B0120024A93A /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = BoringSSL;