Просмотр исходного кода

Migrate Package.swift to the Swift 4.0 manifest format.

Daniel Alm 7 лет назад
Родитель
Сommit
2cab5d2936

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

@@ -27,7 +27,7 @@ let package = Package(
   targets: [
     .target(name: "Echo",
             dependencies: [
-              "SwiftGRPC",
+              "gRPC",
               "SwiftProtobuf",
               "Commander"
             ],

+ 2 - 2
Examples/Google/Datastore/Package.swift

@@ -28,10 +28,10 @@ let package = Package(
   targets: [
     .target(name: "Datastore",
             dependencies: [
-              "SwiftGRPC",
+              "gRPC",
               "SwiftProtobuf",
               "Commander",
-	      "OAuth2"
+	            "OAuth2"
             ],
 	    path: "Sources")
   ])

+ 2 - 2
Examples/Google/NaturalLanguage/Package.swift

@@ -28,10 +28,10 @@ let package = Package(
   targets: [
     .target(name: "NaturalLanguage",
             dependencies: [
-              "SwiftGRPC",
+              "gRPC",
               "SwiftProtobuf",
               "Commander",
-	      "OAuth2"
+	            "OAuth2"
             ],
 	    path: "Sources")
   ])

+ 2 - 2
Examples/Google/Spanner/Package.swift

@@ -28,10 +28,10 @@ let package = Package(
   targets: [
     .target(name: "Spanner",
             dependencies: [
-              "SwiftGRPC",
+              "gRPC",
               "SwiftProtobuf",
               "Commander",
-	      "OAuth2"
+	            "OAuth2"
             ],
 	    path: "Sources")
   ])

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

@@ -26,7 +26,7 @@ let package = Package(
   targets: [
     .target(name: "Simple",
             dependencies: [
-              "SwiftGRPC",
+              "gRPC",
               "Commander"
             ],
 	    path: ".")

+ 20 - 9
Package.swift

@@ -1,3 +1,5 @@
+// swift-tools-version:4.0
+
 /*
  * Copyright 2017, gRPC Authors All rights reserved.
  *
@@ -17,15 +19,24 @@ import PackageDescription
 
 let package = Package(
   name: "SwiftGRPC",
-  targets: [
-    Target(name: "gRPC",
-           dependencies: ["CgRPC"]),
-    Target(name: "CgRPC",
-           dependencies: ["BoringSSL"]),
-    Target(name: "RootsEncoder"),
-    Target(name: "protoc-gen-swiftgrpc")
+  products: [
+    .library(name: "gRPC", targets: ["gRPC"]),
   ],
   dependencies: [
-    .Package(url: "https://github.com/Zewo/zlib.git", majorVersion: 0, minor: 4),
-    .Package(url: "https://github.com/apple/swift-protobuf.git", majorVersion: 1, minor: 0)
+    .package(url: "https://github.com/Zewo/zlib.git", from: "0.4.0"),
+    .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.0.2")
+  ],
+  targets: [
+    .target(name: "gRPC",
+            dependencies: ["CgRPC", "SwiftProtobuf"]),
+    .target(name: "CgRPC",
+            dependencies: ["BoringSSL", "zlib"]),
+    .target(name: "RootsEncoder"),
+    .target(name: "protoc-gen-swiftgrpc",
+            dependencies: [
+              "SwiftProtobuf",
+              "SwiftProtobufPluginLibrary",
+              "protoc-gen-swift"]),
+    .target(name: "BoringSSL"),
+    .testTarget(name: "gRPCTests", dependencies: ["gRPC"])
   ])