| Index: AdblockBrowser.xcodeproj/project.pbxproj |
| diff --git a/AdblockBrowser.xcodeproj/project.pbxproj b/AdblockBrowser.xcodeproj/project.pbxproj |
| index 20a0eb16c672cb110633424a1a5599e297c9eb00..a4d3d30b5e3ea48bd3f2396401de321357ccc285 100644 |
| --- a/AdblockBrowser.xcodeproj/project.pbxproj |
| +++ b/AdblockBrowser.xcodeproj/project.pbxproj |
| @@ -1053,7 +1053,6 @@ |
| E95E6F4D1AE52FED0054F779 /* Embed App Extensions */, |
| E9E80F7C1DFEE9CC00DCCC11 /* Copy frameworks */, |
| E92575A01DF0405600B93166 /* Carthage copy frameworks */, |
| - 292D19FB1FD151CE00844215 /* Run SwiftLint */, |
| ); |
| buildRules = ( |
| ); |
| @@ -1234,20 +1233,6 @@ |
| /* End PBXResourcesBuildPhase section */ |
| /* Begin PBXShellScriptBuildPhase section */ |
| - 292D19FB1FD151CE00844215 /* Run SwiftLint */ = { |
| - isa = PBXShellScriptBuildPhase; |
| - buildActionMask = 2147483647; |
| - files = ( |
| - ); |
| - inputPaths = ( |
| - ); |
| - name = "Run SwiftLint"; |
| - outputPaths = ( |
| - ); |
| - runOnlyForDeploymentPostprocessing = 0; |
| - shellPath = /bin/sh; |
| - shellScript = "SWIFTLINT=\"/usr/local/bin/swiftlint\"\nif [ -f $SWIFTLINT ]\nthen\n $SWIFTLINT\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi"; |
| - }; |
| E92575A01DF0405600B93166 /* Carthage copy frameworks */ = { |
| isa = PBXShellScriptBuildPhase; |
| buildActionMask = 2147483647; |
| @@ -1701,7 +1686,11 @@ |
| COPY_PHASE_STRIP = NO; |
| ENABLE_STRICT_OBJC_MSGSEND = YES; |
| ENABLE_TESTABILITY = YES; |
| - FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS"; |
| + FRAMEWORK_SEARCH_PATHS = ( |
| + "$(inherited)", |
| + "$(PROJECT_DIR)/Carthage/Build/iOS", |
| + "$(PROJECT_DIR)/Crashlytics/iOS", |
| + ); |
| GCC_C_LANGUAGE_STANDARD = gnu99; |
| GCC_DYNAMIC_NO_PIC = NO; |
| GCC_NO_COMMON_BLOCKS = YES; |
| @@ -1720,7 +1709,11 @@ |
| GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; |
| GCC_WARN_UNUSED_FUNCTION = YES; |
| GCC_WARN_UNUSED_VARIABLE = YES; |
| - HEADER_SEARCH_PATHS = "$(SRCROOT)/Vendor/**"; |
| + HEADER_SEARCH_PATHS = ( |
| + "$(inherited)", |
| + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, |
| + "$(SRCROOT)/Vendor/**", |
| + ); |
| IPHONEOS_DEPLOYMENT_TARGET = 9.3; |
| MTL_ENABLE_DEBUG_INFO = YES; |
| ONLY_ACTIVE_ARCH = YES; |
| @@ -1763,7 +1756,11 @@ |
| COPY_PHASE_STRIP = NO; |
| ENABLE_NS_ASSERTIONS = NO; |
| ENABLE_STRICT_OBJC_MSGSEND = YES; |
| - FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS"; |
| + FRAMEWORK_SEARCH_PATHS = ( |
| + "$(inherited)", |
| + "$(PROJECT_DIR)/Carthage/Build/iOS", |
| + "$(PROJECT_DIR)/Crashlytics/iOS", |
| + ); |
| GCC_C_LANGUAGE_STANDARD = gnu99; |
| GCC_NO_COMMON_BLOCKS = YES; |
| GCC_PREPROCESSOR_DEFINITIONS = ( |
| @@ -1778,7 +1775,11 @@ |
| GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; |
| GCC_WARN_UNUSED_FUNCTION = YES; |
| GCC_WARN_UNUSED_VARIABLE = YES; |
| - HEADER_SEARCH_PATHS = "$(SRCROOT)/Vendor/**"; |
| + HEADER_SEARCH_PATHS = ( |
| + "$(inherited)", |
| + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, |
| + "$(SRCROOT)/Vendor/**", |
| + ); |
| IPHONEOS_DEPLOYMENT_TARGET = 9.3; |
| MTL_ENABLE_DEBUG_INFO = NO; |
| OTHER_LDFLAGS = "-all_load"; |
| @@ -1948,7 +1949,11 @@ |
| COPY_PHASE_STRIP = NO; |
| ENABLE_NS_ASSERTIONS = NO; |
| ENABLE_STRICT_OBJC_MSGSEND = YES; |
| - FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS"; |
| + FRAMEWORK_SEARCH_PATHS = ( |
| + "$(inherited)", |
| + "$(PROJECT_DIR)/Carthage/Build/iOS", |
| + "$(PROJECT_DIR)/Crashlytics/iOS", |
| + ); |
| GCC_C_LANGUAGE_STANDARD = gnu99; |
| GCC_NO_COMMON_BLOCKS = YES; |
| GCC_PREPROCESSOR_DEFINITIONS = ( |
| @@ -1963,7 +1968,11 @@ |
| GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; |
| GCC_WARN_UNUSED_FUNCTION = YES; |
| GCC_WARN_UNUSED_VARIABLE = YES; |
| - HEADER_SEARCH_PATHS = "$(SRCROOT)/Vendor/**"; |
| + HEADER_SEARCH_PATHS = ( |
| + "$(inherited)", |
| + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, |
| + "$(SRCROOT)/Vendor/**", |
| + ); |
| IPHONEOS_DEPLOYMENT_TARGET = 9.3; |
| MTL_ENABLE_DEBUG_INFO = NO; |
| OTHER_LDFLAGS = "-all_load"; |