From 99b8973c748ac280659ee4d14b187b77a404ce6d Mon Sep 17 00:00:00 2001 From: Harry Tran Date: Sun, 1 Dec 2019 08:13:19 +0700 Subject: [PATCH] Update project structure to support SPM --- .../contents.xcworkspacedata | 7 + .../xcshareddata/xcschemes/Spider.xcscheme | 92 +++++++++++ Package.swift | 20 +-- {Spider => Sources/Spider}/Info.plist | 0 {Spider => Sources/Spider}/Matchers.swift | 0 {Spider => Sources/Spider}/Spider.h | 0 {Spider => Sources/Spider}/Spider.swift | 0 .../Spider}/StringExtensions.swift | 0 {Spider => Sources/Spider}/StubRequest.swift | 0 {Spider => Sources/Spider}/StubResponse.swift | 0 .../Spider}/StubURLProtocol.swift | 2 + {Spider => Sources/Spider}/URLHook.swift | 0 .../Spider}/URLSessionHook.swift | 0 Spider.podspec | 2 +- Spider.xcodeproj/project.pbxproj | 146 ++++++++++-------- .../xcshareddata/xcschemes/Spider.xcscheme | 26 ++-- {SpiderTests => Tests}/Info.plist | 0 Tests/LinuxMain.swift | 8 + .../SpiderTests}/MatchersTests.swift | 11 +- .../SpiderTests}/SpiderTests.swift | 22 +-- Tests/SpiderTests/XCTestManifests.swift | 10 ++ 21 files changed, 239 insertions(+), 107 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata create mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/Spider.xcscheme rename {Spider => Sources/Spider}/Info.plist (100%) rename {Spider => Sources/Spider}/Matchers.swift (100%) rename {Spider => Sources/Spider}/Spider.h (100%) rename {Spider => Sources/Spider}/Spider.swift (100%) rename {Spider => Sources/Spider}/StringExtensions.swift (100%) rename {Spider => Sources/Spider}/StubRequest.swift (100%) rename {Spider => Sources/Spider}/StubResponse.swift (100%) rename {Spider => Sources/Spider}/StubURLProtocol.swift (99%) rename {Spider => Sources/Spider}/URLHook.swift (100%) rename {Spider => Sources/Spider}/URLSessionHook.swift (100%) rename {SpiderTests => Tests}/Info.plist (100%) create mode 100644 Tests/LinuxMain.swift rename {SpiderTests => Tests/SpiderTests}/MatchersTests.swift (80%) rename {SpiderTests => Tests/SpiderTests}/SpiderTests.swift (90%) create mode 100644 Tests/SpiderTests/XCTestManifests.swift diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Spider.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Spider.xcscheme new file mode 100644 index 0000000..1d3529e --- /dev/null +++ b/.swiftpm/xcode/xcshareddata/xcschemes/Spider.xcscheme @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Package.swift b/Package.swift index d4ad57c..6c99185 100644 --- a/Package.swift +++ b/Package.swift @@ -5,24 +5,12 @@ import PackageDescription let package = Package( name: "Spider", - platforms: [.macOS(.v10_12), - .iOS(.v10), - .tvOS(.v10), - .watchOS(.v3) - ], products: [ - .library( - name: "Spider", - targets: ["Spider"]) - ], - dependencies: [ + .library(name: "Spider", targets: ["Spider"]) ], + dependencies: [], targets: [ - .target( - name: "Spider", - dependencies: []), - .testTarget( - name: "SpiderTests", - dependencies: ["Spider"]) + .target(name: "Spider", dependencies: []), + .testTarget(name: "SpiderTests", dependencies: ["Spider"]) ] ) diff --git a/Spider/Info.plist b/Sources/Spider/Info.plist similarity index 100% rename from Spider/Info.plist rename to Sources/Spider/Info.plist diff --git a/Spider/Matchers.swift b/Sources/Spider/Matchers.swift similarity index 100% rename from Spider/Matchers.swift rename to Sources/Spider/Matchers.swift diff --git a/Spider/Spider.h b/Sources/Spider/Spider.h similarity index 100% rename from Spider/Spider.h rename to Sources/Spider/Spider.h diff --git a/Spider/Spider.swift b/Sources/Spider/Spider.swift similarity index 100% rename from Spider/Spider.swift rename to Sources/Spider/Spider.swift diff --git a/Spider/StringExtensions.swift b/Sources/Spider/StringExtensions.swift similarity index 100% rename from Spider/StringExtensions.swift rename to Sources/Spider/StringExtensions.swift diff --git a/Spider/StubRequest.swift b/Sources/Spider/StubRequest.swift similarity index 100% rename from Spider/StubRequest.swift rename to Sources/Spider/StubRequest.swift diff --git a/Spider/StubResponse.swift b/Sources/Spider/StubResponse.swift similarity index 100% rename from Spider/StubResponse.swift rename to Sources/Spider/StubResponse.swift diff --git a/Spider/StubURLProtocol.swift b/Sources/Spider/StubURLProtocol.swift similarity index 99% rename from Spider/StubURLProtocol.swift rename to Sources/Spider/StubURLProtocol.swift index f8fb3d2..575707f 100644 --- a/Spider/StubURLProtocol.swift +++ b/Sources/Spider/StubURLProtocol.swift @@ -6,6 +6,8 @@ // Copyright © 2019 Harry Tran. All rights reserved. // +import Foundation + final class StubURLProtocol: URLProtocol { override class func canInit(with request: URLRequest) -> Bool { diff --git a/Spider/URLHook.swift b/Sources/Spider/URLHook.swift similarity index 100% rename from Spider/URLHook.swift rename to Sources/Spider/URLHook.swift diff --git a/Spider/URLSessionHook.swift b/Sources/Spider/URLSessionHook.swift similarity index 100% rename from Spider/URLSessionHook.swift rename to Sources/Spider/URLSessionHook.swift diff --git a/Spider.podspec b/Spider.podspec index 694c94a..c678bfd 100644 --- a/Spider.podspec +++ b/Spider.podspec @@ -10,7 +10,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.platform = :ios, "10.0" - s.source_files = 'Spider/**/*.swift' + s.source_files = 'Spider/Sources/**/*.swift' s.ios.frameworks = 'UIKit', 'Foundation' end diff --git a/Spider.xcodeproj/project.pbxproj b/Spider.xcodeproj/project.pbxproj index 1e036d1..cd7945b 100644 --- a/Spider.xcodeproj/project.pbxproj +++ b/Spider.xcodeproj/project.pbxproj @@ -7,18 +7,19 @@ objects = { /* Begin PBXBuildFile section */ + 990BB6F52393451A00FA47DF /* Spider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990BB6ED2393451A00FA47DF /* Spider.swift */; }; + 990BB6F62393451A00FA47DF /* URLSessionHook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990BB6EE2393451A00FA47DF /* URLSessionHook.swift */; }; + 990BB6F72393451A00FA47DF /* StubResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990BB6EF2393451A00FA47DF /* StubResponse.swift */; }; + 990BB6F82393451A00FA47DF /* StringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990BB6F02393451A00FA47DF /* StringExtensions.swift */; }; + 990BB6F92393451A00FA47DF /* Matchers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990BB6F12393451A00FA47DF /* Matchers.swift */; }; + 990BB6FA2393451A00FA47DF /* StubURLProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990BB6F22393451A00FA47DF /* StubURLProtocol.swift */; }; + 990BB6FB2393451A00FA47DF /* StubRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990BB6F32393451A00FA47DF /* StubRequest.swift */; }; + 990BB6FC2393451A00FA47DF /* URLHook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990BB6F42393451A00FA47DF /* URLHook.swift */; }; + 990BB7042393452B00FA47DF /* SpiderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990BB7002393452B00FA47DF /* SpiderTests.swift */; }; + 990BB7052393452B00FA47DF /* XCTestManifests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990BB7012393452B00FA47DF /* XCTestManifests.swift */; }; + 990BB7062393452B00FA47DF /* MatchersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990BB7022393452B00FA47DF /* MatchersTests.swift */; }; + 998809FA239346890055ADA5 /* Spider.h in Headers */ = {isa = PBXBuildFile; fileRef = 998809F8239346890055ADA5 /* Spider.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9993F60E22DEB48300ABFE02 /* Spider.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9993F60422DEB48200ABFE02 /* Spider.framework */; }; - 9993F61322DEB48300ABFE02 /* SpiderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9993F61222DEB48300ABFE02 /* SpiderTests.swift */; }; - 9993F61522DEB48300ABFE02 /* Spider.h in Headers */ = {isa = PBXBuildFile; fileRef = 9993F60722DEB48200ABFE02 /* Spider.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9993F62622DEB49600ABFE02 /* URLSessionHook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9993F61E22DEB49500ABFE02 /* URLSessionHook.swift */; }; - 9993F62722DEB49600ABFE02 /* StubResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9993F61F22DEB49500ABFE02 /* StubResponse.swift */; }; - 9993F62822DEB49600ABFE02 /* StubRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9993F62022DEB49500ABFE02 /* StubRequest.swift */; }; - 9993F62A22DEB49600ABFE02 /* StubURLProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9993F62222DEB49500ABFE02 /* StubURLProtocol.swift */; }; - 9993F62B22DEB49600ABFE02 /* URLHook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9993F62322DEB49500ABFE02 /* URLHook.swift */; }; - 9993F62D22DEB49600ABFE02 /* Spider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9993F62522DEB49600ABFE02 /* Spider.swift */; }; - 9993F63722DF5E7500ABFE02 /* Matchers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9993F63622DF5E7500ABFE02 /* Matchers.swift */; }; - 9993F63B22DF706100ABFE02 /* MatchersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9993F63A22DF706100ABFE02 /* MatchersTests.swift */; }; - 99AF29AB230148A300E77395 /* StringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99B74B4822E014FD00F1B53C /* StringExtensions.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -32,21 +33,22 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 990BB6ED2393451A00FA47DF /* Spider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Spider.swift; sourceTree = ""; }; + 990BB6EE2393451A00FA47DF /* URLSessionHook.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLSessionHook.swift; sourceTree = ""; }; + 990BB6EF2393451A00FA47DF /* StubResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StubResponse.swift; sourceTree = ""; }; + 990BB6F02393451A00FA47DF /* StringExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringExtensions.swift; sourceTree = ""; }; + 990BB6F12393451A00FA47DF /* Matchers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Matchers.swift; sourceTree = ""; }; + 990BB6F22393451A00FA47DF /* StubURLProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StubURLProtocol.swift; sourceTree = ""; }; + 990BB6F32393451A00FA47DF /* StubRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StubRequest.swift; sourceTree = ""; }; + 990BB6F42393451A00FA47DF /* URLHook.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLHook.swift; sourceTree = ""; }; + 990BB7002393452B00FA47DF /* SpiderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpiderTests.swift; sourceTree = ""; }; + 990BB7012393452B00FA47DF /* XCTestManifests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTestManifests.swift; sourceTree = ""; }; + 990BB7022393452B00FA47DF /* MatchersTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatchersTests.swift; sourceTree = ""; }; + 998809F7239346890055ADA5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 998809F8239346890055ADA5 /* Spider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Spider.h; sourceTree = ""; }; + 998809FB239346C80055ADA5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = Tests/Info.plist; sourceTree = SOURCE_ROOT; }; 9993F60422DEB48200ABFE02 /* Spider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Spider.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9993F60722DEB48200ABFE02 /* Spider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Spider.h; sourceTree = ""; }; - 9993F60822DEB48200ABFE02 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9993F60D22DEB48300ABFE02 /* SpiderTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SpiderTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 9993F61222DEB48300ABFE02 /* SpiderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpiderTests.swift; sourceTree = ""; }; - 9993F61422DEB48300ABFE02 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9993F61E22DEB49500ABFE02 /* URLSessionHook.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLSessionHook.swift; sourceTree = ""; }; - 9993F61F22DEB49500ABFE02 /* StubResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StubResponse.swift; sourceTree = ""; }; - 9993F62022DEB49500ABFE02 /* StubRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StubRequest.swift; sourceTree = ""; }; - 9993F62222DEB49500ABFE02 /* StubURLProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StubURLProtocol.swift; sourceTree = ""; }; - 9993F62322DEB49500ABFE02 /* URLHook.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLHook.swift; sourceTree = ""; }; - 9993F62522DEB49600ABFE02 /* Spider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Spider.swift; sourceTree = ""; }; - 9993F63622DF5E7500ABFE02 /* Matchers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Matchers.swift; sourceTree = ""; }; - 9993F63A22DF706100ABFE02 /* MatchersTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MatchersTests.swift; sourceTree = ""; }; - 99B74B4822E014FD00F1B53C /* StringExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtensions.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -68,51 +70,68 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 9993F5FA22DEB48200ABFE02 = { + 990BB6EB2393451A00FA47DF /* Sources */ = { isa = PBXGroup; children = ( - 9993F60622DEB48200ABFE02 /* Spider */, - 9993F61122DEB48300ABFE02 /* SpiderTests */, - 9993F60522DEB48200ABFE02 /* Products */, + 990BB6EC2393451A00FA47DF /* Spider */, ); + path = Sources; sourceTree = ""; }; - 9993F60522DEB48200ABFE02 /* Products */ = { + 990BB6EC2393451A00FA47DF /* Spider */ = { isa = PBXGroup; children = ( - 9993F60422DEB48200ABFE02 /* Spider.framework */, - 9993F60D22DEB48300ABFE02 /* SpiderTests.xctest */, + 998809F7239346890055ADA5 /* Info.plist */, + 990BB6F12393451A00FA47DF /* Matchers.swift */, + 998809F8239346890055ADA5 /* Spider.h */, + 990BB6ED2393451A00FA47DF /* Spider.swift */, + 990BB6F02393451A00FA47DF /* StringExtensions.swift */, + 990BB6F32393451A00FA47DF /* StubRequest.swift */, + 990BB6EF2393451A00FA47DF /* StubResponse.swift */, + 990BB6F22393451A00FA47DF /* StubURLProtocol.swift */, + 990BB6F42393451A00FA47DF /* URLHook.swift */, + 990BB6EE2393451A00FA47DF /* URLSessionHook.swift */, ); - name = Products; + path = Spider; sourceTree = ""; }; - 9993F60622DEB48200ABFE02 /* Spider */ = { + 990BB6FD2393452B00FA47DF /* Tests */ = { isa = PBXGroup; children = ( - 9993F60722DEB48200ABFE02 /* Spider.h */, - 9993F60822DEB48200ABFE02 /* Info.plist */, - 9993F63622DF5E7500ABFE02 /* Matchers.swift */, - 9993F62522DEB49600ABFE02 /* Spider.swift */, - 9993F62022DEB49500ABFE02 /* StubRequest.swift */, - 9993F61F22DEB49500ABFE02 /* StubResponse.swift */, - 9993F62222DEB49500ABFE02 /* StubURLProtocol.swift */, - 9993F62322DEB49500ABFE02 /* URLHook.swift */, - 9993F61E22DEB49500ABFE02 /* URLSessionHook.swift */, - 99B74B4822E014FD00F1B53C /* StringExtensions.swift */, + 990BB6FF2393452B00FA47DF /* SpiderTests */, ); - path = Spider; + path = Tests; sourceTree = ""; }; - 9993F61122DEB48300ABFE02 /* SpiderTests */ = { + 990BB6FF2393452B00FA47DF /* SpiderTests */ = { isa = PBXGroup; children = ( - 9993F61422DEB48300ABFE02 /* Info.plist */, - 9993F63A22DF706100ABFE02 /* MatchersTests.swift */, - 9993F61222DEB48300ABFE02 /* SpiderTests.swift */, + 998809FB239346C80055ADA5 /* Info.plist */, + 990BB7002393452B00FA47DF /* SpiderTests.swift */, + 990BB7012393452B00FA47DF /* XCTestManifests.swift */, + 990BB7022393452B00FA47DF /* MatchersTests.swift */, ); path = SpiderTests; sourceTree = ""; }; + 9993F5FA22DEB48200ABFE02 = { + isa = PBXGroup; + children = ( + 990BB6FD2393452B00FA47DF /* Tests */, + 990BB6EB2393451A00FA47DF /* Sources */, + 9993F60522DEB48200ABFE02 /* Products */, + ); + sourceTree = ""; + }; + 9993F60522DEB48200ABFE02 /* Products */ = { + isa = PBXGroup; + children = ( + 9993F60422DEB48200ABFE02 /* Spider.framework */, + 9993F60D22DEB48300ABFE02 /* SpiderTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -120,7 +139,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 9993F61522DEB48300ABFE02 /* Spider.h in Headers */, + 998809FA239346890055ADA5 /* Spider.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -245,14 +264,14 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 99AF29AB230148A300E77395 /* StringExtensions.swift in Sources */, - 9993F62B22DEB49600ABFE02 /* URLHook.swift in Sources */, - 9993F62A22DEB49600ABFE02 /* StubURLProtocol.swift in Sources */, - 9993F62722DEB49600ABFE02 /* StubResponse.swift in Sources */, - 9993F62622DEB49600ABFE02 /* URLSessionHook.swift in Sources */, - 9993F62D22DEB49600ABFE02 /* Spider.swift in Sources */, - 9993F63722DF5E7500ABFE02 /* Matchers.swift in Sources */, - 9993F62822DEB49600ABFE02 /* StubRequest.swift in Sources */, + 990BB6F82393451A00FA47DF /* StringExtensions.swift in Sources */, + 990BB6F72393451A00FA47DF /* StubResponse.swift in Sources */, + 990BB6F92393451A00FA47DF /* Matchers.swift in Sources */, + 990BB6F52393451A00FA47DF /* Spider.swift in Sources */, + 990BB6FC2393451A00FA47DF /* URLHook.swift in Sources */, + 990BB6F62393451A00FA47DF /* URLSessionHook.swift in Sources */, + 990BB6FA2393451A00FA47DF /* StubURLProtocol.swift in Sources */, + 990BB6FB2393451A00FA47DF /* StubRequest.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -260,8 +279,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9993F63B22DF706100ABFE02 /* MatchersTests.swift in Sources */, - 9993F61322DEB48300ABFE02 /* SpiderTests.swift in Sources */, + 990BB7062393452B00FA47DF /* MatchersTests.swift in Sources */, + 990BB7042393452B00FA47DF /* SpiderTests.swift in Sources */, + 990BB7052393452B00FA47DF /* XCTestManifests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -409,7 +429,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Spider/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Sources/Spider/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -438,7 +458,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Spider/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Sources/Spider/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -461,7 +481,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 6ZVUJ9G9RV; - INFOPLIST_FILE = SpiderTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -480,7 +500,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 6ZVUJ9G9RV; - INFOPLIST_FILE = SpiderTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/Spider.xcodeproj/xcshareddata/xcschemes/Spider.xcscheme b/Spider.xcodeproj/xcshareddata/xcschemes/Spider.xcscheme index 72807f1..e85b581 100644 --- a/Spider.xcodeproj/xcshareddata/xcschemes/Spider.xcscheme +++ b/Spider.xcodeproj/xcshareddata/xcschemes/Spider.xcscheme @@ -26,9 +26,18 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES" - onlyGenerateCoverageForSpecifiedTargets = "YES" - shouldUseLaunchSchemeArgsEnv = "YES"> + onlyGenerateCoverageForSpecifiedTargets = "YES"> + + + + - - - - - - - - [XCTestCaseEntry] { + return [ + testCase(SpiderTests.allTests), + testCase(MatchersTests.allTests) + ] +} +#endif