diff --git a/platform-darwin/External/Pearl b/platform-darwin/External/Pearl index e3a985ac..fb38d0e3 160000 --- a/platform-darwin/External/Pearl +++ b/platform-darwin/External/Pearl @@ -1 +1 @@ -Subproject commit e3a985accf5101e98f16ce76d0669bbee3db5b31 +Subproject commit fb38d0e35fb95627fdfedc6976f529d9bed70a8d diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj index dad64c55..3b89bc85 100644 --- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -3161,7 +3161,7 @@ DA5BFA42147E415C00F98B1E /* Resources */, DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */, 4A87858EE3659604089E2F9F /* [CP] Embed Pods Frameworks */, - DA3C4EB32439438B00A6C4A8 /* Upload Sentry dSYM */, + DA3C4EB32439438B00A6C4A8 /* Sentry dSYM Upload */, ); buildRules = ( ); @@ -3518,7 +3518,7 @@ 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; }; - DA3C4EB32439438B00A6C4A8 /* Upload Sentry dSYM */ = { + DA3C4EB32439438B00A6C4A8 /* Sentry dSYM Upload */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 8; files = ( @@ -3526,15 +3526,16 @@ inputFileListPaths = ( ); inputPaths = ( + "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}", ); - name = "Upload Sentry dSYM"; + name = "Sentry dSYM Upload"; outputFileListPaths = ( ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 1; shellPath = "/bin/sh -e"; - shellScript = "if hash sentry-cli 2>/dev/null; then\n if ! ERROR=$(SENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-ios sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\" 2>&1 >/dev/null); then\n echo >&2 \"warning: sentry-cli: $ERROR\"\n fi\nelse\n echo >&2 \"warning: sentry-cli not installed: try brew install getsentry/tools/sentry-cli\"\nfi\n"; + shellScript = "if ! hash sentry-cli 2>/dev/null; then\n echo >&2 \"error: sentry-cli not installed. Try brew install getsentry/tools/sentry-cli\"\n exit 1\nfi\n\nSENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-ios sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\"\n"; showEnvVarsInLog = 0; }; DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */ = { diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj index e370b685..c7b04f18 100644 --- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj @@ -2329,7 +2329,7 @@ DAD9B5EE1762CA3A001835F9 /* Copy LoginHelper */, DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */, 43E5966C8C236E86824DDADE /* [CP] Embed Pods Frameworks */, - DA3C4EB2243941AE00A6C4A8 /* Upload Sentry dSYM */, + DA3C4EB2243941AE00A6C4A8 /* Sentry dSYM Upload */, ); buildRules = ( ); @@ -2585,7 +2585,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - DA3C4EB2243941AE00A6C4A8 /* Upload Sentry dSYM */ = { + DA3C4EB2243941AE00A6C4A8 /* Sentry dSYM Upload */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 8; files = ( @@ -2593,15 +2593,16 @@ inputFileListPaths = ( ); inputPaths = ( + "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}", ); - name = "Upload Sentry dSYM"; + name = "Sentry dSYM Upload"; outputFileListPaths = ( ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 1; shellPath = "/bin/sh -e"; - shellScript = "if hash sentry-cli 2>/dev/null; then\n if ! ERROR=$(SENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-macos sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\" 2>&1 >/dev/null); then\n echo >&2 \"warning: sentry-cli: $ERROR\"\n fi\nelse\n echo >&2 \"warning: sentry-cli not installed: try brew install getsentry/tools/sentry-cli\"\nfi\n"; + shellScript = "if ! hash sentry-cli 2>/dev/null; then\n echo >&2 \"error: sentry-cli not installed. Try brew install getsentry/tools/sentry-cli\"\n exit 1\nfi\n\nSENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-macos sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\"\n"; showEnvVarsInLog = 0; }; DA4EF9CB19FD4B600032ECB5 /* Run Script: genassets */ = {