Browse Source

Update PackageManager-based examples to use the latest versions of grpc-swift, swift-protobuf, and auth-library-swift.

Tim Burks 8 years ago
parent
commit
148ac95c30

+ 3 - 3
Examples/Datastore/PackageManager/Package.swift

@@ -17,8 +17,8 @@ import PackageDescription
 let package = Package (
     name: "Datastore",
     dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,3)),
-        .Package(url: "https://github.com/apple/swift-protobuf.git", Version(0,9,904)),
-        .Package(url: "https://github.com/google/auth-library-swift.git", Version(0,2,2)),
+        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,4)),
+        .Package(url: "https://github.com/apple/swift-protobuf.git", Version(1,0,2)),
+        .Package(url: "https://github.com/google/auth-library-swift.git", Version(0,3,2)),
     ]
 )

+ 8 - 4
Examples/Datastore/PackageManager/Sources/main.swift

@@ -17,12 +17,16 @@ import Foundation
 import gRPC
 import OAuth2
 
-let CREDENTIALS = "google.yaml" // in $HOME/.credentials
+let CREDENTIALS = "google.json" // in $HOME/.credentials
 let TOKEN = "google.json" // local auth token storage
 
 #if os(OSX)
 // On OS X, we use the local browser to help the user get a token.
 let tokenProvider = try BrowserTokenProvider(credentials:CREDENTIALS, token:TOKEN)
+guard let tokenProvider = tokenProvider else {
+  print("ERROR: Unable to create BrowserTokenProvider.")
+  exit(-1)
+}
 if tokenProvider.token == nil {
   try tokenProvider.signIn(scopes:["profile",
                                    "https://www.googleapis.com/auth/contacts.readonly",
@@ -37,12 +41,12 @@ let tokenProvider = try GoogleTokenProvider()
 
 gRPC.initialize()
 
-guard let authToken = tokenProvider.token?.accessToken else {
-  print("ERROR: No OAuth token is avaiable.")
+guard let authToken = tokenProvider.token?.AccessToken else {
+  print("ERROR: No OAuth token is available.")
   exit(-1)
 }
 
-let projectID = "YOUR PROJECT ID"
+let projectID = "your-project-identifier"
 
 let certificateURL = URL(fileURLWithPath:"roots.pem")
 let certificates = try! String(contentsOf: certificateURL, encoding: .utf8)

+ 2 - 2
Examples/Echo/PackageManager/Package.swift

@@ -17,7 +17,7 @@ import PackageDescription
 let package = Package (
     name: "Echo",
     dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,3)),
-        .Package(url: "https://github.com/apple/swift-protobuf.git", Version(0,9,904)),
+        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,4)),
+        .Package(url: "https://github.com/apple/swift-protobuf.git", Version(1,0,2)),
     ]
 )

+ 2 - 2
Examples/Echo/PackageManager/Sources/main.swift

@@ -123,8 +123,8 @@ if client != "" {
       service = Echo_EchoService(address:address + ":" + port)
     }
 
-    let requestMetadata = Metadata(["x-goog-api-key":"YOUR_API_KEY",
-                                    "x-ios-bundle-identifier":"com.google.echo"])
+    service.metadata = Metadata(["x-goog-api-key":"YOUR_API_KEY",
+                                 "x-ios-bundle-identifier":"com.google.echo"])
 
     // Unary
     if client == "get" {

+ 1 - 1
Examples/Simple/PackageManager/Package.swift

@@ -17,6 +17,6 @@ import PackageDescription
 let package = Package (
     name: "Simple",
     dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,3)),
+        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,4)),
     ]
 )