Merge branch 'development' into 3.0.0-swift5

This commit is contained in:
Nathan Tannar
2019-04-25 16:07:22 -07:00
17 changed files with 506 additions and 78 deletions
+1 -1
View File
@@ -625,7 +625,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
shellScript = "if which swiftlint >/dev/null; then\n if [ -z \"$CARTHAGE\" ]; then\n swiftlint\n fi\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
};
/* End PBXShellScriptBuildPhase section */