From 521641765d208f5916378daf3df4d1363add6494 Mon Sep 17 00:00:00 2001 From: IKEDA Sho Date: Fri, 29 May 2020 23:15:39 +0900 Subject: [PATCH] [SwiftPM] Separate QuickTestHelpers into a separate target --- Package.swift | 3 ++- Package@swift-4.2.swift | 3 ++- Quick.xcodeproj/project.pbxproj | 2 +- .../QuickTestHelpers/XCTestCaseProvider.swift | 0 4 files changed, 5 insertions(+), 3 deletions(-) rename {Tests/QuickTests => Sources}/QuickTestHelpers/XCTestCaseProvider.swift (100%) diff --git a/Package.swift b/Package.swift index 7549be211..fecfe70e0 100644 --- a/Package.swift +++ b/Package.swift @@ -15,9 +15,10 @@ let package = Package( ], targets: { var targets: [Target] = [ + .target(name: "QuickTestHelpers", dependencies: []), .testTarget( name: "QuickTests", - dependencies: [ "Quick", "Nimble" ], + dependencies: [ "Quick", "QuickTestHelpers", "Nimble" ], exclude: [ "QuickAfterSuiteTests/AfterSuiteTests+ObjC.m", "QuickFocusedTests/FocusedTests+ObjC.m", diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift index f23f228a7..6e6888884 100644 --- a/Package@swift-4.2.swift +++ b/Package@swift-4.2.swift @@ -12,9 +12,10 @@ let package = Package( ], targets: { var targets: [Target] = [ + .target(name: "QuickTestHelpers", dependencies: []), .testTarget( name: "QuickTests", - dependencies: [ "Quick", "Nimble" ], + dependencies: [ "Quick", "QuickTestHelpers", "Nimble" ], exclude: [ "QuickAfterSuiteTests/AfterSuiteTests+ObjC.m", "QuickFocusedTests/FocusedTests+ObjC.m", diff --git a/Quick.xcodeproj/project.pbxproj b/Quick.xcodeproj/project.pbxproj index eb6a0f3b9..62f66a02b 100644 --- a/Quick.xcodeproj/project.pbxproj +++ b/Quick.xcodeproj/project.pbxproj @@ -339,7 +339,7 @@ 1F118CF01BDCA4BB005013A2 /* QuickFocused - tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "QuickFocused - tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 1F118D341BDCA657005013A2 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = "Externals/Nimble/build/Debug-appletvos/Nimble.framework"; sourceTree = ""; }; 1F118D361BDCA65C005013A2 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = "Externals/Nimble/build/Debug-appletvos/Nimble.framework"; sourceTree = ""; }; - 34ACFB7B1C34859300942064 /* XCTestCaseProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = XCTestCaseProvider.swift; path = ../../QuickTestHelpers/XCTestCaseProvider.swift; sourceTree = ""; }; + 34ACFB7B1C34859300942064 /* XCTestCaseProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = XCTestCaseProvider.swift; path = ../../../../Sources/QuickTestHelpers/XCTestCaseProvider.swift; sourceTree = ""; }; 34C586071C4AC5E500D4F057 /* ErrorUtility.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ErrorUtility.swift; sourceTree = ""; }; 34F3759C19515CA700CE1B99 /* Callsite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Callsite.swift; sourceTree = ""; }; 34F3759E19515CA700CE1B99 /* Example.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Example.swift; sourceTree = ""; }; diff --git a/Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift b/Sources/QuickTestHelpers/XCTestCaseProvider.swift similarity index 100% rename from Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift rename to Sources/QuickTestHelpers/XCTestCaseProvider.swift