From 2f5e4322399b0770abb30e92f14a492b14423e82 Mon Sep 17 00:00:00 2001 From: Brandon Evans Date: Tue, 24 Nov 2020 21:20:35 -0700 Subject: [PATCH] Fix things, tests pass --- Xcodes.xcodeproj/project.pbxproj | 22 +++--- .../xcshareddata/swiftpm/Package.resolved | 70 ------------------- {XcodesMacTests => XcodesTests}/Info.plist | 0 .../XcodesTests.swift | 2 +- 4 files changed, 12 insertions(+), 82 deletions(-) delete mode 100644 XcodesMac.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved rename {XcodesMacTests => XcodesTests}/Info.plist (100%) rename XcodesMacTests/XcodesMacTests.swift => XcodesTests/XcodesTests.swift (95%) diff --git a/Xcodes.xcodeproj/project.pbxproj b/Xcodes.xcodeproj/project.pbxproj index 38e2f00..bf3c1fd 100644 --- a/Xcodes.xcodeproj/project.pbxproj +++ b/Xcodes.xcodeproj/project.pbxproj @@ -21,7 +21,7 @@ CAD2E7A62449575000113D76 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CAD2E7A52449575000113D76 /* Assets.xcassets */; }; CAD2E7A92449575000113D76 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CAD2E7A82449575000113D76 /* Preview Assets.xcassets */; }; CAD2E7AC2449575000113D76 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CAD2E7AA2449575000113D76 /* Main.storyboard */; }; - CAD2E7B82449575100113D76 /* XcodesMacTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAD2E7B72449575100113D76 /* XcodesMacTests.swift */; }; + CAD2E7B82449575100113D76 /* XcodesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAD2E7B72449575100113D76 /* XcodesTests.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -55,7 +55,7 @@ CAD2E7AD2449575000113D76 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CAD2E7AE2449575000113D76 /* Xcodes.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Xcodes.entitlements; sourceTree = ""; }; CAD2E7B32449575100113D76 /* XcodesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = XcodesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - CAD2E7B72449575100113D76 /* XcodesMacTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodesMacTests.swift; sourceTree = ""; }; + CAD2E7B72449575100113D76 /* XcodesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodesTests.swift; sourceTree = ""; }; CAD2E7B92449575100113D76 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -105,7 +105,7 @@ CA538A0F255A4F3300E64DD7 /* XcodesKit */, CA538A0C255A4F1A00E64DD7 /* AppleAPI */, CAD2E7A02449574E00113D76 /* Xcodes */, - CAD2E7B62449575100113D76 /* XcodesMacTests */, + CAD2E7B62449575100113D76 /* XcodesTests */, CAD2E79F2449574E00113D76 /* Products */, CA538A12255A4F7C00E64DD7 /* Frameworks */, ); @@ -146,13 +146,13 @@ path = "Preview Content"; sourceTree = ""; }; - CAD2E7B62449575100113D76 /* XcodesMacTests */ = { + CAD2E7B62449575100113D76 /* XcodesTests */ = { isa = PBXGroup; children = ( - CAD2E7B72449575100113D76 /* XcodesMacTests.swift */, + CAD2E7B72449575100113D76 /* XcodesTests.swift */, CAD2E7B92449575100113D76 /* Info.plist */, ); - path = XcodesMacTests; + path = XcodesTests; sourceTree = ""; }; /* End PBXGroup section */ @@ -278,7 +278,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - CAD2E7B82449575100113D76 /* XcodesMacTests.swift in Sources */, + CAD2E7B82449575100113D76 /* XcodesTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -469,13 +469,13 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = Z2R9WCWER2; - INFOPLIST_FILE = XcodesMacTests/Info.plist; + INFOPLIST_FILE = XcodesTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.XcodesMacTests; + PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.XcodesAppTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Xcodes.app/Contents/MacOS/Xcodes"; @@ -490,13 +490,13 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = Z2R9WCWER2; - INFOPLIST_FILE = XcodesMacTests/Info.plist; + INFOPLIST_FILE = XcodesTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.XcodesMacTests; + PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.XcodesAppTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Xcodes.app/Contents/MacOS/Xcodes"; diff --git a/XcodesMac.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/XcodesMac.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 14fd872..0000000 --- a/XcodesMac.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,70 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "PMKFoundation", - "repositoryURL": "https://github.com/PromiseKit/Foundation.git", - "state": { - "branch": null, - "revision": "1a276e598dac59489ed904887e0740fa75e571e0", - "version": "3.3.4" - } - }, - { - "package": "KeychainAccess", - "repositoryURL": "https://github.com/kishikawakatsumi/KeychainAccess.git", - "state": { - "branch": null, - "revision": "8d33ffd6f74b3bcfc99af759d4204c6395a3f918", - "version": "3.2.1" - } - }, - { - "package": "LegibleError", - "repositoryURL": "https://github.com/mxcl/LegibleError.git", - "state": { - "branch": null, - "revision": "909e9bab3ded97350b28a5ab41dd745dd8aa9710", - "version": "1.0.4" - } - }, - { - "package": "Path.swift", - "repositoryURL": "https://github.com/mxcl/Path.swift.git", - "state": { - "branch": null, - "revision": "dac007e907a4f4c565cfdc55a9ce148a761a11d5", - "version": "0.16.3" - } - }, - { - "package": "PromiseKit", - "repositoryURL": "https://github.com/mxcl/PromiseKit.git", - "state": { - "branch": null, - "revision": "aea48ea1855f5d82e2dffa6027afce3aab8f3dd7", - "version": "6.13.3" - } - }, - { - "package": "SwiftSoup", - "repositoryURL": "https://github.com/scinfu/SwiftSoup.git", - "state": { - "branch": null, - "revision": "774dc9c7213085db8aa59595e27c1cd22e428904", - "version": "2.3.2" - } - }, - { - "package": "Version", - "repositoryURL": "https://github.com/mxcl/Version.git", - "state": { - "branch": null, - "revision": "a94b48f36763c05629fc102837398505032dead9", - "version": "2.0.0" - } - } - ] - }, - "version": 1 -} diff --git a/XcodesMacTests/Info.plist b/XcodesTests/Info.plist similarity index 100% rename from XcodesMacTests/Info.plist rename to XcodesTests/Info.plist diff --git a/XcodesMacTests/XcodesMacTests.swift b/XcodesTests/XcodesTests.swift similarity index 95% rename from XcodesMacTests/XcodesMacTests.swift rename to XcodesTests/XcodesTests.swift index 1db2a81..3a640d4 100644 --- a/XcodesMacTests/XcodesMacTests.swift +++ b/XcodesTests/XcodesTests.swift @@ -1,7 +1,7 @@ import XCTest @testable import Xcodes -class XcodesMacTests: XCTestCase { +class XcodesTests: XCTestCase { override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in the class.