Skip to content
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

Jump to bottom

Fix an App Store upload error due to an RTE version mismatch. #3029

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Fix an App Store upload error due to an RTE version mismatch. #3029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions ElementX.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5316,6 +5316,7 @@
8E3CD0D0BB6697512E867C1D /* Embed Foundation Extensions */,
98CA896D84BFD53B2554E891 /* ⚠️ SwiftLint */,
B35AB66424BB30087EEE408C /* 🧹 SwiftFormat */,
C3B6A7500AE6E2A21B1DF527 /* 🔧 Fix the Rich Text Editor */,
);
buildRules = (
);
Expand Down Expand Up @@ -5683,6 +5684,25 @@
shellPath = /bin/sh;
shellScript = "export PATH=\"$PATH:/opt/homebrew/bin\"\nif which swiftformat >/dev/null; then\n swiftformat --lint --lenient \"$PROJECT_DIR\"\nelse\n echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\nfi\n";
};
C3B6A7500AE6E2A21B1DF527 /* 🔧 Fix the Rich Text Editor */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "🔧 Fix the Rich Text Editor";
outputFileListPaths = (
);
outputPaths = (
);
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";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down
3 changes: 2 additions & 1 deletion ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"originHash" : "f365b5beb40745f208e5ec7cd4891301b38101ddbeae52296261f3d4a25436c7",
"pins" : [
{
"identity" : "compound-design-tokens",
Expand Down Expand Up @@ -288,5 +289,5 @@
}
}
],
"version" : 2
"version" : 3
}
9 changes: 9 additions & 0 deletions ElementX/SupportingFiles/target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,15 @@ targets:
else
echo "warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat"
fi
- name: 🔧 Fix the Rich Text Editor
runOnlyWhenInstalling: false
basedOnDependencyAnalysis: false
shell: /bin/sh
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

dependencies:
- target: NSE
Expand Down
Loading