From 4ee52ecabef0189c856b8886e2c074a1644a7f32 Mon Sep 17 00:00:00 2001 From: Tim <0xtimc@gmail.com> Date: Wed, 27 Sep 2017 20:24:09 +0100 Subject: [PATCH] Upgrade project to Swift 4 --- Package.pins | 120 -------------------------------------------------- Package.swift | 29 ++++++------ 2 files changed, 16 insertions(+), 133 deletions(-) delete mode 100644 Package.pins diff --git a/Package.pins b/Package.pins deleted file mode 100644 index 46fd740..0000000 --- a/Package.pins +++ /dev/null @@ -1,120 +0,0 @@ -{ - "autoPin": true, - "pins": [ - { - "package": "BCrypt", - "reason": null, - "repositoryURL": "https://github.com/vapor/bcrypt.git", - "version": "1.0.0" - }, - { - "package": "Bits", - "reason": null, - "repositoryURL": "https://github.com/vapor/bits.git", - "version": "1.0.0" - }, - { - "package": "CTLS", - "reason": null, - "repositoryURL": "https://github.com/vapor/ctls.git", - "version": "1.0.0" - }, - { - "package": "Console", - "reason": null, - "repositoryURL": "https://github.com/vapor/console.git", - "version": "2.1.0" - }, - { - "package": "Core", - "reason": null, - "repositoryURL": "https://github.com/vapor/core.git", - "version": "2.0.2" - }, - { - "package": "Crypto", - "reason": null, - "repositoryURL": "https://github.com/vapor/crypto.git", - "version": "2.0.0" - }, - { - "package": "Debugging", - "reason": null, - "repositoryURL": "https://github.com/vapor/debugging.git", - "version": "1.0.0" - }, - { - "package": "Engine", - "reason": null, - "repositoryURL": "https://github.com/vapor/engine.git", - "version": "2.0.4" - }, - { - "package": "Fluent", - "reason": null, - "repositoryURL": "https://github.com/vapor/fluent.git", - "version": "2.1.0" - }, - { - "package": "FluentProvider", - "reason": null, - "repositoryURL": "https://github.com/vapor/fluent-provider.git", - "version": "1.1.1" - }, - { - "package": "JSON", - "reason": null, - "repositoryURL": "https://github.com/vapor/json.git", - "version": "2.0.2" - }, - { - "package": "Multipart", - "reason": null, - "repositoryURL": "https://github.com/vapor/multipart.git", - "version": "2.0.0" - }, - { - "package": "Node", - "reason": null, - "repositoryURL": "https://github.com/vapor/node.git", - "version": "2.0.3" - }, - { - "package": "Random", - "reason": null, - "repositoryURL": "https://github.com/vapor/random.git", - "version": "1.0.0" - }, - { - "package": "Routing", - "reason": null, - "repositoryURL": "https://github.com/vapor/routing.git", - "version": "2.0.0" - }, - { - "package": "SQLite", - "reason": null, - "repositoryURL": "https://github.com/vapor/sqlite.git", - "version": "2.0.0" - }, - { - "package": "Sockets", - "reason": null, - "repositoryURL": "https://github.com/vapor/sockets.git", - "version": "2.0.1" - }, - { - "package": "TLS", - "reason": null, - "repositoryURL": "https://github.com/vapor/tls.git", - "version": "2.0.4" - }, - { - "package": "Vapor", - "reason": null, - "repositoryURL": "https://github.com/vapor/vapor.git", - "version": "2.1.0" - } - ], - "version": 1 -} \ No newline at end of file diff --git a/Package.swift b/Package.swift index be001a4..e566c02 100644 --- a/Package.swift +++ b/Package.swift @@ -1,21 +1,24 @@ +// swift-tools-version:4.0 + import PackageDescription let package = Package( - name: "reminders", - targets: [ - Target(name: "App"), - Target(name: "Run", dependencies: ["App"]), + name: "Reminders", + products: [ + .library(name: "App", targets: ["App"]), + .executable(name: "Run", targets: ["Run"]) ], dependencies: [ - .Package(url: "https://github.com/vapor/vapor.git", majorVersion: 2), - .Package(url: "https://github.com/vapor/fluent-provider.git", majorVersion: 1) + .package(url: "https://github.com/vapor/vapor.git", .upToNextMajor(from: "2.1.0")), + .package(url: "https://github.com/vapor/fluent-provider.git", .upToNextMajor(from: "1.0.0")), ], - exclude: [ - "Config", - "Database", - "Localization", - "Public", - "Resources", + targets: [ + .target(name: "App", dependencies: ["Vapor", "FluentProvider"], + exclude: [ + "Config", + "Public", + "Resources", + ]), + .target(name: "Run", dependencies: ["App"]) ] ) -