From e6767b6050f65a3ca649902fb523c5b092f3c63b Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Mon, 13 Mar 2017 15:01:43 -0700 Subject: [PATCH] Changed String init to use Linux friendly implementation * Couldn't start Echo server with ssl on linux due to String init method not being implemented yet --- Examples/Echo/Generated/echo.server.pb.swift | 4 ++-- Plugin/Templates/server.pb.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Examples/Echo/Generated/echo.server.pb.swift b/Examples/Echo/Generated/echo.server.pb.swift index 1d943de13..9af81ac1d 100644 --- a/Examples/Echo/Generated/echo.server.pb.swift +++ b/Examples/Echo/Generated/echo.server.pb.swift @@ -274,8 +274,8 @@ public class Echo_EchoServer { self.address = address self.provider = provider guard - let certificate = try? String(contentsOf: certificateURL), - let key = try? String(contentsOf: keyURL) + let certificate = try? String(contentsOf: certificateURL, encoding: .utf8), + let key = try? String(contentsOf: keyURL, encoding: .utf8) else { return nil } diff --git a/Plugin/Templates/server.pb.swift b/Plugin/Templates/server.pb.swift index 1bc906c49..254727f79 100644 --- a/Plugin/Templates/server.pb.swift +++ b/Plugin/Templates/server.pb.swift @@ -121,8 +121,8 @@ public class {{ .|server:protoFile,service }} { self.address = address self.provider = provider guard - let certificate = try? String(contentsOf: certificateURL), - let key = try? String(contentsOf: keyURL) + let certificate = try? String(contentsOf: certificateURL, encoding: .utf8), + let key = try? String(contentsOf: keyURL, encoding: .utf8) else { return nil }