Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
DEVICE: iPhone 16
TEST: true
DIR: performance
SCHEME: PerformanceExampleSwift
SCHEME: PerformanceExample
steps:
- name: Checkout
uses: actions/checkout@master
Expand Down
40 changes: 19 additions & 21 deletions performance/PerformanceExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
107347C420315A61004A66D1 /* PerformanceExampleSwiftUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PerformanceExampleSwiftUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
107347C420315A61004A66D1 /* PerformanceExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PerformanceExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
107347C620315A61004A66D1 /* PerformanceExampleSwiftUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PerformanceExampleSwiftUITests.swift; sourceTree = "<group>"; };
107347C820315A61004A66D1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5F5A53791ADE67D500F81DF0 /* PerformanceExampleSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PerformanceExampleSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
5F5A53791ADE67D500F81DF0 /* PerformanceExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PerformanceExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
5F5A537D1ADE67D500F81DF0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5F5A537F1ADE67D500F81DF0 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
5F9961061AE0CF4F0034F503 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
Expand Down Expand Up @@ -85,8 +85,8 @@
5F5A534D1ADE670C00F81DF0 /* Products */ = {
isa = PBXGroup;
children = (
5F5A53791ADE67D500F81DF0 /* PerformanceExampleSwift.app */,
107347C420315A61004A66D1 /* PerformanceExampleSwiftUITests.xctest */,
5F5A53791ADE67D500F81DF0 /* PerformanceExample.app */,
107347C420315A61004A66D1 /* PerformanceExampleUITests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -120,9 +120,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
107347C320315A61004A66D1 /* PerformanceExampleSwiftUITests */ = {
107347C320315A61004A66D1 /* PerformanceExampleUITests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 107347CB20315A61004A66D1 /* Build configuration list for PBXNativeTarget "PerformanceExampleSwiftUITests" */;
buildConfigurationList = 107347CB20315A61004A66D1 /* Build configuration list for PBXNativeTarget "PerformanceExampleUITests" */;
buildPhases = (
107347C020315A61004A66D1 /* Sources */,
107347C120315A61004A66D1 /* Frameworks */,
Expand All @@ -133,14 +133,14 @@
dependencies = (
107347CA20315A61004A66D1 /* PBXTargetDependency */,
);
name = PerformanceExampleSwiftUITests;
name = PerformanceExampleUITests;
productName = PerformanceExampleSwiftUITests;
Comment on lines +136 to 137

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

While the target name was updated to remove the Swift suffix, the productName on the next line was not. For consistency and to avoid confusion, productName should also be updated.

            name = PerformanceExampleUITests;
            productName = PerformanceExampleUITests;

productReference = 107347C420315A61004A66D1 /* PerformanceExampleSwiftUITests.xctest */;
productReference = 107347C420315A61004A66D1 /* PerformanceExampleUITests.xctest */;
Comment on lines +136 to +138

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The productName still includes the Swift suffix. To be consistent with the goal of this PR, it should be removed.

            name = PerformanceExampleUITests;
            productName = PerformanceExampleUITests;
            productReference = 107347C420315A61004A66D1 /* PerformanceExampleUITests.xctest */;

productType = "com.apple.product-type.bundle.ui-testing";
};
5F5A53781ADE67D500F81DF0 /* PerformanceExampleSwift */ = {
5F5A53781ADE67D500F81DF0 /* PerformanceExample */ = {
isa = PBXNativeTarget;
buildConfigurationList = 5F5A53991ADE67D500F81DF0 /* Build configuration list for PBXNativeTarget "PerformanceExampleSwift" */;
buildConfigurationList = 5F5A53991ADE67D500F81DF0 /* Build configuration list for PBXNativeTarget "PerformanceExample" */;
buildPhases = (
5F5A53751ADE67D500F81DF0 /* Sources */,
5F5A53761ADE67D500F81DF0 /* Frameworks */,
Expand All @@ -150,9 +150,9 @@
);
dependencies = (
);
name = PerformanceExampleSwift;
name = PerformanceExample;
productName = PerformanceExampleSwift;
Comment on lines +153 to 154

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Similar to the previous comment, the target name was updated to remove the Swift suffix, but the productName on the next line was not. This should also be updated for consistency.

            name = PerformanceExample;
            productName = PerformanceExample;

productReference = 5F5A53791ADE67D500F81DF0 /* PerformanceExampleSwift.app */;
productReference = 5F5A53791ADE67D500F81DF0 /* PerformanceExample.app */;
Comment on lines +153 to +155

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The productName still includes the Swift suffix. It should be removed to align with the other renames in this file.

            name = PerformanceExample;
            productName = PerformanceExample;
            productReference = 5F5A53791ADE67D500F81DF0 /* PerformanceExample.app */;

productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand Down Expand Up @@ -195,8 +195,8 @@
projectDirPath = "";
projectRoot = "";
targets = (
5F5A53781ADE67D500F81DF0 /* PerformanceExampleSwift */,
107347C320315A61004A66D1 /* PerformanceExampleSwiftUITests */,
5F5A53781ADE67D500F81DF0 /* PerformanceExample */,
107347C320315A61004A66D1 /* PerformanceExampleUITests */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -245,7 +245,7 @@
/* Begin PBXTargetDependency section */
107347CA20315A61004A66D1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 5F5A53781ADE67D500F81DF0 /* PerformanceExampleSwift */;
target = 5F5A53781ADE67D500F81DF0 /* PerformanceExample */;
targetProxy = 107347C920315A61004A66D1 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
Expand Down Expand Up @@ -276,7 +276,7 @@
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = PerformanceExampleSwift;
TEST_TARGET_NAME = PerformanceExample;
};
name = Debug;
};
Expand Down Expand Up @@ -305,7 +305,7 @@
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = PerformanceExampleSwift;
TEST_TARGET_NAME = PerformanceExample;
};
name = Release;
};
Expand Down Expand Up @@ -425,7 +425,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "$(SRCROOT)/PerformanceExample/Info.plist";
Expand All @@ -446,7 +445,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "$(SRCROOT)/PerformanceExample/Info.plist";
Expand All @@ -468,7 +466,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
107347CB20315A61004A66D1 /* Build configuration list for PBXNativeTarget "PerformanceExampleSwiftUITests" */ = {
107347CB20315A61004A66D1 /* Build configuration list for PBXNativeTarget "PerformanceExampleUITests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
107347CC20315A61004A66D1 /* Debug */,
Expand All @@ -486,7 +484,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
5F5A53991ADE67D500F81DF0 /* Build configuration list for PBXNativeTarget "PerformanceExampleSwift" */ = {
5F5A53991ADE67D500F81DF0 /* Build configuration list for PBXNativeTarget "PerformanceExample" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5F5A53951ADE67D500F81DF0 /* Debug */,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1630"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5F5A53781ADE67D500F81DF0"
BuildableName = "PerformanceExample.app"
BlueprintName = "PerformanceExample"
ReferencedContainer = "container:PerformanceExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "107347C320315A61004A66D1"
BuildableName = "PerformanceExampleUITests.xctest"
BlueprintName = "PerformanceExampleUITests"
ReferencedContainer = "container:PerformanceExample.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5F5A53781ADE67D500F81DF0"
BuildableName = "PerformanceExample.app"
BlueprintName = "PerformanceExample"
ReferencedContainer = "container:PerformanceExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5F5A53781ADE67D500F81DF0"
BuildableName = "PerformanceExample.app"
BlueprintName = "PerformanceExample"
ReferencedContainer = "container:PerformanceExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1630"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "107347C320315A61004A66D1"
BuildableName = "PerformanceExampleUITests.xctest"
BlueprintName = "PerformanceExampleUITests"
ReferencedContainer = "container:PerformanceExample.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
8 changes: 5 additions & 3 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,13 @@ else
fi

function xcb() {
echo xcodebuild "$@"
xcodebuild "$@" | xcpretty
echo xcodebuild -quiet "$@"
xcodebuild -quiet "$@" | xcpretty
}

# Run xcodebuild
sudo xcode-select -s "/Applications/Xcode_${xcode_version}.app/Contents/Developer"
if [[ "${GITHUB_ACTIONS:-}" == "true" ]]; then
sudo xcode-select -s "/Applications/Xcode_${xcode_version}.app/Contents/Developer"
fi
xcb "${flags[@]}"
echo "$message"