From 008c5c24236f26a6005872fd375ae9ed84188a45 Mon Sep 17 00:00:00 2001 From: Andzej Maciusovic Date: Wed, 15 Aug 2018 16:39:04 +0300 Subject: [PATCH 1/9] lock dep versions --- Package.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index d343b84cd..689c2c16a 100644 --- a/Package.swift +++ b/Package.swift @@ -18,16 +18,16 @@ import PackageDescription var packageDependencies: [Package.Dependency] = [ - .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.0.2"), - .package(url: "https://github.com/kylef/Commander.git", from: "0.8.0"), - .package(url: "https://github.com/apple/swift-nio-zlib-support.git", from: "1.0.0") + .package(url: "https://github.com/apple/swift-protobuf.git", version: Version(1,0,2)), + .package(url: "https://github.com/kylef/Commander.git", version: Version(0,8,0)), + .package(url: "https://github.com/apple/swift-nio-zlib-support.git", version: Version(1,0,0)) ] var cGRPCDependencies: [Target.Dependency] = [] #if os(Linux) // On Linux, Foundation links with openssl, so we'll need to use that instead of BoringSSL. // See https://github.com/apple/swift-nio-ssl/issues/16#issuecomment-392705505 for details. -packageDependencies.append(.package(url: "https://github.com/apple/swift-nio-ssl-support.git", from: "1.0.0")) +packageDependencies.append(.package(url: "https://github.com/apple/swift-nio-ssl-support.git", version: Version(1,0,0)) #else cGRPCDependencies.append("BoringSSL") #endif From 06c5869fd43187ba8e02e5df2de67a15035803d8 Mon Sep 17 00:00:00 2001 From: Andzej Maciusovic Date: Wed, 15 Aug 2018 16:43:07 +0300 Subject: [PATCH 2/9] fix version declaration --- Package.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 689c2c16a..9e1ad280f 100644 --- a/Package.swift +++ b/Package.swift @@ -18,16 +18,16 @@ import PackageDescription var packageDependencies: [Package.Dependency] = [ - .package(url: "https://github.com/apple/swift-protobuf.git", version: Version(1,0,2)), - .package(url: "https://github.com/kylef/Commander.git", version: Version(0,8,0)), - .package(url: "https://github.com/apple/swift-nio-zlib-support.git", version: Version(1,0,0)) + .package(url: "https://github.com/apple/swift-protobuf.git", "1.0.2"), + .package(url: "https://github.com/kylef/Commander.git", "0.8.0"), + .package(url: "https://github.com/apple/swift-nio-zlib-support.git", "1.0.0") ] var cGRPCDependencies: [Target.Dependency] = [] #if os(Linux) // On Linux, Foundation links with openssl, so we'll need to use that instead of BoringSSL. // See https://github.com/apple/swift-nio-ssl/issues/16#issuecomment-392705505 for details. -packageDependencies.append(.package(url: "https://github.com/apple/swift-nio-ssl-support.git", version: Version(1,0,0)) +packageDependencies.append(.package(url: "https://github.com/apple/swift-nio-ssl-support.git", "1.0.0")) #else cGRPCDependencies.append("BoringSSL") #endif From 34b4585285eb0ee255a5bfa9900386dd78be777d Mon Sep 17 00:00:00 2001 From: Andzej Maciusovic Date: Wed, 15 Aug 2018 16:47:39 +0300 Subject: [PATCH 3/9] fix package version --- Package.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 9e1ad280f..3bc68acb6 100644 --- a/Package.swift +++ b/Package.swift @@ -18,16 +18,16 @@ import PackageDescription var packageDependencies: [Package.Dependency] = [ - .package(url: "https://github.com/apple/swift-protobuf.git", "1.0.2"), - .package(url: "https://github.com/kylef/Commander.git", "0.8.0"), - .package(url: "https://github.com/apple/swift-nio-zlib-support.git", "1.0.0") + .package(url: "https://github.com/apple/swift-protobuf.git", Version(1, 0, 2)), + .package(url: "https://github.com/kylef/Commander.git", Version(0, 8, 0)), + .package(url: "https://github.com/apple/swift-nio-zlib-support.git", Version(1, 0, 0)) ] var cGRPCDependencies: [Target.Dependency] = [] #if os(Linux) // On Linux, Foundation links with openssl, so we'll need to use that instead of BoringSSL. // See https://github.com/apple/swift-nio-ssl/issues/16#issuecomment-392705505 for details. -packageDependencies.append(.package(url: "https://github.com/apple/swift-nio-ssl-support.git", "1.0.0")) +packageDependencies.append(.package(url: "https://github.com/apple/swift-nio-ssl-support.git", Version(1, 0, 0))) #else cGRPCDependencies.append("BoringSSL") #endif From dc9b93b8fad11e565299e1c74b7162c7f4ba9af2 Mon Sep 17 00:00:00 2001 From: Andzej Maciusovic Date: Wed, 15 Aug 2018 16:49:49 +0300 Subject: [PATCH 4/9] fix versions --- Package.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 3bc68acb6..1adbd4f80 100644 --- a/Package.swift +++ b/Package.swift @@ -18,16 +18,16 @@ import PackageDescription var packageDependencies: [Package.Dependency] = [ - .package(url: "https://github.com/apple/swift-protobuf.git", Version(1, 0, 2)), - .package(url: "https://github.com/kylef/Commander.git", Version(0, 8, 0)), - .package(url: "https://github.com/apple/swift-nio-zlib-support.git", Version(1, 0, 0)) + .package(url: "https://github.com/apple/swift-protobuf.git", versions: Version(1,0,2) .. Date: Wed, 15 Aug 2018 16:54:30 +0300 Subject: [PATCH 5/9] fix version --- Package.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 1adbd4f80..f9800ca5c 100644 --- a/Package.swift +++ b/Package.swift @@ -18,16 +18,16 @@ import PackageDescription var packageDependencies: [Package.Dependency] = [ - .package(url: "https://github.com/apple/swift-protobuf.git", versions: Version(1,0,2) .. Date: Thu, 16 Aug 2018 09:53:23 +0300 Subject: [PATCH 6/9] lock swift protobuf to 1.0.3 --- Package.swift | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index f9800ca5c..94091cd79 100644 --- a/Package.swift +++ b/Package.swift @@ -1,5 +1,4 @@ // swift-tools-version:4.0 - /* * Copyright 2017, gRPC Authors All rights reserved. * @@ -18,16 +17,16 @@ import PackageDescription var packageDependencies: [Package.Dependency] = [ - .package(url: "https://github.com/apple/swift-protobuf.git", .exact("1.0.2")), - .package(url: "https://github.com/kylef/Commander.git", .exact("0.8.0")), - .package(url: "https://github.com/apple/swift-nio-zlib-support.git", .exact("1.0.0")) + .package(url: "https://github.com/apple/swift-protobuf.git", upToNextMinor(from: "1.0.3")), + .package(url: "https://github.com/kylef/Commander.git", from: "0.8.0"), + .package(url: "https://github.com/apple/swift-nio-zlib-support.git", from: "1.0.0") ] var cGRPCDependencies: [Target.Dependency] = [] #if os(Linux) // On Linux, Foundation links with openssl, so we'll need to use that instead of BoringSSL. // See https://github.com/apple/swift-nio-ssl/issues/16#issuecomment-392705505 for details. -packageDependencies.append(.package(url: "https://github.com/apple/swift-nio-ssl-support.git", .exact("1.0.0"))) +packageDependencies.append(.package(url: "https://github.com/apple/swift-nio-ssl-support.git", from: "1.0.0")) #else cGRPCDependencies.append("BoringSSL") #endif @@ -62,4 +61,4 @@ let package = Package( .testTarget(name: "SwiftGRPCTests", dependencies: ["SwiftGRPC"]) ], cLanguageStandard: .gnu11, - cxxLanguageStandard: .cxx11) + cxxLanguageStandard: .cxx11) \ No newline at end of file From 3ffe8c35aab888543d1852c5c31005036e8a8856 Mon Sep 17 00:00:00 2001 From: Andzej Maciusovic Date: Thu, 16 Aug 2018 09:55:22 +0300 Subject: [PATCH 7/9] fix package dep declaration --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 94091cd79..47ad9e978 100644 --- a/Package.swift +++ b/Package.swift @@ -17,7 +17,7 @@ import PackageDescription var packageDependencies: [Package.Dependency] = [ - .package(url: "https://github.com/apple/swift-protobuf.git", upToNextMinor(from: "1.0.3")), + .package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMinor(from: "1.0.3")), .package(url: "https://github.com/kylef/Commander.git", from: "0.8.0"), .package(url: "https://github.com/apple/swift-nio-zlib-support.git", from: "1.0.0") ] From 62a8f010632046c33104744928f69ebae8217045 Mon Sep 17 00:00:00 2001 From: Andzej Maciusovic Date: Thu, 16 Aug 2018 09:57:52 +0300 Subject: [PATCH 8/9] add missing new line --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 47ad9e978..a6cf27eea 100644 --- a/Package.swift +++ b/Package.swift @@ -61,4 +61,5 @@ let package = Package( .testTarget(name: "SwiftGRPCTests", dependencies: ["SwiftGRPC"]) ], cLanguageStandard: .gnu11, - cxxLanguageStandard: .cxx11) \ No newline at end of file + cxxLanguageStandard: .cxx11) + \ No newline at end of file From 9e938974d2519e8312a77fa2ad0665188d2ebc90 Mon Sep 17 00:00:00 2001 From: Andzej Maciusovic Date: Thu, 16 Aug 2018 09:59:12 +0300 Subject: [PATCH 9/9] remove uneeded space --- Package.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Package.swift b/Package.swift index a6cf27eea..bc34c81ce 100644 --- a/Package.swift +++ b/Package.swift @@ -62,4 +62,3 @@ let package = Package( ], cLanguageStandard: .gnu11, cxxLanguageStandard: .cxx11) - \ No newline at end of file