From d279cd766207ff0e3a10454892457006d86b0f66 Mon Sep 17 00:00:00 2001 From: Justin Martin Date: Thu, 19 Sep 2024 13:12:35 -0700 Subject: [PATCH] Fix TestableSwift & Calculator projects to use SPM instead of the dynamic framework target that was just deleted --- .../Acceptance Tests/BasicCalculatorRobot.m | 2 +- .../Calculator/Acceptance Tests/TestRobot.m | 2 +- .../Calculator.xcodeproj/project.pbxproj | 155 ++--------- .../TestableSwift.xcodeproj}/project.pbxproj | 242 ++++++------------ .../xcschemes/TestableSwift.xcscheme} | 69 +++-- .../TestableSwift}/AppDelegate.swift | 0 .../Base.lproj/LaunchScreen.xib | 0 .../TestableSwift}/Base.lproj/Main.storyboard | 0 .../AppIcon.appiconset/Contents.json | 0 .../Images.xcassets/Contents.json | 0 .../TestableSwift}/Info.plist | 0 .../TestableSwift}/MasterViewController.swift | 0 .../TestableSwiftTests}/Info.plist | 0 .../TestableSwiftTests}/SimpleObjCTest.m | 2 +- .../TestableSwiftTests}/SimpleSwiftTest.swift | 0 .../TestableSwiftTests-Bridging-Header.h} | 2 +- .../Testable_SwiftTests.swift | 0 scripts/ci.sh | 4 +- 18 files changed, 145 insertions(+), 333 deletions(-) rename Documentation/Examples/{Testable Swift/Testable Swift.xcodeproj => TestableSwift/TestableSwift.xcodeproj}/project.pbxproj (67%) rename Documentation/Examples/{Testable Swift/Testable Swift.xcodeproj/xcshareddata/xcschemes/Testable Swift.xcscheme => TestableSwift/TestableSwift.xcodeproj/xcshareddata/xcschemes/TestableSwift.xcscheme} (66%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/AppDelegate.swift (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/Base.lproj/LaunchScreen.xib (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/Base.lproj/Main.storyboard (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/Images.xcassets/Contents.json (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/Info.plist (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/MasterViewController.swift (100%) rename Documentation/Examples/{Testable Swift/Testable SwiftTests => TestableSwift/TestableSwiftTests}/Info.plist (100%) rename Documentation/Examples/{Testable Swift/Testable SwiftTests => TestableSwift/TestableSwiftTests}/SimpleObjCTest.m (96%) rename Documentation/Examples/{Testable Swift/Testable SwiftTests => TestableSwift/TestableSwiftTests}/SimpleSwiftTest.swift (100%) rename Documentation/Examples/{Testable Swift/Testable SwiftTests/Testable SwiftTests-Bridging-Header.h => TestableSwift/TestableSwiftTests/TestableSwiftTests-Bridging-Header.h} (83%) rename Documentation/Examples/{Testable Swift/Testable SwiftTests => TestableSwift/TestableSwiftTests}/Testable_SwiftTests.swift (100%) diff --git a/Documentation/Examples/Calculator/Acceptance Tests/BasicCalculatorRobot.m b/Documentation/Examples/Calculator/Acceptance Tests/BasicCalculatorRobot.m index 42c68141e..af27e55df 100644 --- a/Documentation/Examples/Calculator/Acceptance Tests/BasicCalculatorRobot.m +++ b/Documentation/Examples/Calculator/Acceptance Tests/BasicCalculatorRobot.m @@ -2,7 +2,7 @@ // See the LICENSE file distributed with this work for the terms under // which Square, Inc. licenses this file to you. -#import +@import KIF; #import "BasicCalculatorRobot.h" diff --git a/Documentation/Examples/Calculator/Acceptance Tests/TestRobot.m b/Documentation/Examples/Calculator/Acceptance Tests/TestRobot.m index a0f077cac..faf788217 100644 --- a/Documentation/Examples/Calculator/Acceptance Tests/TestRobot.m +++ b/Documentation/Examples/Calculator/Acceptance Tests/TestRobot.m @@ -6,7 +6,7 @@ // Copyright © 2017 SSK Development. All rights reserved. // -#import +@import KIF; #import "TestRobot.h" diff --git a/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj b/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj index 9a76c982b..3c04068ce 100644 --- a/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj +++ b/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj @@ -3,11 +3,11 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ - 62F81B511EBBE965009B2400 /* KIF.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 62F81B3C1EBBE917009B2400 /* KIF.framework */; }; + 6282C6352C9CBE210040DCDB /* KIF in Frameworks */ = {isa = PBXBuildFile; productRef = 6282C6342C9CBE210040DCDB /* KIF */; }; 62F81B521EBBE976009B2400 /* BasicCalculatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EB4C315F167BAE6100E31109 /* BasicCalculatorTests.m */; }; 62F81B5D1EBBEB6B009B2400 /* BasicCalculatorRobot.m in Sources */ = {isa = PBXBuildFile; fileRef = 62F81B5C1EBBEB6B009B2400 /* BasicCalculatorRobot.m */; }; 62F972EB1F708273003EFFDA /* TestRobot.m in Sources */ = {isa = PBXBuildFile; fileRef = 62F972EA1F708273003EFFDA /* TestRobot.m */; }; @@ -29,27 +29,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 62F81B3B1EBBE917009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 9CC9673B1AD4B1B600576D13; - remoteInfo = KIFFramework; - }; - 62F81B3D1EBBE917009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FAB89FFC1CAC546900C6DFC1; - remoteInfo = KIFFrameworkConsumer; - }; - 62F81B3F1EBBE917009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FAB8A0141CAC546A00C6DFC1; - remoteInfo = KIFFrameworkConsumerTests; - }; 62F81B4A1EBBE925009B2400 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = EB4C30D0167B9E3A00E31109 /* Project object */; @@ -57,34 +36,6 @@ remoteGlobalIDString = EB4C30D8167B9E3A00E31109; remoteInfo = Calculator; }; - 62F81B4F1EBBE961009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 9CC9673A1AD4B1B600576D13; - remoteInfo = KIFFramework; - }; - A8892FFF1684F0A400FC7C63 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = AAB07268139719AC008AF393; - remoteInfo = KIF; - }; - EB2A8A871781D68600C6299F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EB60ECC1177F8C83005A041A; - remoteInfo = "Test Host"; - }; - EB2A8A891781D68600C6299F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EB60ECEB177F8DB3005A041A; - remoteInfo = "KIF Tests"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -94,7 +45,7 @@ 62F81B5C1EBBEB6B009B2400 /* BasicCalculatorRobot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BasicCalculatorRobot.m; sourceTree = ""; }; 62F972E91F708273003EFFDA /* TestRobot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestRobot.h; sourceTree = ""; }; 62F972EA1F708273003EFFDA /* TestRobot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestRobot.m; sourceTree = ""; }; - A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = KIF.xcodeproj; path = ../../../KIF.xcodeproj; sourceTree = ""; }; + 62FA513E2C9CBDCD00E335D6 /* KIF */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = KIF; path = ../../..; sourceTree = ""; }; EB4C30D9167B9E3A00E31109 /* Calculator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Calculator.app; sourceTree = BUILT_PRODUCTS_DIR; }; EB4C30DD167B9E3A00E31109 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; EB4C30DF167B9E3A00E31109 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -120,7 +71,6 @@ EB4C3158167BA99D00E31109 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = ""; }; EB4C3159167BA99E00E31109 /* HomeViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HomeViewController.xib; sourceTree = ""; }; EB4C315F167BAE6100E31109 /* BasicCalculatorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BasicCalculatorTests.m; sourceTree = ""; }; - EB7204861680E02800278DA2 /* libKIFTestCase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libKIFTestCase.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -128,7 +78,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 62F81B511EBBE965009B2400 /* KIF.framework in Frameworks */, + 6282C6352C9CBE210040DCDB /* KIF in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -145,19 +95,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - A8892FF81684F0A400FC7C63 /* Products */ = { - isa = PBXGroup; - children = ( - A88930001684F0A400FC7C63 /* libKIF.a */, - EB2A8A881781D68600C6299F /* Test Host.app */, - EB2A8A8A1781D68600C6299F /* KIF Tests - XCTest.xctest */, - 62F81B3C1EBBE917009B2400 /* KIF.framework */, - 62F81B3E1EBBE917009B2400 /* KIFFrameworkConsumer.app */, - 62F81B401EBBE917009B2400 /* KIFFrameworkConsumerTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; EB4C30CE167B9E3A00E31109 = { isa = PBXGroup; children = ( @@ -180,8 +117,7 @@ EB4C30DC167B9E3A00E31109 /* Frameworks */ = { isa = PBXGroup; children = ( - A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */, - EB7204861680E02800278DA2 /* libKIFTestCase.a */, + 62FA513E2C9CBDCD00E335D6 /* KIF */, EB4C30DD167B9E3A00E31109 /* UIKit.framework */, EB4C30DF167B9E3A00E31109 /* Foundation.framework */, EB4C30E1167B9E3A00E31109 /* CoreGraphics.framework */, @@ -259,10 +195,12 @@ buildRules = ( ); dependencies = ( - 62F81B501EBBE961009B2400 /* PBXTargetDependency */, 62F81B4B1EBBE925009B2400 /* PBXTargetDependency */, ); name = "Acceptance Tests"; + packageProductDependencies = ( + 6282C6342C9CBE210040DCDB /* KIF */, + ); productName = "Acceptance Tests"; productReference = 62F81B451EBBE925009B2400 /* Acceptance Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -280,6 +218,8 @@ dependencies = ( ); name = Calculator; + packageProductDependencies = ( + ); productName = Calculator; productReference = EB4C30D9167B9E3A00E31109 /* Calculator.app */; productType = "com.apple.product-type.application"; @@ -311,12 +251,6 @@ mainGroup = EB4C30CE167B9E3A00E31109; productRefGroup = EB4C30DA167B9E3A00E31109 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = A8892FF81684F0A400FC7C63 /* Products */; - ProjectRef = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - }, - ); projectRoot = ""; targets = ( EB4C30D8167B9E3A00E31109 /* Calculator */, @@ -325,51 +259,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 62F81B3C1EBBE917009B2400 /* KIF.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = KIF.framework; - remoteRef = 62F81B3B1EBBE917009B2400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 62F81B3E1EBBE917009B2400 /* KIFFrameworkConsumer.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = KIFFrameworkConsumer.app; - remoteRef = 62F81B3D1EBBE917009B2400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 62F81B401EBBE917009B2400 /* KIFFrameworkConsumerTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = KIFFrameworkConsumerTests.xctest; - remoteRef = 62F81B3F1EBBE917009B2400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - A88930001684F0A400FC7C63 /* libKIF.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libKIF.a; - remoteRef = A8892FFF1684F0A400FC7C63 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - EB2A8A881781D68600C6299F /* Test Host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "Test Host.app"; - remoteRef = EB2A8A871781D68600C6299F /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - EB2A8A8A1781D68600C6299F /* KIF Tests - XCTest.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "KIF Tests - XCTest.xctest"; - remoteRef = EB2A8A891781D68600C6299F /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 62F81B431EBBE925009B2400 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -425,11 +314,6 @@ target = EB4C30D8167B9E3A00E31109 /* Calculator */; targetProxy = 62F81B4A1EBBE925009B2400 /* PBXContainerItemProxy */; }; - 62F81B501EBBE961009B2400 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = KIFFramework; - targetProxy = 62F81B4F1EBBE961009B2400 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -486,7 +370,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Acceptance Tests/Acceptance Tests-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = YES; OTHER_CFLAGS = ( "-DDEPRECATE_KIF_SYSTEM=1", @@ -526,7 +414,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Acceptance Tests/Acceptance Tests-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = "com.squareup.Acceptance-Tests"; @@ -683,6 +575,13 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 6282C6342C9CBE210040DCDB /* KIF */ = { + isa = XCSwiftPackageProductDependency; + productName = KIF; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = EB4C30D0167B9E3A00E31109 /* Project object */; } diff --git a/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/project.pbxproj b/Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/project.pbxproj similarity index 67% rename from Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/project.pbxproj rename to Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/project.pbxproj index 7cef8ab3e..30ffdd0c0 100644 --- a/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/project.pbxproj +++ b/Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/project.pbxproj @@ -3,12 +3,13 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ 5600E94A1C3BBCC800235220 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5600E9491C3BBCC700235220 /* IOKit.framework */; }; - 62F81B141EBBD11A009B2400 /* KIF.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5600E9411C3BBB8300235220 /* KIF.framework */; }; + 62582AF22C9CB00E00F800BF /* KIF in Resources */ = {isa = PBXBuildFile; fileRef = 62582AF12C9CAFEA00F800BF /* KIF */; }; + 62FA513C2C9CB1A500E335D6 /* KIF in Frameworks */ = {isa = PBXBuildFile; productRef = 62FA513B2C9CB1A500E335D6 /* KIF */; }; A88CD9831A019AFF0064F706 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A88CD9821A019AFF0064F706 /* AppDelegate.swift */; }; A88CD9851A019AFF0064F706 /* MasterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A88CD9841A019AFF0064F706 /* MasterViewController.swift */; }; A88CD98A1A019AFF0064F706 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A88CD9881A019AFF0064F706 /* Main.storyboard */; }; @@ -20,79 +21,29 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 548FAB951E6814BB00C01467 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FAB89FFC1CAC546900C6DFC1; - remoteInfo = KIFFrameworkConsumer; - }; - 548FAB971E6814BB00C01467 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FAB8A0141CAC546A00C6DFC1; - remoteInfo = KIFFrameworkConsumerTests; - }; - 5600E93A1C3BBB8300235220 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EABD46AA1857A0C700A5F081; - remoteInfo = KIF; - }; - 5600E93C1C3BBB8300235220 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EB60ECC1177F8C83005A041A; - remoteInfo = "Test Host"; - }; - 5600E93E1C3BBB8300235220 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EABD46CD1857A0F300A5F081; - remoteInfo = "KIF Tests"; - }; - 5600E9401C3BBB8300235220 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 9CC9673B1AD4B1B600576D13; - remoteInfo = KIFFramework; - }; - 62F81B0B1EBBD094009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 9CC9673A1AD4B1B600576D13; - remoteInfo = KIFFramework; - }; A88CD9951A019AFF0064F706 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = A88CD9751A019AFF0064F706 /* Project object */; proxyType = 1; remoteGlobalIDString = A88CD97C1A019AFF0064F706; - remoteInfo = "Testable Swift"; + remoteInfo = TestableSwift; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 5600E9301C3BB8F700235220 /* KIF.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KIF.framework; path = "../../../../build/Debug-iphoneos/KIF.framework"; sourceTree = ""; }; - 5600E9321C3BBB8300235220 /* KIF.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = KIF.xcodeproj; path = ../../../KIF.xcodeproj; sourceTree = SOURCE_ROOT; }; 5600E9491C3BBCC700235220 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = DEVELOPER_DIR; }; - A88CD97D1A019AFF0064F706 /* Testable Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Testable Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 62582AF12C9CAFEA00F800BF /* KIF */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = KIF; path = ../../../..; sourceTree = ""; }; + A88CD97D1A019AFF0064F706 /* TestableSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestableSwift.app; sourceTree = BUILT_PRODUCTS_DIR; }; A88CD9811A019AFF0064F706 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A88CD9821A019AFF0064F706 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; A88CD9841A019AFF0064F706 /* MasterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterViewController.swift; sourceTree = ""; }; A88CD9891A019AFF0064F706 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; A88CD98B1A019AFF0064F706 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; A88CD98E1A019AFF0064F706 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - A88CD9941A019AFF0064F706 /* Testable SwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Testable SwiftTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + A88CD9941A019AFF0064F706 /* TestableSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestableSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A88CD9991A019AFF0064F706 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A88CD99A1A019AFF0064F706 /* Testable_SwiftTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Testable_SwiftTests.swift; sourceTree = ""; }; - A88CD9BA1A019F0B0064F706 /* Testable SwiftTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Testable SwiftTests-Bridging-Header.h"; sourceTree = ""; }; + A88CD9BA1A019F0B0064F706 /* TestableSwiftTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TestableSwiftTests-Bridging-Header.h"; sourceTree = ""; }; A88CD9BB1A019F0B0064F706 /* SimpleObjCTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleObjCTest.m; sourceTree = ""; }; A88CD9BD1A019F300064F706 /* SimpleSwiftTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimpleSwiftTest.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -109,46 +60,41 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 62F81B141EBBD11A009B2400 /* KIF.framework in Frameworks */, 5600E94A1C3BBCC800235220 /* IOKit.framework in Frameworks */, + 62FA513C2C9CB1A500E335D6 /* KIF in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 5600E9331C3BBB8300235220 /* Products */ = { + 62FA513A2C9CB1A500E335D6 /* Frameworks */ = { isa = PBXGroup; children = ( - 5600E93B1C3BBB8300235220 /* libKIF.a */, - 5600E93D1C3BBB8300235220 /* Test Host.app */, - 5600E93F1C3BBB8300235220 /* KIF Tests - XCTest.xctest */, - 5600E9411C3BBB8300235220 /* KIF.framework */, - 548FAB961E6814BB00C01467 /* KIFFrameworkConsumer.app */, - 548FAB981E6814BB00C01467 /* KIFFrameworkConsumerTests.xctest */, ); - name = Products; + name = Frameworks; sourceTree = ""; }; A88CD9741A019AFF0064F706 = { isa = PBXGroup; children = ( - A88CD97F1A019AFF0064F706 /* Testable Swift */, - A88CD9971A019AFF0064F706 /* Testable SwiftTests */, + A88CD97F1A019AFF0064F706 /* TestableSwift */, + A88CD9971A019AFF0064F706 /* TestableSwiftTests */, A88CD97E1A019AFF0064F706 /* Products */, + 62FA513A2C9CB1A500E335D6 /* Frameworks */, ); sourceTree = ""; }; A88CD97E1A019AFF0064F706 /* Products */ = { isa = PBXGroup; children = ( - A88CD97D1A019AFF0064F706 /* Testable Swift.app */, - A88CD9941A019AFF0064F706 /* Testable SwiftTests.xctest */, + A88CD97D1A019AFF0064F706 /* TestableSwift.app */, + A88CD9941A019AFF0064F706 /* TestableSwiftTests.xctest */, ); name = Products; sourceTree = ""; }; - A88CD97F1A019AFF0064F706 /* Testable Swift */ = { + A88CD97F1A019AFF0064F706 /* TestableSwift */ = { isa = PBXGroup; children = ( A88CD9821A019AFF0064F706 /* AppDelegate.swift */, @@ -158,7 +104,7 @@ A88CD98D1A019AFF0064F706 /* LaunchScreen.xib */, A88CD9801A019AFF0064F706 /* Supporting Files */, ); - path = "Testable Swift"; + path = TestableSwift; sourceTree = ""; }; A88CD9801A019AFF0064F706 /* Supporting Files */ = { @@ -169,19 +115,18 @@ name = "Supporting Files"; sourceTree = ""; }; - A88CD9971A019AFF0064F706 /* Testable SwiftTests */ = { + A88CD9971A019AFF0064F706 /* TestableSwiftTests */ = { isa = PBXGroup; children = ( - 5600E9321C3BBB8300235220 /* KIF.xcodeproj */, + 62582AF12C9CAFEA00F800BF /* KIF */, 5600E9491C3BBCC700235220 /* IOKit.framework */, A88CD99A1A019AFF0064F706 /* Testable_SwiftTests.swift */, A88CD9981A019AFF0064F706 /* Supporting Files */, A88CD9BB1A019F0B0064F706 /* SimpleObjCTest.m */, A88CD9BD1A019F300064F706 /* SimpleSwiftTest.swift */, - A88CD9BA1A019F0B0064F706 /* Testable SwiftTests-Bridging-Header.h */, - 5600E9301C3BB8F700235220 /* KIF.framework */, + A88CD9BA1A019F0B0064F706 /* TestableSwiftTests-Bridging-Header.h */, ); - path = "Testable SwiftTests"; + path = TestableSwiftTests; sourceTree = ""; }; A88CD9981A019AFF0064F706 /* Supporting Files */ = { @@ -195,9 +140,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - A88CD97C1A019AFF0064F706 /* Testable Swift */ = { + A88CD97C1A019AFF0064F706 /* TestableSwift */ = { isa = PBXNativeTarget; - buildConfigurationList = A88CD99E1A019AFF0064F706 /* Build configuration list for PBXNativeTarget "Testable Swift" */; + buildConfigurationList = A88CD99E1A019AFF0064F706 /* Build configuration list for PBXNativeTarget "TestableSwift" */; buildPhases = ( A88CD9791A019AFF0064F706 /* Sources */, A88CD97A1A019AFF0064F706 /* Frameworks */, @@ -207,14 +152,14 @@ ); dependencies = ( ); - name = "Testable Swift"; - productName = "Testable Swift"; - productReference = A88CD97D1A019AFF0064F706 /* Testable Swift.app */; + name = TestableSwift; + productName = TestableSwift; + productReference = A88CD97D1A019AFF0064F706 /* TestableSwift.app */; productType = "com.apple.product-type.application"; }; - A88CD9931A019AFF0064F706 /* Testable SwiftTests */ = { + A88CD9931A019AFF0064F706 /* TestableSwiftTests */ = { isa = PBXNativeTarget; - buildConfigurationList = A88CD9A11A019AFF0064F706 /* Build configuration list for PBXNativeTarget "Testable SwiftTests" */; + buildConfigurationList = A88CD9A11A019AFF0064F706 /* Build configuration list for PBXNativeTarget "TestableSwiftTests" */; buildPhases = ( A88CD9901A019AFF0064F706 /* Sources */, A88CD9911A019AFF0064F706 /* Frameworks */, @@ -223,12 +168,14 @@ buildRules = ( ); dependencies = ( - 62F81B0C1EBBD094009B2400 /* PBXTargetDependency */, A88CD9961A019AFF0064F706 /* PBXTargetDependency */, ); - name = "Testable SwiftTests"; - productName = "Testable SwiftTests"; - productReference = A88CD9941A019AFF0064F706 /* Testable SwiftTests.xctest */; + name = TestableSwiftTests; + packageProductDependencies = ( + 62FA513B2C9CB1A500E335D6 /* KIF */, + ); + productName = TestableSwiftTests; + productReference = A88CD9941A019AFF0064F706 /* TestableSwiftTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -251,7 +198,7 @@ }; }; }; - buildConfigurationList = A88CD9781A019AFF0064F706 /* Build configuration list for PBXProject "Testable Swift" */; + buildConfigurationList = A88CD9781A019AFF0064F706 /* Build configuration list for PBXProject "TestableSwift" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = en; hasScannedForEncodings = 0; @@ -262,65 +209,14 @@ mainGroup = A88CD9741A019AFF0064F706; productRefGroup = A88CD97E1A019AFF0064F706 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 5600E9331C3BBB8300235220 /* Products */; - ProjectRef = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - }, - ); projectRoot = ""; targets = ( - A88CD97C1A019AFF0064F706 /* Testable Swift */, - A88CD9931A019AFF0064F706 /* Testable SwiftTests */, + A88CD97C1A019AFF0064F706 /* TestableSwift */, + A88CD9931A019AFF0064F706 /* TestableSwiftTests */, ); }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 548FAB961E6814BB00C01467 /* KIFFrameworkConsumer.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = KIFFrameworkConsumer.app; - remoteRef = 548FAB951E6814BB00C01467 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 548FAB981E6814BB00C01467 /* KIFFrameworkConsumerTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = KIFFrameworkConsumerTests.xctest; - remoteRef = 548FAB971E6814BB00C01467 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5600E93B1C3BBB8300235220 /* libKIF.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libKIF.a; - remoteRef = 5600E93A1C3BBB8300235220 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5600E93D1C3BBB8300235220 /* Test Host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "Test Host.app"; - remoteRef = 5600E93C1C3BBB8300235220 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5600E93F1C3BBB8300235220 /* KIF Tests - XCTest.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "KIF Tests - XCTest.xctest"; - remoteRef = 5600E93E1C3BBB8300235220 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5600E9411C3BBB8300235220 /* KIF.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = KIF.framework; - remoteRef = 5600E9401C3BBB8300235220 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ A88CD97B1A019AFF0064F706 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -336,6 +232,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 62582AF22C9CB00E00F800BF /* KIF in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -364,14 +261,9 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 62F81B0C1EBBD094009B2400 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = KIFFramework; - targetProxy = 62F81B0B1EBBD094009B2400 /* PBXContainerItemProxy */; - }; A88CD9961A019AFF0064F706 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A88CD97C1A019AFF0064F706 /* Testable Swift */; + target = A88CD97C1A019AFF0064F706 /* TestableSwift */; targetProxy = A88CD9951A019AFF0064F706 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -492,7 +384,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -501,8 +394,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "Testable Swift/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + INFOPLIST_FILE = TestableSwift/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.squareup.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -515,8 +411,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "Testable Swift/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + INFOPLIST_FILE = TestableSwift/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.squareup.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -534,8 +433,12 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = "Testable SwiftTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + INFOPLIST_FILE = TestableSwiftTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_CFLAGS = ( "-DDEPRECATE_KIF_SYSTEM=1", "-DDEPRECATE_KIF_TESTER=1", @@ -548,11 +451,11 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.squareup.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Testable SwiftTests/Testable SwiftTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "TestableSwiftTests/TestableSwiftTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Testable Swift.app/Testable Swift"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestableSwift.app/TestableSwift"; }; name = Debug; }; @@ -561,8 +464,12 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ENABLE_MODULES = YES; - INFOPLIST_FILE = "Testable SwiftTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + INFOPLIST_FILE = TestableSwiftTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = ( "$(inherited)", "-framework", @@ -571,17 +478,17 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.squareup.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Testable SwiftTests/Testable SwiftTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "TestableSwiftTests/TestableSwiftTests-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Testable Swift.app/Testable Swift"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestableSwift.app/TestableSwift"; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - A88CD9781A019AFF0064F706 /* Build configuration list for PBXProject "Testable Swift" */ = { + A88CD9781A019AFF0064F706 /* Build configuration list for PBXProject "TestableSwift" */ = { isa = XCConfigurationList; buildConfigurations = ( A88CD99C1A019AFF0064F706 /* Debug */, @@ -590,7 +497,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A88CD99E1A019AFF0064F706 /* Build configuration list for PBXNativeTarget "Testable Swift" */ = { + A88CD99E1A019AFF0064F706 /* Build configuration list for PBXNativeTarget "TestableSwift" */ = { isa = XCConfigurationList; buildConfigurations = ( A88CD99F1A019AFF0064F706 /* Debug */, @@ -599,7 +506,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A88CD9A11A019AFF0064F706 /* Build configuration list for PBXNativeTarget "Testable SwiftTests" */ = { + A88CD9A11A019AFF0064F706 /* Build configuration list for PBXNativeTarget "TestableSwiftTests" */ = { isa = XCConfigurationList; buildConfigurations = ( A88CD9A21A019AFF0064F706 /* Debug */, @@ -609,6 +516,13 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 62FA513B2C9CB1A500E335D6 /* KIF */ = { + isa = XCSwiftPackageProductDependency; + productName = KIF; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = A88CD9751A019AFF0064F706 /* Project object */; } diff --git a/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/xcshareddata/xcschemes/Testable Swift.xcscheme b/Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/xcshareddata/xcschemes/TestableSwift.xcscheme similarity index 66% rename from Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/xcshareddata/xcschemes/Testable Swift.xcscheme rename to Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/xcshareddata/xcschemes/TestableSwift.xcscheme index 0768715c2..6667dde16 100644 --- a/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/xcshareddata/xcschemes/Testable Swift.xcscheme +++ b/Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/xcshareddata/xcschemes/TestableSwift.xcscheme @@ -15,9 +15,23 @@ + BuildableName = "TestableSwift.app" + BlueprintName = "TestableSwift" + ReferencedContainer = "container:TestableSwift.xcodeproj"> + + + + @@ -27,29 +41,27 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + + BuildableName = "TestableSwiftTests.xctest" + BlueprintName = "TestableSwiftTests" + ReferencedContainer = "container:TestableSwift.xcodeproj"> - - - - - - - - - - - - - + + BuildableName = "TestableSwift.app" + BlueprintName = "TestableSwift" + ReferencedContainer = "container:TestableSwift.xcodeproj"> - + diff --git a/Documentation/Examples/Testable Swift/Testable Swift/AppDelegate.swift b/Documentation/Examples/TestableSwift/TestableSwift/AppDelegate.swift similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/AppDelegate.swift rename to Documentation/Examples/TestableSwift/TestableSwift/AppDelegate.swift diff --git a/Documentation/Examples/Testable Swift/Testable Swift/Base.lproj/LaunchScreen.xib b/Documentation/Examples/TestableSwift/TestableSwift/Base.lproj/LaunchScreen.xib similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/Base.lproj/LaunchScreen.xib rename to Documentation/Examples/TestableSwift/TestableSwift/Base.lproj/LaunchScreen.xib diff --git a/Documentation/Examples/Testable Swift/Testable Swift/Base.lproj/Main.storyboard b/Documentation/Examples/TestableSwift/TestableSwift/Base.lproj/Main.storyboard similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/Base.lproj/Main.storyboard rename to Documentation/Examples/TestableSwift/TestableSwift/Base.lproj/Main.storyboard diff --git a/Documentation/Examples/Testable Swift/Testable Swift/Images.xcassets/AppIcon.appiconset/Contents.json b/Documentation/Examples/TestableSwift/TestableSwift/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/Images.xcassets/AppIcon.appiconset/Contents.json rename to Documentation/Examples/TestableSwift/TestableSwift/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/Documentation/Examples/Testable Swift/Testable Swift/Images.xcassets/Contents.json b/Documentation/Examples/TestableSwift/TestableSwift/Images.xcassets/Contents.json similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/Images.xcassets/Contents.json rename to Documentation/Examples/TestableSwift/TestableSwift/Images.xcassets/Contents.json diff --git a/Documentation/Examples/Testable Swift/Testable Swift/Info.plist b/Documentation/Examples/TestableSwift/TestableSwift/Info.plist similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/Info.plist rename to Documentation/Examples/TestableSwift/TestableSwift/Info.plist diff --git a/Documentation/Examples/Testable Swift/Testable Swift/MasterViewController.swift b/Documentation/Examples/TestableSwift/TestableSwift/MasterViewController.swift similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/MasterViewController.swift rename to Documentation/Examples/TestableSwift/TestableSwift/MasterViewController.swift diff --git a/Documentation/Examples/Testable Swift/Testable SwiftTests/Info.plist b/Documentation/Examples/TestableSwift/TestableSwiftTests/Info.plist similarity index 100% rename from Documentation/Examples/Testable Swift/Testable SwiftTests/Info.plist rename to Documentation/Examples/TestableSwift/TestableSwiftTests/Info.plist diff --git a/Documentation/Examples/Testable Swift/Testable SwiftTests/SimpleObjCTest.m b/Documentation/Examples/TestableSwift/TestableSwiftTests/SimpleObjCTest.m similarity index 96% rename from Documentation/Examples/Testable Swift/Testable SwiftTests/SimpleObjCTest.m rename to Documentation/Examples/TestableSwift/TestableSwiftTests/SimpleObjCTest.m index ecb6334f1..ea39c9e24 100644 --- a/Documentation/Examples/Testable Swift/Testable SwiftTests/SimpleObjCTest.m +++ b/Documentation/Examples/TestableSwift/TestableSwiftTests/SimpleObjCTest.m @@ -8,7 +8,7 @@ // which Square, Inc. licenses this file to you. #import -#import +@import KIF; @interface SimpleObjCTest : KIFTestCase diff --git a/Documentation/Examples/Testable Swift/Testable SwiftTests/SimpleSwiftTest.swift b/Documentation/Examples/TestableSwift/TestableSwiftTests/SimpleSwiftTest.swift similarity index 100% rename from Documentation/Examples/Testable Swift/Testable SwiftTests/SimpleSwiftTest.swift rename to Documentation/Examples/TestableSwift/TestableSwiftTests/SimpleSwiftTest.swift diff --git a/Documentation/Examples/Testable Swift/Testable SwiftTests/Testable SwiftTests-Bridging-Header.h b/Documentation/Examples/TestableSwift/TestableSwiftTests/TestableSwiftTests-Bridging-Header.h similarity index 83% rename from Documentation/Examples/Testable Swift/Testable SwiftTests/Testable SwiftTests-Bridging-Header.h rename to Documentation/Examples/TestableSwift/TestableSwiftTests/TestableSwiftTests-Bridging-Header.h index 12c223598..196f6921a 100644 --- a/Documentation/Examples/Testable Swift/Testable SwiftTests/Testable SwiftTests-Bridging-Header.h +++ b/Documentation/Examples/TestableSwift/TestableSwiftTests/TestableSwiftTests-Bridging-Header.h @@ -2,4 +2,4 @@ // Use this file to import your target's public headers that you would like to expose to Swift. // -#import +#import "KIF.h" diff --git a/Documentation/Examples/Testable Swift/Testable SwiftTests/Testable_SwiftTests.swift b/Documentation/Examples/TestableSwift/TestableSwiftTests/Testable_SwiftTests.swift similarity index 100% rename from Documentation/Examples/Testable Swift/Testable SwiftTests/Testable_SwiftTests.swift rename to Documentation/Examples/TestableSwift/TestableSwiftTests/Testable_SwiftTests.swift diff --git a/scripts/ci.sh b/scripts/ci.sh index c7e2a8892..b85b535fb 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -30,8 +30,8 @@ env NSUnbufferedIO=YES xcodebuild test -project "SPMIntegration/SPMIntegration.x # Test the "Testable" example project env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/Testable/Testable.xcodeproj" -scheme Testable -derivedDataPath=${PWD}/build/Testable -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c -# Test the "Testable Swift" example project -env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/Testable Swift/Testable Swift.xcodeproj" -scheme "Testable Swift" -derivedDataPath=${PWD}/build/TestableSwift -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c +# Test the "TestableSwift" example project +env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/TestableSwift/TestableSwift.xcodeproj" -scheme "TestableSwift" -derivedDataPath=${PWD}/build/TestableSwift -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c # Test the "Calculator" example project env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/Calculator/Calculator.xcodeproj" -scheme "Calculator" -derivedDataPath=${PWD}/build/Calculator -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c