From 5a288f41972d98c94368820291bcb27c289239f3 Mon Sep 17 00:00:00 2001 From: Lukas Kubanek Date: Mon, 29 Apr 2019 13:14:59 +0200 Subject: [PATCH] Attempted to fix the issue with package definition Fixes #51 Signed-off-by: Lukas Kubanek --- OrderedDictionary.xcodeproj/project.pbxproj | 4 +++ Package.swift | 2 +- Package@swift-4.2.swift | 27 +++++++++++++++++++++ Package@swift-5.swift | 27 +++++++++++++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 Package@swift-4.2.swift create mode 100644 Package@swift-5.swift diff --git a/OrderedDictionary.xcodeproj/project.pbxproj b/OrderedDictionary.xcodeproj/project.pbxproj index 95ddc83..7ec996a 100644 --- a/OrderedDictionary.xcodeproj/project.pbxproj +++ b/OrderedDictionary.xcodeproj/project.pbxproj @@ -37,6 +37,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 8024947E2277123600AB44C7 /* Package@swift-4.2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Package@swift-4.2.swift"; sourceTree = ""; }; + 8024947F2277136D00AB44C7 /* Package@swift-5.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Package@swift-5.swift"; sourceTree = ""; }; 804879371E217C7700AD31A3 /* build.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = build.sh; sourceTree = ""; }; 804879381E217CA100AD31A3 /* validate-playgrounds.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "validate-playgrounds.sh"; sourceTree = ""; }; 8055B0381E201C5D009DC3EE /* OrderedDictionary.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OrderedDictionary.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -105,6 +107,8 @@ 80DE329320F4DD910053EDA7 /* README.md */, 80DE329420F4DD910053EDA7 /* LICENSE.md */, 80DE329220F4CAFA0053EDA7 /* Package.swift */, + 8024947E2277123600AB44C7 /* Package@swift-4.2.swift */, + 8024947F2277136D00AB44C7 /* Package@swift-5.swift */, 8055B0521E201D24009DC3EE /* Sources */, 80B28EB11E201F72007E3A77 /* Playgrounds */, 8055B0571E201DF3009DC3EE /* Tests */, diff --git a/Package.swift b/Package.swift index 131390c..303ea42 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.2 +// swift-tools-version:4 import PackageDescription diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift new file mode 100644 index 0000000..42e399d --- /dev/null +++ b/Package@swift-4.2.swift @@ -0,0 +1,27 @@ +// swift-tools-version:4.2 + +import PackageDescription + +let package = Package( + name: "OrderedDictionary", + products: [ + .library( + name: "OrderedDictionary", + targets: ["OrderedDictionary"] + ) + ], + dependencies: [], + targets: [ + .target( + name: "OrderedDictionary", + dependencies: [], + path: "Sources" + ), + .testTarget( + name: "OrderedDictionaryTests", + dependencies: ["OrderedDictionary"], + path: "Tests" + ) + ], + swiftLanguageVersions: [.v4, .v4_2] +) diff --git a/Package@swift-5.swift b/Package@swift-5.swift new file mode 100644 index 0000000..a267d3e --- /dev/null +++ b/Package@swift-5.swift @@ -0,0 +1,27 @@ +// swift-tools-version:5.0 + +import PackageDescription + +let package = Package( + name: "OrderedDictionary", + products: [ + .library( + name: "OrderedDictionary", + targets: ["OrderedDictionary"] + ) + ], + dependencies: [], + targets: [ + .target( + name: "OrderedDictionary", + dependencies: [], + path: "Sources" + ), + .testTarget( + name: "OrderedDictionaryTests", + dependencies: ["OrderedDictionary"], + path: "Tests" + ) + ], + swiftLanguageVersions: [.v5] +)