Skip to content

Commit

Permalink
Comments/cleanup to Package.swift. (#371)
Browse files Browse the repository at this point in the history
* Comments/cleanup to Package.swift.

Added some comments and deleted two implicit dependencies; let's see if it still compiles without these. Otherwise, I'll add them back.

* Update Package.swift

* Update Package.swift

* Add `Package.resolved` and switch our dependencies to use `.upToNextMajor`.

* Update Package.resolved.

* Use upToNextMinor for Commander.
  • Loading branch information
MrMage authored Feb 28, 2019
1 parent 10aff09 commit ba335b2
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 5 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ third_party/**
/test.out
/echo.pid
/SwiftGRPC.xcodeproj
Package.resolved
Examples/EchoWeb/dist
Examples/EchoWeb/node_modules
Examples/EchoWeb/package-lock.json
70 changes: 70 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"object": {
"pins": [
{
"package": "Commander",
"repositoryURL": "https://github.com/kylef/Commander.git",
"state": {
"branch": null,
"revision": "e5b50ad7b2e91eeb828393e89b03577b16be7db9",
"version": "0.8.0"
}
},
{
"package": "Spectre",
"repositoryURL": "https://github.com/kylef/Spectre.git",
"state": {
"branch": null,
"revision": "f14ff47f45642aa5703900980b014c2e9394b6e5",
"version": "0.9.0"
}
},
{
"package": "swift-nio",
"repositoryURL": "https://github.com/apple/swift-nio.git",
"state": {
"branch": null,
"revision": "98434c1f1d687ff5a24d2cabfbd19b5c7d2d7a2f",
"version": "1.13.0"
}
},
{
"package": "swift-nio-http2",
"repositoryURL": "https://github.com/apple/swift-nio-http2.git",
"state": {
"branch": null,
"revision": "88bd6d369a729f88e63f53ae5265840de4bb1384",
"version": "0.2.1"
}
},
{
"package": "swift-nio-nghttp2-support",
"repositoryURL": "https://github.com/apple/swift-nio-nghttp2-support.git",
"state": {
"branch": null,
"revision": "324e323e92ab12e565d63bffb07b5833a63a425f",
"version": "1.0.0"
}
},
{
"package": "swift-nio-zlib-support",
"repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
"state": {
"branch": null,
"revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
"version": "1.0.0"
}
},
{
"package": "SwiftProtobuf",
"repositoryURL": "https://github.com/apple/swift-protobuf.git",
"state": {
"branch": null,
"revision": "ab98c52b5166593ad1ae0df246463266df151cfa",
"version": "1.3.1"
}
}
]
},
"version": 1
}
16 changes: 12 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,19 @@ import PackageDescription
import Foundation

var packageDependencies: [Package.Dependency] = [
.package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMinor(from: "1.3.1")),
// Official SwiftProtobuf library, for [de]serializing data to send on the wire.
.package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMajor(from: "1.3.1")),

// Command line argument parser for our auxiliary command line tools.
.package(url: "https://github.com/kylef/Commander.git", .upToNextMinor(from: "0.8.0")),
.package(url: "https://github.com/apple/swift-nio-zlib-support.git", .upToNextMinor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-nio.git", .upToNextMinor(from: "1.12.0")),
.package(url: "https://github.com/apple/swift-nio-nghttp2-support.git", .upToNextMinor(from: "1.0.0")),

// SwiftGRPCNIO dependencies:
// Transitive dependencies
.package(url: "https://github.com/apple/swift-nio-zlib-support.git", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-nio-nghttp2-support.git", .upToNextMajor(from: "1.0.0")),
// Main SwiftNIO package
.package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "1.12.0")),
// HTTP2 via SwiftNIO
.package(url: "https://github.com/apple/swift-nio-http2.git", .upToNextMinor(from: "0.2.1"))
]

Expand Down

0 comments on commit ba335b2

Please sign in to comment.