KituraNIO: Pin to Kitura 2.6 on Swift 4 (#217)

RuntimeTools · Apr 17, 2019 · a939a8d · a939a8d
1 parent a96abb2
commit a939a8d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/[email protected] b/[email protected]
@@ -18,11 +18,14 @@
 import PackageDescription
 import Foundation
 
+var kituraPackage: Package.Dependency
 var webSocketPackage: Package.Dependency
 
 if ProcessInfo.processInfo.environment["KITURA_NIO"] != nil {
+    kituraPackage = .package(url: "https://github.com/IBM-Swift/Kitura.git", .upToNextMinor(from: "2.6.0"))
     webSocketPackage = .package(url: "https://github.com/IBM-Swift/Kitura-WebSocket-NIO.git", from: "1.0.0")
 } else {
+    kituraPackage = .package(url: "https://github.com/IBM-Swift/Kitura.git", from: "2.3.0")
     webSocketPackage = .package(url: "https://github.com/IBM-Swift/Kitura-WebSocket.git", from: "2.0.0")
 }
 
@@ -43,7 +46,7 @@ let package = Package(
         .executable(name: "SwiftMetricsCommonSample", targets: ["SwiftMetricsCommonSample"]),
     ],
   dependencies: [
-    .package(url: "https://github.com/IBM-Swift/Kitura.git", from: "2.3.0"),
+    kituraPackage,
     webSocketPackage,
     .package(url: "https://github.com/IBM-Swift/SwiftyRequest.git", from: "1.0.0"),
     .package(url: "https://github.com/IBM-Swift/Swift-cfenv.git", from: "6.0.0"),

diff --git a/[email protected] b/[email protected]
@@ -18,11 +18,14 @@
 import PackageDescription
 import Foundation
 
+var kituraPackage: Package.Dependency
 var webSocketPackage: Package.Dependency
 
 if ProcessInfo.processInfo.environment["KITURA_NIO"] != nil {
+    kituraPackage = .package(url: "https://github.com/IBM-Swift/Kitura.git", .upToNextMinor(from: "2.6.0"))
     webSocketPackage = .package(url: "https://github.com/IBM-Swift/Kitura-WebSocket-NIO.git", from: "1.0.0")
 } else {
+    kituraPackage = .package(url: "https://github.com/IBM-Swift/Kitura.git", from: "2.3.0")
     webSocketPackage = .package(url: "https://github.com/IBM-Swift/Kitura-WebSocket.git", from: "2.0.0")
 }
 
@@ -43,7 +46,7 @@ let package = Package(
         .executable(name: "SwiftMetricsCommonSample", targets: ["SwiftMetricsCommonSample"]),
     ],
   dependencies: [
-    .package(url: "https://github.com/IBM-Swift/Kitura.git", from: "2.3.0"),
+    kituraPackage,
     webSocketPackage,
     .package(url: "https://github.com/IBM-Swift/SwiftyRequest.git", from: "1.0.0"),
     .package(url: "https://github.com/IBM-Swift/Swift-cfenv.git", from: "6.0.0"),

diff --git a/[email protected] b/[email protected]
@@ -18,11 +18,14 @@
 import PackageDescription
 import Foundation
 
+var kituraPackage: Package.Dependency
 var webSocketPackage: Package.Dependency
 
 if ProcessInfo.processInfo.environment["KITURA_NIO"] != nil {
+    kituraPackage = .package(url: "https://github.com/IBM-Swift/Kitura.git", .upToNextMinor(from: "2.6.0"))
     webSocketPackage = .package(url: "https://github.com/IBM-Swift/Kitura-WebSocket-NIO.git", from: "1.0.0")
 } else {
+    kituraPackage = .package(url: "https://github.com/IBM-Swift/Kitura.git", from: "2.3.0")
     webSocketPackage = .package(url: "https://github.com/IBM-Swift/Kitura-WebSocket.git", from: "2.0.0")
 }
 
@@ -43,7 +46,7 @@ let package = Package(
         .executable(name: "SwiftMetricsCommonSample", targets: ["SwiftMetricsCommonSample"]),
     ],
   dependencies: [
-    .package(url: "https://github.com/IBM-Swift/Kitura.git", from: "2.3.0"),
+    kituraPackage,
     webSocketPackage,
     .package(url: "https://github.com/IBM-Swift/Swift-cfenv.git", from: "6.0.0"),
     .package(url: "https://github.com/RuntimeTools/omr-agentcore", .exact("3.2.4-swift4")),