Skip to content

Commit 89ee24b

Browse files
ncooke3ncooke3
authored
Merge pull request #1799 from firebase/nc/scheme-rename-2
chore: Remove Swift suffix from performance
2 parents 0bdfb25 + f8e5022 commit 89ee24b

File tree

5 files changed

+169
-25
lines changed

5 files changed

+169
-25
lines changed

‎.github/workflows/performance.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
DEVICE: iPhone 16
4444
TEST: true
4545
DIR: performance
46-
SCHEME: PerformanceExampleSwift
46+
SCHEME: PerformanceExample
4747
steps:
4848
- name: Checkout
4949
uses: actions/checkout@master

‎performance/PerformanceExample.xcodeproj/project.pbxproj‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
/* End PBXContainerItemProxy section */
3030

3131
/* Begin PBXFileReference section */
32-
107347C420315A61004A66D1 /* PerformanceExampleSwiftUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PerformanceExampleSwiftUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
32+
107347C420315A61004A66D1 /* PerformanceExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PerformanceExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
3333
107347C620315A61004A66D1 /* PerformanceExampleSwiftUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PerformanceExampleSwiftUITests.swift; sourceTree = "<group>"; };
3434
107347C820315A61004A66D1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
35-
5F5A53791ADE67D500F81DF0 /* PerformanceExampleSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PerformanceExampleSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
35+
5F5A53791ADE67D500F81DF0 /* PerformanceExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PerformanceExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
3636
5F5A537D1ADE67D500F81DF0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3737
5F5A537F1ADE67D500F81DF0 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
3838
5F9961061AE0CF4F0034F503 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
@@ -85,8 +85,8 @@
8585
5F5A534D1ADE670C00F81DF0 /* Products */ = {
8686
isa = PBXGroup;
8787
children = (
88-
5F5A53791ADE67D500F81DF0 /* PerformanceExampleSwift.app */,
89-
107347C420315A61004A66D1 /* PerformanceExampleSwiftUITests.xctest */,
88+
5F5A53791ADE67D500F81DF0 /* PerformanceExample.app */,
89+
107347C420315A61004A66D1 /* PerformanceExampleUITests.xctest */,
9090
);
9191
name = Products;
9292
sourceTree = "<group>";
@@ -120,9 +120,9 @@
120120
/* End PBXGroup section */
121121

122122
/* Begin PBXNativeTarget section */
123-
107347C320315A61004A66D1 /* PerformanceExampleSwiftUITests */ = {
123+
107347C320315A61004A66D1 /* PerformanceExampleUITests */ = {
124124
isa = PBXNativeTarget;
125-
buildConfigurationList = 107347CB20315A61004A66D1 /* Build configuration list for PBXNativeTarget "PerformanceExampleSwiftUITests" */;
125+
buildConfigurationList = 107347CB20315A61004A66D1 /* Build configuration list for PBXNativeTarget "PerformanceExampleUITests" */;
126126
buildPhases = (
127127
107347C020315A61004A66D1 /* Sources */,
128128
107347C120315A61004A66D1 /* Frameworks */,
@@ -133,14 +133,14 @@
133133
dependencies = (
134134
107347CA20315A61004A66D1 /* PBXTargetDependency */,
135135
);
136-
name = PerformanceExampleSwiftUITests;
136+
name = PerformanceExampleUITests;
137137
productName = PerformanceExampleSwiftUITests;
138-
productReference = 107347C420315A61004A66D1 /* PerformanceExampleSwiftUITests.xctest */;
138+
productReference = 107347C420315A61004A66D1 /* PerformanceExampleUITests.xctest */;
139139
productType = "com.apple.product-type.bundle.ui-testing";
140140
};
141-
5F5A53781ADE67D500F81DF0 /* PerformanceExampleSwift */ = {
141+
5F5A53781ADE67D500F81DF0 /* PerformanceExample */ = {
142142
isa = PBXNativeTarget;
143-
buildConfigurationList = 5F5A53991ADE67D500F81DF0 /* Build configuration list for PBXNativeTarget "PerformanceExampleSwift" */;
143+
buildConfigurationList = 5F5A53991ADE67D500F81DF0 /* Build configuration list for PBXNativeTarget "PerformanceExample" */;
144144
buildPhases = (
145145
5F5A53751ADE67D500F81DF0 /* Sources */,
146146
5F5A53761ADE67D500F81DF0 /* Frameworks */,
@@ -150,9 +150,9 @@
150150
);
151151
dependencies = (
152152
);
153-
name = PerformanceExampleSwift;
153+
name = PerformanceExample;
154154
productName = PerformanceExampleSwift;
155-
productReference = 5F5A53791ADE67D500F81DF0 /* PerformanceExampleSwift.app */;
155+
productReference = 5F5A53791ADE67D500F81DF0 /* PerformanceExample.app */;
156156
productType = "com.apple.product-type.application";
157157
};
158158
/* End PBXNativeTarget section */
@@ -195,8 +195,8 @@
195195
projectDirPath = "";
196196
projectRoot = "";
197197
targets = (
198-
5F5A53781ADE67D500F81DF0 /* PerformanceExampleSwift */,
199-
107347C320315A61004A66D1 /* PerformanceExampleSwiftUITests */,
198+
5F5A53781ADE67D500F81DF0 /* PerformanceExample */,
199+
107347C320315A61004A66D1 /* PerformanceExampleUITests */,
200200
);
201201
};
202202
/* End PBXProject section */
@@ -245,7 +245,7 @@
245245
/* Begin PBXTargetDependency section */
246246
107347CA20315A61004A66D1 /* PBXTargetDependency */ = {
247247
isa = PBXTargetDependency;
248-
target = 5F5A53781ADE67D500F81DF0 /* PerformanceExampleSwift */;
248+
target = 5F5A53781ADE67D500F81DF0 /* PerformanceExample */;
249249
targetProxy = 107347C920315A61004A66D1 /* PBXContainerItemProxy */;
250250
};
251251
/* End PBXTargetDependency section */
@@ -276,7 +276,7 @@
276276
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
277277
SWIFT_VERSION = 5.0;
278278
TARGETED_DEVICE_FAMILY = "1,2";
279-
TEST_TARGET_NAME = PerformanceExampleSwift;
279+
TEST_TARGET_NAME = PerformanceExample;
280280
};
281281
name = Debug;
282282
};
@@ -305,7 +305,7 @@
305305
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
306306
SWIFT_VERSION = 5.0;
307307
TARGETED_DEVICE_FAMILY = "1,2";
308-
TEST_TARGET_NAME = PerformanceExampleSwift;
308+
TEST_TARGET_NAME = PerformanceExample;
309309
};
310310
name = Release;
311311
};
@@ -425,7 +425,6 @@
425425
isa = XCBuildConfiguration;
426426
buildSettings = {
427427
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
428-
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
429428
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
430429
DEVELOPMENT_TEAM = "";
431430
INFOPLIST_FILE = "$(SRCROOT)/PerformanceExample/Info.plist";
@@ -446,7 +445,6 @@
446445
isa = XCBuildConfiguration;
447446
buildSettings = {
448447
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
449-
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
450448
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
451449
DEVELOPMENT_TEAM = "";
452450
INFOPLIST_FILE = "$(SRCROOT)/PerformanceExample/Info.plist";
@@ -468,7 +466,7 @@
468466
/* End XCBuildConfiguration section */
469467

470468
/* Begin XCConfigurationList section */
471-
107347CB20315A61004A66D1 /* Build configuration list for PBXNativeTarget "PerformanceExampleSwiftUITests" */ = {
469+
107347CB20315A61004A66D1 /* Build configuration list for PBXNativeTarget "PerformanceExampleUITests" */ = {
472470
isa = XCConfigurationList;
473471
buildConfigurations = (
474472
107347CC20315A61004A66D1 /* Debug */,
@@ -486,7 +484,7 @@
486484
defaultConfigurationIsVisible = 0;
487485
defaultConfigurationName = Release;
488486
};
489-
5F5A53991ADE67D500F81DF0 /* Build configuration list for PBXNativeTarget "PerformanceExampleSwift" */ = {
487+
5F5A53991ADE67D500F81DF0 /* Build configuration list for PBXNativeTarget "PerformanceExample" */ = {
490488
isa = XCConfigurationList;
491489
buildConfigurations = (
492490
5F5A53951ADE67D500F81DF0 /* Debug */,

‎performance/PerformanceExample.xcodeproj/xcshareddata/xcschemes/PerformanceExample.xcscheme‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1630"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
buildArchitectures = "Automatic">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "5F5A53781ADE67D500F81DF0"
19+
BuildableName = "PerformanceExample.app"
20+
BlueprintName = "PerformanceExample"
21+
ReferencedContainer = "container:PerformanceExample.xcodeproj">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
</BuildActionEntries>
25+
</BuildAction>
26+
<TestAction
27+
buildConfiguration = "Debug"
28+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
29+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
shouldAutocreateTestPlan = "YES">
32+
<Testables>
33+
<TestableReference
34+
skipped = "NO">
35+
<BuildableReference
36+
BuildableIdentifier = "primary"
37+
BlueprintIdentifier = "107347C320315A61004A66D1"
38+
BuildableName = "PerformanceExampleUITests.xctest"
39+
BlueprintName = "PerformanceExampleUITests"
40+
ReferencedContainer = "container:PerformanceExample.xcodeproj">
41+
</BuildableReference>
42+
</TestableReference>
43+
</Testables>
44+
</TestAction>
45+
<LaunchAction
46+
buildConfiguration = "Debug"
47+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
48+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
launchStyle = "0"
50+
useCustomWorkingDirectory = "NO"
51+
ignoresPersistentStateOnLaunch = "NO"
52+
debugDocumentVersioning = "YES"
53+
debugServiceExtension = "internal"
54+
allowLocationSimulation = "YES">
55+
<BuildableProductRunnable
56+
runnableDebuggingMode = "0">
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "5F5A53781ADE67D500F81DF0"
60+
BuildableName = "PerformanceExample.app"
61+
BlueprintName = "PerformanceExample"
62+
ReferencedContainer = "container:PerformanceExample.xcodeproj">
63+
</BuildableReference>
64+
</BuildableProductRunnable>
65+
</LaunchAction>
66+
<ProfileAction
67+
buildConfiguration = "Release"
68+
shouldUseLaunchSchemeArgsEnv = "YES"
69+
savedToolIdentifier = ""
70+
useCustomWorkingDirectory = "NO"
71+
debugDocumentVersioning = "YES">
72+
<BuildableProductRunnable
73+
runnableDebuggingMode = "0">
74+
<BuildableReference
75+
BuildableIdentifier = "primary"
76+
BlueprintIdentifier = "5F5A53781ADE67D500F81DF0"
77+
BuildableName = "PerformanceExample.app"
78+
BlueprintName = "PerformanceExample"
79+
ReferencedContainer = "container:PerformanceExample.xcodeproj">
80+
</BuildableReference>
81+
</BuildableProductRunnable>
82+
</ProfileAction>
83+
<AnalyzeAction
84+
buildConfiguration = "Debug">
85+
</AnalyzeAction>
86+
<ArchiveAction
87+
buildConfiguration = "Release"
88+
revealArchiveInOrganizer = "YES">
89+
</ArchiveAction>
90+
</Scheme>

‎performance/PerformanceExample.xcodeproj/xcshareddata/xcschemes/PerformanceExampleUITests.xcscheme‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1630"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
buildArchitectures = "Automatic">
9+
</BuildAction>
10+
<TestAction
11+
buildConfiguration = "Debug"
12+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
13+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
14+
shouldUseLaunchSchemeArgsEnv = "YES"
15+
shouldAutocreateTestPlan = "YES">
16+
<Testables>
17+
<TestableReference
18+
skipped = "NO">
19+
<BuildableReference
20+
BuildableIdentifier = "primary"
21+
BlueprintIdentifier = "107347C320315A61004A66D1"
22+
BuildableName = "PerformanceExampleUITests.xctest"
23+
BlueprintName = "PerformanceExampleUITests"
24+
ReferencedContainer = "container:PerformanceExample.xcodeproj">
25+
</BuildableReference>
26+
</TestableReference>
27+
</Testables>
28+
</TestAction>
29+
<LaunchAction
30+
buildConfiguration = "Debug"
31+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
32+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
33+
launchStyle = "0"
34+
useCustomWorkingDirectory = "NO"
35+
ignoresPersistentStateOnLaunch = "NO"
36+
debugDocumentVersioning = "YES"
37+
debugServiceExtension = "internal"
38+
allowLocationSimulation = "YES">
39+
</LaunchAction>
40+
<ProfileAction
41+
buildConfiguration = "Release"
42+
shouldUseLaunchSchemeArgsEnv = "YES"
43+
savedToolIdentifier = ""
44+
useCustomWorkingDirectory = "NO"
45+
debugDocumentVersioning = "YES">
46+
</ProfileAction>
47+
<AnalyzeAction
48+
buildConfiguration = "Debug">
49+
</AnalyzeAction>
50+
<ArchiveAction
51+
buildConfiguration = "Release"
52+
revealArchiveInOrganizer = "YES">
53+
</ArchiveAction>
54+
</Scheme>

‎scripts/test.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,13 @@ else
143143
fi
144144

145145
function xcb() {
146-
echo xcodebuild "$@"
147-
xcodebuild "$@" | xcpretty
146+
echo xcodebuild -quiet "$@"
147+
xcodebuild -quiet "$@" | xcpretty
148148
}
149149

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

0 commit comments

Comments
 (0)