Skip to content

chore: Remove Swift suffix from installations #1797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2025
Merged

chore: Remove Swift suffix from installations #1797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23c4729
chore: Remove Swift suffix from installations
ncooke3 Oct 28, 2025
78927b0
Rename test
ncooke3 Oct 28, 2025
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/installations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ jobs:
- name: Build ObjC
run: ./scripts/test.sh
env:
SCHEME: InstallationsExampleSwift
SCHEME: InstallationsExample
78 changes: 39 additions & 39 deletions installations/InstallationsExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
9A0A6EEE22CE55B2004CF0FF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9A0A6EEC22CE55B2004CF0FF /* Main.storyboard */; };
9A5908BF23AD479B000CD3B9 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9A5908BA23AD479B000CD3B9 /* LaunchScreen.xib */; };
9A5908C323AD479B000CD3B9 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9A5908BC23AD479B000CD3B9 /* Images.xcassets */; };
9A76AE3122E20A0C0024E473 /* InstallationsExampleSwiftTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A76AE3022E20A0C0024E473 /* InstallationsExampleSwiftTests.m */; };
9A76AE3122E20A0C0024E473 /* InstallationsExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A76AE3022E20A0C0024E473 /* InstallationsExampleTests.m */; };
B2B6F60F66458C91106FE457 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */; };
/* End PBXBuildFile section */

Expand All @@ -24,20 +24,20 @@
containerPortal = 9A0A6EDD22CE55B2004CF0FF /* Project object */;
proxyType = 1;
remoteGlobalIDString = 9A0A6EE422CE55B2004CF0FF;
remoteInfo = InstallationsExampleSwift;
remoteInfo = InstallationsExample;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
9A0A6EE522CE55B2004CF0FF /* InstallationsExampleSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = InstallationsExampleSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
9A0A6EE522CE55B2004CF0FF /* InstallationsExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = InstallationsExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
9A0A6EE822CE55B2004CF0FF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
9A0A6EEA22CE55B2004CF0FF /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
9A0A6EED22CE55B2004CF0FF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
9A5908BA23AD479B000CD3B9 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
9A5908BC23AD479B000CD3B9 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
9A76AE2922E207640024E473 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9A76AE2E22E20A0C0024E473 /* InstallationsExampleSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = InstallationsExampleSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
9A76AE3022E20A0C0024E473 /* InstallationsExampleSwiftTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstallationsExampleSwiftTests.m; sourceTree = "<group>"; };
9A76AE2E22E20A0C0024E473 /* InstallationsExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = InstallationsExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
9A76AE3022E20A0C0024E473 /* InstallationsExampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstallationsExampleTests.m; sourceTree = "<group>"; };
9A76AE3222E20A0C0024E473 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -72,8 +72,8 @@
isa = PBXGroup;
children = (
9A5908B923AD479B000CD3B9 /* shared */,
9A0A6EE722CE55B2004CF0FF /* InstallationsExampleSwift */,
9A76AE2F22E20A0C0024E473 /* InstallationsExampleSwiftTests */,
9A0A6EE722CE55B2004CF0FF /* InstallationsExample */,
9A76AE2F22E20A0C0024E473 /* InstallationsExampleTests */,
9A0A6EE622CE55B2004CF0FF /* Products */,
AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */,
8DC73D822D41ABC00092B6EE /* Frameworks */,
Expand All @@ -83,21 +83,21 @@
9A0A6EE622CE55B2004CF0FF /* Products */ = {
isa = PBXGroup;
children = (
9A0A6EE522CE55B2004CF0FF /* InstallationsExampleSwift.app */,
9A76AE2E22E20A0C0024E473 /* InstallationsExampleSwiftTests.xctest */,
9A0A6EE522CE55B2004CF0FF /* InstallationsExample.app */,
9A76AE2E22E20A0C0024E473 /* InstallationsExampleTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
9A0A6EE722CE55B2004CF0FF /* InstallationsExampleSwift */ = {
9A0A6EE722CE55B2004CF0FF /* InstallationsExample */ = {
isa = PBXGroup;
children = (
9A76AE2922E207640024E473 /* Info.plist */,
9A0A6EEC22CE55B2004CF0FF /* Main.storyboard */,
9A0A6EE822CE55B2004CF0FF /* AppDelegate.swift */,
9A0A6EEA22CE55B2004CF0FF /* ViewController.swift */,
);
path = InstallationsExampleSwift;
path = InstallationsExample;
sourceTree = "<group>";
};
9A5908B923AD479B000CD3B9 /* shared */ = {
Expand All @@ -110,21 +110,21 @@
path = ../shared;
sourceTree = "<group>";
};
9A76AE2F22E20A0C0024E473 /* InstallationsExampleSwiftTests */ = {
9A76AE2F22E20A0C0024E473 /* InstallationsExampleTests */ = {
isa = PBXGroup;
children = (
9A76AE3022E20A0C0024E473 /* InstallationsExampleSwiftTests.m */,
9A76AE3022E20A0C0024E473 /* InstallationsExampleTests.m */,
9A76AE3222E20A0C0024E473 /* Info.plist */,
);
path = InstallationsExampleSwiftTests;
path = InstallationsExampleTests;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
9A0A6EE422CE55B2004CF0FF /* InstallationsExampleSwift */ = {
9A0A6EE422CE55B2004CF0FF /* InstallationsExample */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9A0A6EF722CE55B3004CF0FF /* Build configuration list for PBXNativeTarget "InstallationsExampleSwift" */;
buildConfigurationList = 9A0A6EF722CE55B3004CF0FF /* Build configuration list for PBXNativeTarget "InstallationsExample" */;
buildPhases = (
9A0A6EE122CE55B2004CF0FF /* Sources */,
9A0A6EE222CE55B2004CF0FF /* Frameworks */,
Expand All @@ -134,14 +134,14 @@
);
dependencies = (
);
name = InstallationsExampleSwift;
name = InstallationsExample;
productName = InstallationsExample;
productReference = 9A0A6EE522CE55B2004CF0FF /* InstallationsExampleSwift.app */;
productReference = 9A0A6EE522CE55B2004CF0FF /* InstallationsExample.app */;
productType = "com.apple.product-type.application";
};
9A76AE2D22E20A0C0024E473 /* InstallationsExampleSwiftTests */ = {
9A76AE2D22E20A0C0024E473 /* InstallationsExampleTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9A76AE3722E20A0C0024E473 /* Build configuration list for PBXNativeTarget "InstallationsExampleSwiftTests" */;
buildConfigurationList = 9A76AE3722E20A0C0024E473 /* Build configuration list for PBXNativeTarget "InstallationsExampleTests" */;
buildPhases = (
9A76AE2A22E20A0C0024E473 /* Sources */,
9A76AE2B22E20A0C0024E473 /* Frameworks */,
Expand All @@ -152,9 +152,9 @@
dependencies = (
9A76AE3422E20A0C0024E473 /* PBXTargetDependency */,
);
name = InstallationsExampleSwiftTests;
productName = InstallationsExampleSwiftTests;
productReference = 9A76AE2E22E20A0C0024E473 /* InstallationsExampleSwiftTests.xctest */;
name = InstallationsExampleTests;
productName = InstallationsExampleTests;
productReference = 9A76AE2E22E20A0C0024E473 /* InstallationsExampleTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
Expand Down Expand Up @@ -194,8 +194,8 @@
projectDirPath = "";
projectRoot = "";
targets = (
9A0A6EE422CE55B2004CF0FF /* InstallationsExampleSwift */,
9A76AE2D22E20A0C0024E473 /* InstallationsExampleSwiftTests */,
9A0A6EE422CE55B2004CF0FF /* InstallationsExample */,
9A76AE2D22E20A0C0024E473 /* InstallationsExampleTests */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -235,7 +235,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9A76AE3122E20A0C0024E473 /* InstallationsExampleSwiftTests.m in Sources */,
9A76AE3122E20A0C0024E473 /* InstallationsExampleTests.m in Sources */,
1D96FE8F5661BCC40ADE48D3 /* GoogleService-Info.plist in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -245,7 +245,7 @@
/* Begin PBXTargetDependency section */
9A76AE3422E20A0C0024E473 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 9A0A6EE422CE55B2004CF0FF /* InstallationsExampleSwift */;
target = 9A0A6EE422CE55B2004CF0FF /* InstallationsExample */;
targetProxy = 9A76AE3322E20A0C0024E473 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
Expand Down Expand Up @@ -387,12 +387,12 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = InstallationsExampleSwift/Info.plist;
INFOPLIST_FILE = InstallationsExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.InstallationExampleSwift;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.InstallationExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -404,12 +404,12 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = InstallationsExampleSwift/Info.plist;
INFOPLIST_FILE = InstallationsExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.InstallationExampleSwift;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.InstallationExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -421,16 +421,16 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = InstallationsExampleSwiftTests/Info.plist;
INFOPLIST_FILE = InstallationsExampleTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.InstallationsExampleSwiftTests;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.InstallationsExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/InstallationsExampleSwift.app/InstallationsExampleSwift";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/InstallationsExample.app/InstallationsExample";
};
name = Debug;
};
Expand All @@ -439,16 +439,16 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = InstallationsExampleSwiftTests/Info.plist;
INFOPLIST_FILE = InstallationsExampleTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.InstallationsExampleSwiftTests;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.InstallationsExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/InstallationsExampleSwift.app/InstallationsExampleSwift";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/InstallationsExample.app/InstallationsExample";
};
name = Release;
};
Expand All @@ -464,7 +464,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9A0A6EF722CE55B3004CF0FF /* Build configuration list for PBXNativeTarget "InstallationsExampleSwift" */ = {
9A0A6EF722CE55B3004CF0FF /* Build configuration list for PBXNativeTarget "InstallationsExample" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9A0A6EF822CE55B3004CF0FF /* Debug */,
Expand All @@ -473,7 +473,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9A76AE3722E20A0C0024E473 /* Build configuration list for PBXNativeTarget "InstallationsExampleSwiftTests" */ = {
9A76AE3722E20A0C0024E473 /* Build configuration list for PBXNativeTarget "InstallationsExampleTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9A76AE3522E20A0C0024E473 /* Debug */,
Expand Down
90 changes: 90 additions & 0 deletions ...tions/InstallationsExample.xcodeproj/xcshareddata/xcschemes/InstallationsExample.xcscheme
View file
Open in desktop
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 = "9A0A6EE422CE55B2004CF0FF"
BuildableName = "InstallationsExample.app"
BlueprintName = "InstallationsExample"
ReferencedContainer = "container:InstallationsExample.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 = "9A76AE2D22E20A0C0024E473"
BuildableName = "InstallationsExampleTests.xctest"
BlueprintName = "InstallationsExampleTests"
ReferencedContainer = "container:InstallationsExample.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 = "9A0A6EE422CE55B2004CF0FF"
BuildableName = "InstallationsExample.app"
BlueprintName = "InstallationsExample"
ReferencedContainer = "container:InstallationsExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9A0A6EE422CE55B2004CF0FF"
BuildableName = "InstallationsExample.app"
BlueprintName = "InstallationsExample"
ReferencedContainer = "container:InstallationsExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
0 ...stallationsExampleSwift/AppDelegate.swift → ...ns/InstallationsExample/AppDelegate.swift
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nsExampleSwift/Base.lproj/Main.storyboard → ...lationsExample/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="InstallationsExampleSwift" customModuleProvider="target" sceneMemberID="viewController">
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="InstallationsExample" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down
0 ...ions/InstallationsExampleSwift/Info.plist → ...allations/InstallationsExample/Info.plist
View file
Open in desktop
File renamed without changes.
0 ...llationsExampleSwift/ViewController.swift → ...InstallationsExample/ViewController.swift
View file
Open in desktop
File renamed without changes.
0 ...InstallationsExampleSwiftTests/Info.plist → ...ions/InstallationsExampleTests/Info.plist
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...iftTests/InstallationsExampleSwiftTests.m → ...sExampleTests/InstallationsExampleTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

#import <XCTest/XCTest.h>

@interface InstallationsExampleSwiftTests : XCTestCase
@interface InstallationsExampleTests : XCTestCase

@end

@implementation InstallationsExampleSwiftTests
@implementation InstallationsExampleTests

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