From 26e98f2dbb828598ec3d46d9f3df4876be3fdbcc Mon Sep 17 00:00:00 2001 From: Unihilator Date: Sun, 12 May 2019 16:57:22 +0300 Subject: [PATCH 1/2] updated packages versions to latests --- Package.resolved | 31 ++++++++----- Package.swift | 111 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 126 insertions(+), 16 deletions(-) diff --git a/Package.resolved b/Package.resolved index 74147e136..b2d478a4f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/yonaskolb/JSONUtilities.git", "state": { "branch": null, - "revision": "6403a5455f30add5413095d1b5a70e8a5eb83ba0", - "version": "3.3.8" + "revision": "db238f4858ac2ac3fff228b5b71ce90488a6a9b3", + "version": "4.1.0" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/kylef/PathKit.git", "state": { "branch": null, - "revision": "891a3fec2699fc43aed18b7649950677c0152a22", - "version": "0.8.0" + "revision": "e2f5be30e4c8f531c9c1e8765aa7b71c0a45d7a0", + "version": "0.9.2" } }, { @@ -33,17 +33,26 @@ "repositoryURL": "https://github.com/kylef/Spectre.git", "state": { "branch": null, - "revision": "e46b75cf03ad5e563b4b0a5068d3d6f04d77d80b", - "version": "0.7.2" + "revision": "f14ff47f45642aa5703900980b014c2e9394b6e5", + "version": "0.9.0" } }, { "package": "Stencil", - "repositoryURL": "https://github.com/yonaskolb/Stencil.git", + "repositoryURL": "https://github.com/stencilproject/Stencil.git", "state": { "branch": null, - "revision": "daf4e41549a534904376794e899ca6aecaf4ff83", - "version": "0.9.3" + "revision": "0e9a78d6584e3812cd9c09494d5c7b483e8f533c", + "version": "0.13.1" + } + }, + { + "package": "StencilSwiftKit", + "repositoryURL": "https://github.com/SwiftGen/StencilSwiftKit.git", + "state": { + "branch": null, + "revision": "dbf02bd6afe71b65ead2bd250aaf974abc688094", + "version": "2.7.2" } }, { @@ -51,8 +60,8 @@ "repositoryURL": "https://github.com/jakeheis/SwiftCLI", "state": { "branch": null, - "revision": "37f4a7f863f6fe76ce44fc0023f331eea0089beb", - "version": "5.2.0" + "revision": "5318c37d3cacc8780f50b87a8840a6774320ebdf", + "version": "5.2.2" } }, { diff --git a/Package.swift b/Package.swift index 6debe78f1..fe4f3e1ef 100644 --- a/Package.swift +++ b/Package.swift @@ -9,12 +9,13 @@ let package = Package( .library(name: "Swagger", targets: ["Swagger"]), ], dependencies: [ - .package(url: "https://github.com/kylef/PathKit.git", from: "0.8.0"), + .package(url: "https://github.com/kylef/PathKit.git", from: "0.9.0"), .package(url: "https://github.com/jakeheis/SwiftCLI", from: "5.0.0"), - .package(url: "https://github.com/yonaskolb/Stencil.git", from: "0.9.0"), +// .package(url: "https://github.com/yonaskolb/Stencil.git", from: "0.9.3"), + .package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", from: "2.7.2"), .package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"), - .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "3.3.0"), - .package(url: "https://github.com/kylef/Spectre.git", from: "0.7.0"), + .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.1.0"), + .package(url: "https://github.com/kylef/Spectre.git", from: "0.9.0"), .package(url: "https://github.com/onevcat/Rainbow.git", from: "3.1.0"), ], targets: [ @@ -28,7 +29,7 @@ let package = Package( "Swagger", "JSONUtilities", "PathKit", - "Stencil", + "StencilSwiftKit", ]), .target(name: "Swagger", dependencies: [ "JSONUtilities", @@ -44,3 +45,103 @@ let package = Package( ]), ] ) + +// swift-tools-version:4.0 +import PackageDescription + +//let package = Package( +// name: "SwagGen", +// products: [ +// .executable(name: "swaggen", targets: ["SwagGen"]), +// .library(name: "SwagGenKit", targets: ["SwagGenKit"]), +// .library(name: "Swagger", targets: ["Swagger"]), +// ], +// dependencies: [ +// .package(url: "https://github.com/kylef/PathKit.git", from: "0.9.0"), +// .package(url: "https://github.com/jakeheis/SwiftCLI", from: "5.0.0"), +// .package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", from: "2.7.2"), +// .package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"), +// .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.1.0"), +// .package(url: "https://github.com/kylef/Spectre.git", from: "0.9.0"), +// .package(url: "https://github.com/onevcat/Rainbow.git", from: "3.1.0"), +// ], +// targets: [ +// .target(name: "SwagGen", dependencies: [ +// "SwagGenKit", +// "SwiftCLI", +// "Rainbow", +// "PathKit", +// ]), +// .target(name: "SwagGenKit", dependencies: [ +// "Swagger", +// "JSONUtilities", +// "PathKit", +// "StencilSwiftKit", +// ]), +// .target(name: "Swagger", dependencies: [ +// "JSONUtilities", +// "Yams", +// "PathKit", +// ]), +// .testTarget(name: "SwagGenKitTests", dependencies: [ +// "SwagGenKit", +// "Spectre", +// ]), +// .testTarget(name: "SwaggerTests", dependencies: [ +// "Swagger", +// "Spectre", +// ]), +// ] +//) + + +/* + // swift-tools-version:4.0 + import PackageDescription + + let package = Package( + name: "SwagGen", + products: [ + .executable(name: "swaggen", targets: ["SwagGen"]), + .library(name: "SwagGenKit", targets: ["SwagGenKit"]), + .library(name: "Swagger", targets: ["Swagger"]), + ], + dependencies: [ + .package(url: "https://github.com/kylef/PathKit.git", from: "0.9.0"), + .package(url: "https://github.com/jakeheis/SwiftCLI", from: "5.0.0"), + .package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", from: "2.7.2"), + .package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"), + .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.1.0"), + .package(url: "https://github.com/kylef/Spectre.git", from: "0.9.0"), + .package(url: "https://github.com/onevcat/Rainbow.git", from: "3.1.0"), + ], + targets: [ + .target(name: "SwagGen", dependencies: [ + "SwagGenKit", + "SwiftCLI", + "Rainbow", + "PathKit", + ]), + .target(name: "SwagGenKit", dependencies: [ + "Swagger", + "JSONUtilities", + "PathKit", + "StencilSwiftKit", + ]), + .target(name: "Swagger", dependencies: [ + "JSONUtilities", + "Yams", + "PathKit", + ]), + .testTarget(name: "SwagGenKitTests", dependencies: [ + "SwagGenKit", + "Spectre", + ]), + .testTarget(name: "SwaggerTests", dependencies: [ + "Swagger", + "Spectre", + ]), + ] + ) + + */ From fd88d137a657a0c095af67ccea304eda2d93afef Mon Sep 17 00:00:00 2001 From: Unihilator Date: Sun, 12 May 2019 18:14:14 +0300 Subject: [PATCH 2/2] removed comments --- Package.swift | 101 -------------------------------------------------- 1 file changed, 101 deletions(-) diff --git a/Package.swift b/Package.swift index fe4f3e1ef..bb7d3234d 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,6 @@ let package = Package( dependencies: [ .package(url: "https://github.com/kylef/PathKit.git", from: "0.9.0"), .package(url: "https://github.com/jakeheis/SwiftCLI", from: "5.0.0"), -// .package(url: "https://github.com/yonaskolb/Stencil.git", from: "0.9.3"), .package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", from: "2.7.2"), .package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"), .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.1.0"), @@ -45,103 +44,3 @@ let package = Package( ]), ] ) - -// swift-tools-version:4.0 -import PackageDescription - -//let package = Package( -// name: "SwagGen", -// products: [ -// .executable(name: "swaggen", targets: ["SwagGen"]), -// .library(name: "SwagGenKit", targets: ["SwagGenKit"]), -// .library(name: "Swagger", targets: ["Swagger"]), -// ], -// dependencies: [ -// .package(url: "https://github.com/kylef/PathKit.git", from: "0.9.0"), -// .package(url: "https://github.com/jakeheis/SwiftCLI", from: "5.0.0"), -// .package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", from: "2.7.2"), -// .package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"), -// .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.1.0"), -// .package(url: "https://github.com/kylef/Spectre.git", from: "0.9.0"), -// .package(url: "https://github.com/onevcat/Rainbow.git", from: "3.1.0"), -// ], -// targets: [ -// .target(name: "SwagGen", dependencies: [ -// "SwagGenKit", -// "SwiftCLI", -// "Rainbow", -// "PathKit", -// ]), -// .target(name: "SwagGenKit", dependencies: [ -// "Swagger", -// "JSONUtilities", -// "PathKit", -// "StencilSwiftKit", -// ]), -// .target(name: "Swagger", dependencies: [ -// "JSONUtilities", -// "Yams", -// "PathKit", -// ]), -// .testTarget(name: "SwagGenKitTests", dependencies: [ -// "SwagGenKit", -// "Spectre", -// ]), -// .testTarget(name: "SwaggerTests", dependencies: [ -// "Swagger", -// "Spectre", -// ]), -// ] -//) - - -/* - // swift-tools-version:4.0 - import PackageDescription - - let package = Package( - name: "SwagGen", - products: [ - .executable(name: "swaggen", targets: ["SwagGen"]), - .library(name: "SwagGenKit", targets: ["SwagGenKit"]), - .library(name: "Swagger", targets: ["Swagger"]), - ], - dependencies: [ - .package(url: "https://github.com/kylef/PathKit.git", from: "0.9.0"), - .package(url: "https://github.com/jakeheis/SwiftCLI", from: "5.0.0"), - .package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", from: "2.7.2"), - .package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"), - .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.1.0"), - .package(url: "https://github.com/kylef/Spectre.git", from: "0.9.0"), - .package(url: "https://github.com/onevcat/Rainbow.git", from: "3.1.0"), - ], - targets: [ - .target(name: "SwagGen", dependencies: [ - "SwagGenKit", - "SwiftCLI", - "Rainbow", - "PathKit", - ]), - .target(name: "SwagGenKit", dependencies: [ - "Swagger", - "JSONUtilities", - "PathKit", - "StencilSwiftKit", - ]), - .target(name: "Swagger", dependencies: [ - "JSONUtilities", - "Yams", - "PathKit", - ]), - .testTarget(name: "SwagGenKitTests", dependencies: [ - "SwagGenKit", - "Spectre", - ]), - .testTarget(name: "SwaggerTests", dependencies: [ - "Swagger", - "Spectre", - ]), - ] - ) - - */