From dabb27da06c33a9d3825c5b951a97d79fd06db6f Mon Sep 17 00:00:00 2001 From: Jeremy Saklad Date: Sun, 15 Mar 2020 12:14:16 -0500 Subject: [PATCH 1/5] Prepend Swift tools version to Package.swift Package.swift MUST specify a version according to https://developer.apple.com/documentation/xcode/creating_a_standalone_swift_package_with_xcode. Failure to do so causes Swift Package Manager to assume the version is 3.1.0, which is no longer supported. --- Package.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Package.swift b/Package.swift index e8fc9b1..e4cbdad 100644 --- a/Package.swift +++ b/Package.swift @@ -1,3 +1,4 @@ +// swift-tools-version:5.1 import PackageDescription let package = Package( From 17351dda5b99ca5ee0e0789452a343710c239011 Mon Sep 17 00:00:00 2001 From: Jeremy Saklad Date: Sun, 15 Mar 2020 12:23:11 -0500 Subject: [PATCH 2/5] Add target to Package.swift This is necessary for Swift Package Manager to work. --- Package.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index e4cbdad..973da9c 100644 --- a/Package.swift +++ b/Package.swift @@ -2,5 +2,11 @@ import PackageDescription let package = Package( - name: "OrderedSet" + name: "OrderedSet", + targets: [ + .target( + name: "OrderedSet", + dependencies: [] + ) + ] ) From 261839eb5237505ce699c2b17114d05906cb7894 Mon Sep 17 00:00:00 2001 From: Jeremy Saklad Date: Sun, 15 Mar 2020 12:41:53 -0500 Subject: [PATCH 3/5] Move OrderedSet files to correct path Unless a custom path is specified (which seems unnecessary in this instance), files in the target should be in a subfolder of Sources. --- Sources/{ => OrderedSet}/Functions.swift | 0 Sources/{ => OrderedSet}/OrderedSet+Array.swift | 0 Sources/{ => OrderedSet}/OrderedSet+CustomStringConvertible.swift | 0 Sources/{ => OrderedSet}/OrderedSet+Set.swift | 0 Sources/{ => OrderedSet}/OrderedSet.h | 0 Sources/{ => OrderedSet}/OrderedSet.swift | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename Sources/{ => OrderedSet}/Functions.swift (100%) rename Sources/{ => OrderedSet}/OrderedSet+Array.swift (100%) rename Sources/{ => OrderedSet}/OrderedSet+CustomStringConvertible.swift (100%) rename Sources/{ => OrderedSet}/OrderedSet+Set.swift (100%) rename Sources/{ => OrderedSet}/OrderedSet.h (100%) rename Sources/{ => OrderedSet}/OrderedSet.swift (100%) diff --git a/Sources/Functions.swift b/Sources/OrderedSet/Functions.swift similarity index 100% rename from Sources/Functions.swift rename to Sources/OrderedSet/Functions.swift diff --git a/Sources/OrderedSet+Array.swift b/Sources/OrderedSet/OrderedSet+Array.swift similarity index 100% rename from Sources/OrderedSet+Array.swift rename to Sources/OrderedSet/OrderedSet+Array.swift diff --git a/Sources/OrderedSet+CustomStringConvertible.swift b/Sources/OrderedSet/OrderedSet+CustomStringConvertible.swift similarity index 100% rename from Sources/OrderedSet+CustomStringConvertible.swift rename to Sources/OrderedSet/OrderedSet+CustomStringConvertible.swift diff --git a/Sources/OrderedSet+Set.swift b/Sources/OrderedSet/OrderedSet+Set.swift similarity index 100% rename from Sources/OrderedSet+Set.swift rename to Sources/OrderedSet/OrderedSet+Set.swift diff --git a/Sources/OrderedSet.h b/Sources/OrderedSet/OrderedSet.h similarity index 100% rename from Sources/OrderedSet.h rename to Sources/OrderedSet/OrderedSet.h diff --git a/Sources/OrderedSet.swift b/Sources/OrderedSet/OrderedSet.swift similarity index 100% rename from Sources/OrderedSet.swift rename to Sources/OrderedSet/OrderedSet.swift From cdb134fff54572661da6ec82d441d61e155d6237 Mon Sep 17 00:00:00 2001 From: Jeremy Saklad Date: Sun, 15 Mar 2020 13:01:06 -0500 Subject: [PATCH 4/5] Add product to Package.swift This is necessary for actually importing the module. --- Package.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Package.swift b/Package.swift index 973da9c..a481c26 100644 --- a/Package.swift +++ b/Package.swift @@ -3,6 +3,9 @@ import PackageDescription let package = Package( name: "OrderedSet", + products: [ + .library(name: "OrderedSet", targets: ["OrderedSet"]) + ], targets: [ .target( name: "OrderedSet", From c6490dddf0ec3751b24b9ff47d65724597490acb Mon Sep 17 00:00:00 2001 From: Jeremy Saklad Date: Sun, 15 Mar 2020 13:02:12 -0500 Subject: [PATCH 5/5] Add test target to Package.swift This is necessary for package testing to work. Similar to the main target, it needs to be in a special subfolder of Tests. --- Package.swift | 12 +++++------- Tests/{ => OrderedSetTests}/OrderedSetTests.swift | 0 2 files changed, 5 insertions(+), 7 deletions(-) rename Tests/{ => OrderedSetTests}/OrderedSetTests.swift (100%) diff --git a/Package.swift b/Package.swift index a481c26..5a7616f 100644 --- a/Package.swift +++ b/Package.swift @@ -3,13 +3,11 @@ import PackageDescription let package = Package( name: "OrderedSet", - products: [ - .library(name: "OrderedSet", targets: ["OrderedSet"]) - ], + products: [ + .library(name: "OrderedSet", targets: ["OrderedSet"]) + ], targets: [ - .target( - name: "OrderedSet", - dependencies: [] - ) + .target(name: "OrderedSet", dependencies: []), + .testTarget(name: "OrderedSetTests", dependencies: ["OrderedSet"]) ] ) diff --git a/Tests/OrderedSetTests.swift b/Tests/OrderedSetTests/OrderedSetTests.swift similarity index 100% rename from Tests/OrderedSetTests.swift rename to Tests/OrderedSetTests/OrderedSetTests.swift