Skip to content

Commit 4d6b925

Browse files
authored
Merge pull request #1797 from firebase/nc/scheme-rename
chore: Remove Swift suffix from installations
2 parents 6c779c7 + 78927b0 commit 4d6b925

File tree

9 files changed

+133
-43
lines changed

9 files changed

+133
-43
lines changed

.github/workflows/installations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ jobs:
4949
- name: Build ObjC
5050
run: ./scripts/test.sh
5151
env:
52-
SCHEME: InstallationsExampleSwift
52+
SCHEME: InstallationsExample

installations/InstallationsExample.xcodeproj/project.pbxproj

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
9A0A6EEE22CE55B2004CF0FF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9A0A6EEC22CE55B2004CF0FF /* Main.storyboard */; };
1515
9A5908BF23AD479B000CD3B9 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9A5908BA23AD479B000CD3B9 /* LaunchScreen.xib */; };
1616
9A5908C323AD479B000CD3B9 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9A5908BC23AD479B000CD3B9 /* Images.xcassets */; };
17-
9A76AE3122E20A0C0024E473 /* InstallationsExampleSwiftTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A76AE3022E20A0C0024E473 /* InstallationsExampleSwiftTests.m */; };
17+
9A76AE3122E20A0C0024E473 /* InstallationsExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A76AE3022E20A0C0024E473 /* InstallationsExampleTests.m */; };
1818
B2B6F60F66458C91106FE457 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */; };
1919
/* End PBXBuildFile section */
2020

@@ -24,20 +24,20 @@
2424
containerPortal = 9A0A6EDD22CE55B2004CF0FF /* Project object */;
2525
proxyType = 1;
2626
remoteGlobalIDString = 9A0A6EE422CE55B2004CF0FF;
27-
remoteInfo = InstallationsExampleSwift;
27+
remoteInfo = InstallationsExample;
2828
};
2929
/* End PBXContainerItemProxy section */
3030

3131
/* Begin PBXFileReference section */
32-
9A0A6EE522CE55B2004CF0FF /* InstallationsExampleSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = InstallationsExampleSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
32+
9A0A6EE522CE55B2004CF0FF /* InstallationsExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = InstallationsExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
3333
9A0A6EE822CE55B2004CF0FF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3434
9A0A6EEA22CE55B2004CF0FF /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
3535
9A0A6EED22CE55B2004CF0FF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
3636
9A5908BA23AD479B000CD3B9 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
3737
9A5908BC23AD479B000CD3B9 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
3838
9A76AE2922E207640024E473 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
39-
9A76AE2E22E20A0C0024E473 /* InstallationsExampleSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = InstallationsExampleSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
40-
9A76AE3022E20A0C0024E473 /* InstallationsExampleSwiftTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstallationsExampleSwiftTests.m; sourceTree = "<group>"; };
39+
9A76AE2E22E20A0C0024E473 /* InstallationsExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = InstallationsExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
40+
9A76AE3022E20A0C0024E473 /* InstallationsExampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstallationsExampleTests.m; sourceTree = "<group>"; };
4141
9A76AE3222E20A0C0024E473 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4242
AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
4343
/* End PBXFileReference section */
@@ -72,8 +72,8 @@
7272
isa = PBXGroup;
7373
children = (
7474
9A5908B923AD479B000CD3B9 /* shared */,
75-
9A0A6EE722CE55B2004CF0FF /* InstallationsExampleSwift */,
76-
9A76AE2F22E20A0C0024E473 /* InstallationsExampleSwiftTests */,
75+
9A0A6EE722CE55B2004CF0FF /* InstallationsExample */,
76+
9A76AE2F22E20A0C0024E473 /* InstallationsExampleTests */,
7777
9A0A6EE622CE55B2004CF0FF /* Products */,
7878
AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */,
7979
8DC73D822D41ABC00092B6EE /* Frameworks */,
@@ -83,21 +83,21 @@
8383
9A0A6EE622CE55B2004CF0FF /* Products */ = {
8484
isa = PBXGroup;
8585
children = (
86-
9A0A6EE522CE55B2004CF0FF /* InstallationsExampleSwift.app */,
87-
9A76AE2E22E20A0C0024E473 /* InstallationsExampleSwiftTests.xctest */,
86+
9A0A6EE522CE55B2004CF0FF /* InstallationsExample.app */,
87+
9A76AE2E22E20A0C0024E473 /* InstallationsExampleTests.xctest */,
8888
);
8989
name = Products;
9090
sourceTree = "<group>";
9191
};
92-
9A0A6EE722CE55B2004CF0FF /* InstallationsExampleSwift */ = {
92+
9A0A6EE722CE55B2004CF0FF /* InstallationsExample */ = {
9393
isa = PBXGroup;
9494
children = (
9595
9A76AE2922E207640024E473 /* Info.plist */,
9696
9A0A6EEC22CE55B2004CF0FF /* Main.storyboard */,
9797
9A0A6EE822CE55B2004CF0FF /* AppDelegate.swift */,
9898
9A0A6EEA22CE55B2004CF0FF /* ViewController.swift */,
9999
);
100-
path = InstallationsExampleSwift;
100+
path = InstallationsExample;
101101
sourceTree = "<group>";
102102
};
103103
9A5908B923AD479B000CD3B9 /* shared */ = {
@@ -110,21 +110,21 @@
110110
path = ../shared;
111111
sourceTree = "<group>";
112112
};
113-
9A76AE2F22E20A0C0024E473 /* InstallationsExampleSwiftTests */ = {
113+
9A76AE2F22E20A0C0024E473 /* InstallationsExampleTests */ = {
114114
isa = PBXGroup;
115115
children = (
116-
9A76AE3022E20A0C0024E473 /* InstallationsExampleSwiftTests.m */,
116+
9A76AE3022E20A0C0024E473 /* InstallationsExampleTests.m */,
117117
9A76AE3222E20A0C0024E473 /* Info.plist */,
118118
);
119-
path = InstallationsExampleSwiftTests;
119+
path = InstallationsExampleTests;
120120
sourceTree = "<group>";
121121
};
122122
/* End PBXGroup section */
123123

124124
/* Begin PBXNativeTarget section */
125-
9A0A6EE422CE55B2004CF0FF /* InstallationsExampleSwift */ = {
125+
9A0A6EE422CE55B2004CF0FF /* InstallationsExample */ = {
126126
isa = PBXNativeTarget;
127-
buildConfigurationList = 9A0A6EF722CE55B3004CF0FF /* Build configuration list for PBXNativeTarget "InstallationsExampleSwift" */;
127+
buildConfigurationList = 9A0A6EF722CE55B3004CF0FF /* Build configuration list for PBXNativeTarget "InstallationsExample" */;
128128
buildPhases = (
129129
9A0A6EE122CE55B2004CF0FF /* Sources */,
130130
9A0A6EE222CE55B2004CF0FF /* Frameworks */,
@@ -134,14 +134,14 @@
134134
);
135135
dependencies = (
136136
);
137-
name = InstallationsExampleSwift;
137+
name = InstallationsExample;
138138
productName = InstallationsExample;
139-
productReference = 9A0A6EE522CE55B2004CF0FF /* InstallationsExampleSwift.app */;
139+
productReference = 9A0A6EE522CE55B2004CF0FF /* InstallationsExample.app */;
140140
productType = "com.apple.product-type.application";
141141
};
142-
9A76AE2D22E20A0C0024E473 /* InstallationsExampleSwiftTests */ = {
142+
9A76AE2D22E20A0C0024E473 /* InstallationsExampleTests */ = {
143143
isa = PBXNativeTarget;
144-
buildConfigurationList = 9A76AE3722E20A0C0024E473 /* Build configuration list for PBXNativeTarget "InstallationsExampleSwiftTests" */;
144+
buildConfigurationList = 9A76AE3722E20A0C0024E473 /* Build configuration list for PBXNativeTarget "InstallationsExampleTests" */;
145145
buildPhases = (
146146
9A76AE2A22E20A0C0024E473 /* Sources */,
147147
9A76AE2B22E20A0C0024E473 /* Frameworks */,
@@ -152,9 +152,9 @@
152152
dependencies = (
153153
9A76AE3422E20A0C0024E473 /* PBXTargetDependency */,
154154
);
155-
name = InstallationsExampleSwiftTests;
156-
productName = InstallationsExampleSwiftTests;
157-
productReference = 9A76AE2E22E20A0C0024E473 /* InstallationsExampleSwiftTests.xctest */;
155+
name = InstallationsExampleTests;
156+
productName = InstallationsExampleTests;
157+
productReference = 9A76AE2E22E20A0C0024E473 /* InstallationsExampleTests.xctest */;
158158
productType = "com.apple.product-type.bundle.unit-test";
159159
};
160160
/* End PBXNativeTarget section */
@@ -194,8 +194,8 @@
194194
projectDirPath = "";
195195
projectRoot = "";
196196
targets = (
197-
9A0A6EE422CE55B2004CF0FF /* InstallationsExampleSwift */,
198-
9A76AE2D22E20A0C0024E473 /* InstallationsExampleSwiftTests */,
197+
9A0A6EE422CE55B2004CF0FF /* InstallationsExample */,
198+
9A76AE2D22E20A0C0024E473 /* InstallationsExampleTests */,
199199
);
200200
};
201201
/* End PBXProject section */
@@ -235,7 +235,7 @@
235235
isa = PBXSourcesBuildPhase;
236236
buildActionMask = 2147483647;
237237
files = (
238-
9A76AE3122E20A0C0024E473 /* InstallationsExampleSwiftTests.m in Sources */,
238+
9A76AE3122E20A0C0024E473 /* InstallationsExampleTests.m in Sources */,
239239
1D96FE8F5661BCC40ADE48D3 /* GoogleService-Info.plist in Sources */,
240240
);
241241
runOnlyForDeploymentPostprocessing = 0;
@@ -245,7 +245,7 @@
245245
/* Begin PBXTargetDependency section */
246246
9A76AE3422E20A0C0024E473 /* PBXTargetDependency */ = {
247247
isa = PBXTargetDependency;
248-
target = 9A0A6EE422CE55B2004CF0FF /* InstallationsExampleSwift */;
248+
target = 9A0A6EE422CE55B2004CF0FF /* InstallationsExample */;
249249
targetProxy = 9A76AE3322E20A0C0024E473 /* PBXContainerItemProxy */;
250250
};
251251
/* End PBXTargetDependency section */
@@ -387,12 +387,12 @@
387387
buildSettings = {
388388
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
389389
CODE_SIGN_STYLE = Automatic;
390-
INFOPLIST_FILE = InstallationsExampleSwift/Info.plist;
390+
INFOPLIST_FILE = InstallationsExample/Info.plist;
391391
LD_RUNPATH_SEARCH_PATHS = (
392392
"$(inherited)",
393393
"@executable_path/Frameworks",
394394
);
395-
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.InstallationExampleSwift;
395+
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.InstallationExample;
396396
PRODUCT_NAME = "$(TARGET_NAME)";
397397
SWIFT_VERSION = 4.2;
398398
TARGETED_DEVICE_FAMILY = "1,2";
@@ -404,12 +404,12 @@
404404
buildSettings = {
405405
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
406406
CODE_SIGN_STYLE = Automatic;
407-
INFOPLIST_FILE = InstallationsExampleSwift/Info.plist;
407+
INFOPLIST_FILE = InstallationsExample/Info.plist;
408408
LD_RUNPATH_SEARCH_PATHS = (
409409
"$(inherited)",
410410
"@executable_path/Frameworks",
411411
);
412-
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.InstallationExampleSwift;
412+
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.InstallationExample;
413413
PRODUCT_NAME = "$(TARGET_NAME)";
414414
SWIFT_VERSION = 4.2;
415415
TARGETED_DEVICE_FAMILY = "1,2";
@@ -421,16 +421,16 @@
421421
buildSettings = {
422422
BUNDLE_LOADER = "$(TEST_HOST)";
423423
CODE_SIGN_STYLE = Automatic;
424-
INFOPLIST_FILE = InstallationsExampleSwiftTests/Info.plist;
424+
INFOPLIST_FILE = InstallationsExampleTests/Info.plist;
425425
LD_RUNPATH_SEARCH_PATHS = (
426426
"$(inherited)",
427427
"@executable_path/Frameworks",
428428
"@loader_path/Frameworks",
429429
);
430-
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.InstallationsExampleSwiftTests;
430+
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.InstallationsExampleTests;
431431
PRODUCT_NAME = "$(TARGET_NAME)";
432432
TARGETED_DEVICE_FAMILY = "1,2";
433-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/InstallationsExampleSwift.app/InstallationsExampleSwift";
433+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/InstallationsExample.app/InstallationsExample";
434434
};
435435
name = Debug;
436436
};
@@ -439,16 +439,16 @@
439439
buildSettings = {
440440
BUNDLE_LOADER = "$(TEST_HOST)";
441441
CODE_SIGN_STYLE = Automatic;
442-
INFOPLIST_FILE = InstallationsExampleSwiftTests/Info.plist;
442+
INFOPLIST_FILE = InstallationsExampleTests/Info.plist;
443443
LD_RUNPATH_SEARCH_PATHS = (
444444
"$(inherited)",
445445
"@executable_path/Frameworks",
446446
"@loader_path/Frameworks",
447447
);
448-
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.InstallationsExampleSwiftTests;
448+
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.InstallationsExampleTests;
449449
PRODUCT_NAME = "$(TARGET_NAME)";
450450
TARGETED_DEVICE_FAMILY = "1,2";
451-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/InstallationsExampleSwift.app/InstallationsExampleSwift";
451+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/InstallationsExample.app/InstallationsExample";
452452
};
453453
name = Release;
454454
};
@@ -464,7 +464,7 @@
464464
defaultConfigurationIsVisible = 0;
465465
defaultConfigurationName = Release;
466466
};
467-
9A0A6EF722CE55B3004CF0FF /* Build configuration list for PBXNativeTarget "InstallationsExampleSwift" */ = {
467+
9A0A6EF722CE55B3004CF0FF /* Build configuration list for PBXNativeTarget "InstallationsExample" */ = {
468468
isa = XCConfigurationList;
469469
buildConfigurations = (
470470
9A0A6EF822CE55B3004CF0FF /* Debug */,
@@ -473,7 +473,7 @@
473473
defaultConfigurationIsVisible = 0;
474474
defaultConfigurationName = Release;
475475
};
476-
9A76AE3722E20A0C0024E473 /* Build configuration list for PBXNativeTarget "InstallationsExampleSwiftTests" */ = {
476+
9A76AE3722E20A0C0024E473 /* Build configuration list for PBXNativeTarget "InstallationsExampleTests" */ = {
477477
isa = XCConfigurationList;
478478
buildConfigurations = (
479479
9A76AE3522E20A0C0024E473 /* Debug */,
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 = "9A0A6EE422CE55B2004CF0FF"
19+
BuildableName = "InstallationsExample.app"
20+
BlueprintName = "InstallationsExample"
21+
ReferencedContainer = "container:InstallationsExample.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 = "9A76AE2D22E20A0C0024E473"
38+
BuildableName = "InstallationsExampleTests.xctest"
39+
BlueprintName = "InstallationsExampleTests"
40+
ReferencedContainer = "container:InstallationsExample.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 = "9A0A6EE422CE55B2004CF0FF"
60+
BuildableName = "InstallationsExample.app"
61+
BlueprintName = "InstallationsExample"
62+
ReferencedContainer = "container:InstallationsExample.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 = "9A0A6EE422CE55B2004CF0FF"
77+
BuildableName = "InstallationsExample.app"
78+
BlueprintName = "InstallationsExample"
79+
ReferencedContainer = "container:InstallationsExample.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>

installations/InstallationsExampleSwift/Base.lproj/Main.storyboard renamed to installations/InstallationsExample/Base.lproj/Main.storyboard

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!--View Controller-->
1212
<scene sceneID="tne-QT-ifu">
1313
<objects>
14-
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="InstallationsExampleSwift" customModuleProvider="target" sceneMemberID="viewController">
14+
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="InstallationsExample" customModuleProvider="target" sceneMemberID="viewController">
1515
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
1616
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1717
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

installations/InstallationsExampleSwiftTests/InstallationsExampleSwiftTests.m renamed to installations/InstallationsExampleTests/InstallationsExampleTests.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
#import <XCTest/XCTest.h>
1818

19-
@interface InstallationsExampleSwiftTests : XCTestCase
19+
@interface InstallationsExampleTests : XCTestCase
2020

2121
@end
2222

23-
@implementation InstallationsExampleSwiftTests
23+
@implementation InstallationsExampleTests
2424

2525
- (void)setUp {
2626
// Put setup code here. This method is called before the invocation of each test method in the class.

0 commit comments

Comments
 (0)