From 6b7726752af1c15de45a4f0e80bda84749093c6f Mon Sep 17 00:00:00 2001 From: Nate Stedman Date: Fri, 4 Dec 2015 00:50:05 -0500 Subject: [PATCH 1/3] Move tests from /ResultTests to /Tests. If this pull request is merged into the Swift build tool: https://github.com/apple/swift-package-manager/pull/16 This commit can be reverted. --- Result.xcodeproj/project.pbxproj | 19 ++++++++++--------- {ResultTests => Tests}/Info.plist | 0 {ResultTests => Tests}/ResultTests.swift | 0 3 files changed, 10 insertions(+), 9 deletions(-) rename {ResultTests => Tests}/Info.plist (100%) rename {ResultTests => Tests}/ResultTests.swift (100%) diff --git a/Result.xcodeproj/project.pbxproj b/Result.xcodeproj/project.pbxproj index b94a08b..3495ed2 100644 --- a/Result.xcodeproj/project.pbxproj +++ b/Result.xcodeproj/project.pbxproj @@ -191,7 +191,8 @@ D454806E1A9572F5009D7229 /* ResultTests.swift */, D454806C1A9572F5009D7229 /* Supporting Files */, ); - path = ResultTests; + name = ResultTests; + path = Tests; sourceTree = ""; }; D454806C1A9572F5009D7229 /* Supporting Files */ = { @@ -645,7 +646,7 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = ResultTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; @@ -659,7 +660,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = ResultTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; @@ -725,7 +726,7 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = ResultTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; @@ -742,7 +743,7 @@ "$(DEVELOPER_FRAMEWORKS_DIR)", "$(inherited)", ); - INFOPLIST_FILE = ResultTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; @@ -894,7 +895,7 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = ResultTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -910,7 +911,7 @@ "$(DEVELOPER_FRAMEWORKS_DIR)", "$(inherited)", ); - INFOPLIST_FILE = ResultTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -977,7 +978,7 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = ResultTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -991,7 +992,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = ResultTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; diff --git a/ResultTests/Info.plist b/Tests/Info.plist similarity index 100% rename from ResultTests/Info.plist rename to Tests/Info.plist diff --git a/ResultTests/ResultTests.swift b/Tests/ResultTests.swift similarity index 100% rename from ResultTests/ResultTests.swift rename to Tests/ResultTests.swift From cea41ca9725d59e874eb775d6918270d39730d01 Mon Sep 17 00:00:00 2001 From: Nate Stedman Date: Fri, 4 Dec 2015 00:50:15 -0500 Subject: [PATCH 2/3] Ignore .build directory. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 95ddb50..29471cb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ xcuserdata *.pbxuser Carthage/Build +.build From 6b6d86b9fba02ff0c5ca0b0f268d0e933606129e Mon Sep 17 00:00:00 2001 From: Nate Stedman Date: Fri, 4 Dec 2015 00:50:22 -0500 Subject: [PATCH 3/3] Add Package.swift. --- Package.swift | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..3004377 --- /dev/null +++ b/Package.swift @@ -0,0 +1,10 @@ +import PackageDescription + +let package = Package( + name: "Result", + targets: [ + Target( + name: "Result" + ) + ] +)