Skip to content

Commit a1a9b71

Browse files
committed
Remove roots.pem from Examples; use compiled-in version instead.
1 parent 56eaff7 commit a1a9b71

File tree

8 files changed

+6
-10586
lines changed

8 files changed

+6
-10586
lines changed

Examples/Datastore/PackageManager/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import PackageDescription
1717
let package = Package (
1818
name: "Datastore",
1919
dependencies: [
20-
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,4)),
20+
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,5)),
2121
.Package(url: "https://github.com/apple/swift-protobuf.git", Version(1,0,2)),
2222
.Package(url: "https://github.com/google/auth-library-swift.git", Version(0,3,4)),
2323
.Package(url: "https://github.com/kylef/Commander.git", Version(0,8,0)),

Examples/Datastore/PackageManager/Sources/main.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,8 @@ func prepareService() throws -> Google_Datastore_V1_DatastoreService? {
6363
}
6464
// Initialize gRPC service
6565
gRPC.initialize()
66-
let certificateURL = URL(fileURLWithPath:"/roots.pem")
67-
let certificates = try! String(contentsOf: certificateURL, encoding: .utf8)
6866
let service = Google_Datastore_V1_DatastoreService(address:"datastore.googleapis.com",
69-
certificates:certificates,
67+
certificates:nil,
7068
host:nil)
7169
service.metadata = Metadata(["authorization":"Bearer " + authToken])
7270
return service

Examples/Datastore/PackageManager/roots.pem

Lines changed: 0 additions & 5288 deletions
This file was deleted.

Examples/Echo/PackageManager/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import PackageDescription
1717
let package = Package (
1818
name: "Echo",
1919
dependencies: [
20-
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,4)),
20+
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,5)),
2121
.Package(url: "https://github.com/apple/swift-protobuf.git", Version(1,0,2)),
2222
]
2323
)

Examples/NaturalLanguage/PackageManager/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import PackageDescription
1717
let package = Package (
1818
name: "NaturalLanguage",
1919
dependencies: [
20-
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,4)),
20+
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,5)),
2121
.Package(url: "https://github.com/apple/swift-protobuf.git", Version(1,0,2)),
2222
.Package(url: "https://github.com/google/auth-library-swift.git", Version(0,3,4)),
2323
]

Examples/NaturalLanguage/PackageManager/Sources/main.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ if let provider = DefaultTokenProvider(scopes: scopes) {
3131
exit(-1)
3232
}
3333

34-
let certificateURL = URL(fileURLWithPath:"roots.pem")
35-
let certificates = try! String(contentsOf: certificateURL, encoding: .utf8)
3634
let service = Google_Cloud_Language_V1_LanguageServiceService(address:"language.googleapis.com",
37-
certificates:certificates,
35+
certificates:nil,
3836
host:nil)
3937

4038
service.metadata = Metadata(["authorization":"Bearer " + authToken])

Examples/NaturalLanguage/PackageManager/roots.pem

Lines changed: 0 additions & 5288 deletions
This file was deleted.

Examples/Simple/PackageManager/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ import PackageDescription
1717
let package = Package (
1818
name: "Simple",
1919
dependencies: [
20-
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,4)),
20+
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,5)),
2121
]
2222
)

0 commit comments

Comments
 (0)