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.

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

chore: fix build issues and Preview Content #1234

Merged
merged 1 commit into from
Aug 24, 2022
Merged
Changes from all commits
Commits
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: 9 additions & 11 deletions ios/NativeSigner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"$(PROJECT_DIR)/NativeSigner/Generated/$(INPUT_FILE_BASE)FFI.h",
);
runOncePerArchitecture = 0;
script = "$HOME/.cargo/bin/uniffi-bindgen generate $INPUT_FILE_PATH --language swift --out-dir $PROJECT_DIR/NativeSigner/Generated\n";
script = "# Skip during indexing phase in XCode 13+ \nif [ $ACTION == \"indexbuild\" ]; then\n echo \"Not parsing *.udl files during indexing.\"\n exit 0 \nfi\n\n# Skip for preview builds\nif [ \"${ENABLE_PREVIEWS}\" = \"YES\" ]; then\n echo \"Not parsing *.udl files during preview builds.\"\n exit 0\nfi\n\n$HOME/.cargo/bin/uniffi-bindgen generate $INPUT_FILE_PATH --language swift --out-dir $PROJECT_DIR/NativeSigner/Generated\n";
};
/* End PBXBuildRule section */

Expand Down Expand Up @@ -1071,7 +1071,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftgen >/dev/null; then\n swiftgen \nelse\n echo \"warning: swiftgen not installed, download from https://github.com/SwiftGen/SwiftGen\"\nfi\n";
shellScript = "if [ $ACTION != \"indexbuild\" ]; then\n if which swiftgen >/dev/null; then\n swiftgen \n else\n echo \"warning: swiftgen not installed, download from https://github.com/SwiftGen/SwiftGen\"\n fi\nfi\n";
};
6DBD21F0289983DB005D539B /* Run Code Formatter */ = {
isa = PBXShellScriptBuildPhase;
Expand All @@ -1089,11 +1089,11 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftformat >/dev/null; then\n swiftformat .\nelse\n echo \"warning: swiftformat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\nfi\n";
shellScript = "\nif [ $ACTION != \"indexbuild\" ]; then\n if which swiftformat >/dev/null; then\n swiftformat .\n else\n echo \"warning: swiftformat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\n fi\nfi\n";
};
6DDEF13528AE65D7004CA2FD /* Build libsigner.a */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
buildActionMask = 12;
files = (
);
inputFileListPaths = (
Expand All @@ -1105,15 +1105,15 @@
outputFileListPaths = (
);
outputPaths = (
"$(PROJECT_DIR)/Frameworks/libsigner.a",
"$(PROJECT_DIR)/libsigner.a",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "bash $PROJECT_DIR/scripts/build_libsigner.sh\n";
shellScript = "if [ $ACTION != \"indexbuild\" ]; then\n bash $PROJECT_DIR/scripts/build_libsigner.sh\nfi\n";
};
6DDEF13A28AE744F004CA2FD /* Generate Database */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
buildActionMask = 12;
files = (
);
inputFileListPaths = (
Expand All @@ -1129,7 +1129,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "bash $PROJECT_DIR/scripts/generate_database.sh\n";
shellScript = "if [ $ACTION != \"indexbuild\" ]; then\n bash $PROJECT_DIR/scripts/generate_database.sh\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -1465,7 +1465,6 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/NativeSigner",
"$(PROJECT_DIR)/NativeSigner/Frameworks",
);
MARKETING_VERSION = 5.1.0;
PRODUCT_BUNDLE_IDENTIFIER = io.parity.NativeSigner;
Expand All @@ -1487,7 +1486,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 50100;
DEVELOPMENT_ASSET_PATHS = "\"NativeSigner/Preview Content\"";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = P2PX3JU8FT;
ENABLE_BITCODE = NO;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = NativeSigner/Info.plist;
Expand All @@ -1499,7 +1498,6 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/NativeSigner",
"$(PROJECT_DIR)/NativeSigner/Frameworks",
);
MARKETING_VERSION = 5.1.0;
PRODUCT_BUNDLE_IDENTIFIER = io.parity.NativeSigner;
Expand Down