From e5d457a8dfa76254b1657ccdcb4175ffb6651e11 Mon Sep 17 00:00:00 2001 From: "leo.wang" Date: Tue, 28 May 2019 14:31:59 +1000 Subject: [PATCH 1/4] fix conflicting requirements in dependencies --- Package.resolved | 14 +++++++------- Package.swift | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Package.resolved b/Package.resolved index c796fb3ec..e810dad0d 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": "128d2ffc22467f69569ef8ff971683e2393191a0", + "version": "4.2.0" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/onevcat/Rainbow.git", "state": { "branch": null, - "revision": "df197437d8acefb2ae01ab073be1d531fe7781ef", - "version": "2.1.0" + "revision": "9c52c1952e9b2305d4507cf473392ac2d7c9b155", + "version": "3.1.5" } }, { @@ -39,11 +39,11 @@ }, { "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" } }, { diff --git a/Package.swift b/Package.swift index 30237501c..1a3e56cdd 100644 --- a/Package.swift +++ b/Package.swift @@ -11,11 +11,11 @@ let package = Package( dependencies: [ .package(url: "https://github.com/kylef/PathKit.git", from: "0.8.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/stencilproject/Stencil.git", from: "0.13.0"), .package(url: "https://github.com/jpsim/Yams.git", from: "0.5.0"), - .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "3.3.0"), + .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.1.0"), .package(url: "https://github.com/kylef/Spectre.git", from: "0.7.0"), - .package(url: "https://github.com/onevcat/Rainbow.git", from: "2.1.0"), + .package(url: "https://github.com/onevcat/Rainbow.git", from: "3.1.0"), ], targets: [ .target(name: "SwagGen", dependencies: [ From fd4be12ab3d6ac8c77d547fbb3d722e6f28ccbb9 Mon Sep 17 00:00:00 2001 From: Eduardo Miranda Date: Sun, 7 Jul 2019 15:06:44 +0200 Subject: [PATCH 2/4] Set dependency "SwiftCLI" to be upToNextMinor(from: "5.2.2") --- Package.resolved | 16 ++++++++-------- Package.swift | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Package.resolved b/Package.resolved index e810dad0d..8fec5d691 100644 --- a/Package.resolved +++ b/Package.resolved @@ -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,8 +33,8 @@ "repositoryURL": "https://github.com/kylef/Spectre.git", "state": { "branch": null, - "revision": "e46b75cf03ad5e563b4b0a5068d3d6f04d77d80b", - "version": "0.7.2" + "revision": "f14ff47f45642aa5703900980b014c2e9394b6e5", + "version": "0.9.0" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/jakeheis/SwiftCLI", "state": { "branch": null, - "revision": "51ba542611878b2e64e82467b895fdf4240ec32e", - "version": "5.0.0" + "revision": "5318c37d3cacc8780f50b87a8840a6774320ebdf", + "version": "5.2.2" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/jpsim/Yams.git", "state": { "branch": null, - "revision": "95f45caf07472ec78223ebada45255086a85b01a", - "version": "0.5.0" + "revision": "6652aa7b793d3c8a075db0614acb575fcaecf457", + "version": "0.7.0" } } ] diff --git a/Package.swift b/Package.swift index 1a3e56cdd..c498edf7a 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/kylef/PathKit.git", from: "0.8.0"), - .package(url: "https://github.com/jakeheis/SwiftCLI", from: "5.0.0"), + .package(url: "https://github.com/jakeheis/SwiftCLI", .upToNextMinor(from: "5.2.2")), .package(url: "https://github.com/stencilproject/Stencil.git", from: "0.13.0"), .package(url: "https://github.com/jpsim/Yams.git", from: "0.5.0"), .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.1.0"), From f4bebeb9d19e3599adf386266c70f47f93a96f2f Mon Sep 17 00:00:00 2001 From: Robert Janik Date: Tue, 23 Jul 2019 17:47:46 +0200 Subject: [PATCH 3/4] Updated Xcode version in Readme.md. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7c0c1f4aa..95814f607 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ It is an alternative the official [swagger-codegen](https://github.com/swagger-a The default Swift templates it generates include support for model inheritance, shared enums, mutable parameter structs, convenience initialisers, inline schemas, Codable and Equatable models, configurable model options, generic networking stack, decoding options, and many other niceties. ## Installing -Make sure Xcode 9.3 is installed first. +Make sure Xcode 10.3 is installed first. ### [Mint](https://github.com/yonaskolb/mint) ```sh From c310cff3e170551d55aded803b1bffbc9b42d0a9 Mon Sep 17 00:00:00 2001 From: Johann Martinache Date: Mon, 11 Jan 2021 16:16:44 +0000 Subject: [PATCH 4/4] fix(linux support): add the missing import for linux --- Sources/SwagGen/GenerateCommand.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Sources/SwagGen/GenerateCommand.swift b/Sources/SwagGen/GenerateCommand.swift index 12cb793ed..f019b53ea 100644 --- a/Sources/SwagGen/GenerateCommand.swift +++ b/Sources/SwagGen/GenerateCommand.swift @@ -1,4 +1,7 @@ import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import PathKit import Rainbow import SwagGenKit