Skip to content

Commit

Permalink
Merge pull request #1693 from bugsnag/PLAT-12646-remove-fixture-podfile
Browse files Browse the repository at this point in the history 
Use direct project references instead of cocoapods for the macos fixture
  • Loading branch information
@kstenerud
kstenerud authored Sep 10, 2024
2 parents 9d5dcb2 + d344ad8 commit cb614d0
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 97 deletions.
23 changes: 0 additions & 23 deletions features/fixtures/macos/Podfile
View file

This file was deleted.

85 changes: 18 additions & 67 deletions features/fixtures/macos/macOSTestApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@
01FA9EC626D64FFF0059FF4A /* AppHangInTerminationScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01FA9EC526D64FFF0059FF4A /* AppHangInTerminationScenario.swift */; };
095E095F2AF3C98F00273F1F /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 095E095E2AF3C98F00273F1F /* Logging.swift */; };
095E09622AF3C9A500273F1F /* Logging.m in Sources */ = {isa = PBXBuildFile; fileRef = 095E09612AF3C9A500273F1F /* Logging.m */; };
09E045582C89A334003882D3 /* Bugsnag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09E045572C89A334003882D3 /* Bugsnag.framework */; };
09E045592C89A334003882D3 /* Bugsnag.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 09E045572C89A334003882D3 /* Bugsnag.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
09E0455C2C89A33B003882D3 /* BugsnagNetworkRequestPlugin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09E0455B2C89A33B003882D3 /* BugsnagNetworkRequestPlugin.framework */; };
09E0455D2C89A33B003882D3 /* BugsnagNetworkRequestPlugin.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 09E0455B2C89A33B003882D3 /* BugsnagNetworkRequestPlugin.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
09F0250E2BA301FD007D9F73 /* FixtureConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F0250C2BA301FD007D9F73 /* FixtureConfig.swift */; };
09F0250F2BA301FD007D9F73 /* Fixture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F0250D2BA301FD007D9F73 /* Fixture.swift */; };
09F025112BA30225007D9F73 /* MazeRunnerCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F025102BA30225007D9F73 /* MazeRunnerCommand.swift */; };
Expand All @@ -196,16 +200,17 @@
AA6ACD1E2773E39C006464C4 /* UserInfoScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6ACD1D2773E39C006464C4 /* UserInfoScenario.swift */; };
CB0AE1F3287DBA380079B28E /* OnSendErrorCallbackFeatureFlagsScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB0AE1F2287DBA380079B28E /* OnSendErrorCallbackFeatureFlagsScenario.swift */; };
CBB7878E2578FB3F0071BDE4 /* MarkUnhandledHandledScenario.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB7878C2578FB3F0071BDE4 /* MarkUnhandledHandledScenario.m */; };
FECF3DC11A84CDC5FD442710 /* Pods_macOSTestApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C65BFC9838298CFA8A35072 /* Pods_macOSTestApp.framework */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
01452356254AFD7C00D436AA /* Embed Frameworks */ = {
09E0455A2C89A334003882D3 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
09E0455D2C89A33B003882D3 /* BugsnagNetworkRequestPlugin.framework in Embed Frameworks */,
09E045592C89A334003882D3 /* Bugsnag.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -397,12 +402,14 @@
095E095E2AF3C98F00273F1F /* Logging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logging.swift; sourceTree = "<group>"; };
095E09602AF3C9A500273F1F /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = "<group>"; };
095E09612AF3C9A500273F1F /* Logging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Logging.m; sourceTree = "<group>"; };
09E045512C89A228003882D3 /* Bugsnag.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Bugsnag.framework; sourceTree = BUILT_PRODUCTS_DIR; };
09E045542C89A230003882D3 /* BugsnagNetworkRequestPlugin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BugsnagNetworkRequestPlugin.framework; sourceTree = BUILT_PRODUCTS_DIR; };
09E045572C89A334003882D3 /* Bugsnag.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Bugsnag.framework; sourceTree = BUILT_PRODUCTS_DIR; };
09E0455B2C89A33B003882D3 /* BugsnagNetworkRequestPlugin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BugsnagNetworkRequestPlugin.framework; sourceTree = BUILT_PRODUCTS_DIR; };
09F0250C2BA301FD007D9F73 /* FixtureConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FixtureConfig.swift; sourceTree = "<group>"; };
09F0250D2BA301FD007D9F73 /* Fixture.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fixture.swift; sourceTree = "<group>"; };
09F025102BA30225007D9F73 /* MazeRunnerCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MazeRunnerCommand.swift; sourceTree = "<group>"; };
09F025122BA30240007D9F73 /* CommandReaderThread.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommandReaderThread.swift; sourceTree = "<group>"; };
2C49722B331FF4B0DC477462 /* Pods-macOSTestApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOSTestApp.release.xcconfig"; path = "Target Support Files/Pods-macOSTestApp/Pods-macOSTestApp.release.xcconfig"; sourceTree = "<group>"; };
5C65BFC9838298CFA8A35072 /* Pods_macOSTestApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_macOSTestApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8A096DF727C7E63A00DB6ECC /* CxxUnexpectedScenario.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CxxUnexpectedScenario.mm; sourceTree = "<group>"; };
8A096DF927C7E6D800DB6ECC /* CxxBareThrowScenario.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CxxBareThrowScenario.mm; sourceTree = "<group>"; };
967F6F1529B767CE0054EED8 /* InternalWorkingsScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InternalWorkingsScenario.swift; sourceTree = "<group>"; };
Expand All @@ -412,15 +419,15 @@
CB0AE1F2287DBA380079B28E /* OnSendErrorCallbackFeatureFlagsScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnSendErrorCallbackFeatureFlagsScenario.swift; sourceTree = "<group>"; };
CBB7878C2578FB3F0071BDE4 /* MarkUnhandledHandledScenario.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MarkUnhandledHandledScenario.m; sourceTree = "<group>"; };
CBB7878D2578FB3F0071BDE4 /* MarkUnhandledHandledScenario.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkUnhandledHandledScenario.h; sourceTree = "<group>"; };
E32FA33AF8114150BBC3AEF4 /* Pods-macOSTestApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOSTestApp.debug.xcconfig"; path = "Target Support Files/Pods-macOSTestApp/Pods-macOSTestApp.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
0176C0A5254AE81B0066E0F3 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FECF3DC11A84CDC5FD442710 /* Pods_macOSTestApp.framework in Frameworks */,
09E0455C2C89A33B003882D3 /* BugsnagNetworkRequestPlugin.framework in Frameworks */,
09E045582C89A334003882D3 /* Bugsnag.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -617,7 +624,10 @@
01452352254AFD7C00D436AA /* Frameworks */ = {
isa = PBXGroup;
children = (
5C65BFC9838298CFA8A35072 /* Pods_macOSTestApp.framework */,
09E0455B2C89A33B003882D3 /* BugsnagNetworkRequestPlugin.framework */,
09E045572C89A334003882D3 /* Bugsnag.framework */,
09E045542C89A230003882D3 /* BugsnagNetworkRequestPlugin.framework */,
09E045512C89A228003882D3 /* Bugsnag.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -630,7 +640,6 @@
01452234254AFCD600D436AA /* scenarios */,
0176C0A9254AE81B0066E0F3 /* Products */,
01452352254AFD7C00D436AA /* Frameworks */,
7F1338EF880258961EDBFE91 /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -658,15 +667,6 @@
path = macOSTestApp;
sourceTree = "<group>";
};
7F1338EF880258961EDBFE91 /* Pods */ = {
isa = PBXGroup;
children = (
E32FA33AF8114150BBC3AEF4 /* Pods-macOSTestApp.debug.xcconfig */,
2C49722B331FF4B0DC477462 /* Pods-macOSTestApp.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
};
AA4C7F1629AEA1F2009B09A9 /* utils */ = {
isa = PBXGroup;
children = (
Expand All @@ -690,12 +690,10 @@
isa = PBXNativeTarget;
buildConfigurationList = 0176C0C5254AE81B0066E0F3 /* Build configuration list for PBXNativeTarget "macOSTestApp" */;
buildPhases = (
9FBDACA0F6A1E3220B57DED3 /* [CP] Check Pods Manifest.lock */,
0176C0A4254AE81B0066E0F3 /* Sources */,
0176C0A5254AE81B0066E0F3 /* Frameworks */,
0176C0A6254AE81B0066E0F3 /* Resources */,
01452356254AFD7C00D436AA /* Embed Frameworks */,
9B046CE9C00053AC2F9C5463 /* [CP] Embed Pods Frameworks */,
09E0455A2C89A334003882D3 /* Embed Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -752,51 +750,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
9B046CE9C00053AC2F9C5463 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-macOSTestApp/Pods-macOSTestApp-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Bugsnag/Bugsnag.framework",
"${BUILT_PRODUCTS_DIR}/BugsnagNetworkRequestPlugin/BugsnagNetworkRequestPlugin.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Bugsnag.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BugsnagNetworkRequestPlugin.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-macOSTestApp/Pods-macOSTestApp-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
9FBDACA0F6A1E3220B57DED3 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-macOSTestApp-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
0176C0A4254AE81B0066E0F3 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -1117,7 +1070,6 @@
};
0176C0C6254AE81B0066E0F3 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = E32FA33AF8114150BBC3AEF4 /* Pods-macOSTestApp.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
Expand All @@ -1143,7 +1095,6 @@
};
0176C0C7254AE81B0066E0F3 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2C49722B331FF4B0DC477462 /* Pods-macOSTestApp.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
Expand Down
7 changes: 5 additions & 2 deletions features/fixtures/macos/macOSTestApp.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions features/scripts/export_mac_app.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ BUILD_CONFIGURATION=$1

pushd features/fixtures/macos

echo "--- macOSTestApp: pod install"

pod install

echo "--- macOSTestApp: xcodebuild archive"

BUILD_ARGS=(
Expand Down
1 change: 0 additions & 1 deletion features/support/env.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ def skip_between(os, version_lo, version_hi)
out: File.open(File.join(path, 'device.log'), 'w')
)
Process.wait log
FileUtils.mv '/tmp/kscrash.log', path
end
when 'ios'
begin
Expand Down

0 comments on commit cb614d0

Please sign in to comment.