diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 626ca4410c..5fd1c96704 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -5701,7 +5701,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# The RTE XCFramework contains .frameworks instead of static libs. For some reason Xcode embeds the binary, but also\n# an empty framework containing a stub binary. This stub binary is generated for our app and so its version mismatches\n# the one declared by the XCFramework's Info.plist file (and we can't match it because of Element iOS).\n/usr/libexec/PlistBuddy -c \"Set :MinimumOSVersion ${IPHONEOS_DEPLOYMENT_TARGET}\" ${BUILT_PRODUCTS_DIR}/ElementX.app/Frameworks/WysiwygComposerFFI.framework/Info.plist\n"; + shellScript = "# The RTE XCFramework contains .frameworks instead of static libs. For some reason Xcode embeds the binary, but also\n# an empty framework containing a stub binary. This stub binary is generated for our app and so its version mismatches\n# the one declared by the XCFramework's Info.plist file (and we can't match it because of Element iOS). ASC doesn't like this.\nif [ \"$CONFIGURATION\" == \"Release\" ]; then\n # On the other hand local device builds detect a signature change, so only do this when in Release mode.\n # Not ideal but helps us most of the time and we can remove this run phase locally if needed.\n /usr/libexec/PlistBuddy -c \"Set :MinimumOSVersion ${IPHONEOS_DEPLOYMENT_TARGET}\" ${BUILT_PRODUCTS_DIR}/ElementX.app/Frameworks/WysiwygComposerFFI.framework/Info.plist\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/ElementX/SupportingFiles/target.yml b/ElementX/SupportingFiles/target.yml index fd6b9c31cc..d286c0d57e 100644 --- a/ElementX/SupportingFiles/target.yml +++ b/ElementX/SupportingFiles/target.yml @@ -181,8 +181,12 @@ targets: script: | # The RTE XCFramework contains .frameworks instead of static libs. For some reason Xcode embeds the binary, but also # an empty framework containing a stub binary. This stub binary is generated for our app and so its version mismatches - # the one declared by the XCFramework's Info.plist file (and we can't match it because of Element iOS). - /usr/libexec/PlistBuddy -c "Set :MinimumOSVersion ${IPHONEOS_DEPLOYMENT_TARGET}" ${BUILT_PRODUCTS_DIR}/ElementX.app/Frameworks/WysiwygComposerFFI.framework/Info.plist + # the one declared by the XCFramework's Info.plist file (and we can't match it because of Element iOS). ASC doesn't like this. + if [ "$CONFIGURATION" == "Release" ]; then + # On the other hand local device builds detect a signature change, so only do this when in Release mode. + # Not ideal but helps us most of the time and we can remove this run phase locally if needed. + /usr/libexec/PlistBuddy -c "Set :MinimumOSVersion ${IPHONEOS_DEPLOYMENT_TARGET}" ${BUILT_PRODUCTS_DIR}/ElementX.app/Frameworks/WysiwygComposerFFI.framework/Info.plist + fi dependencies: - target: NSE