Repository: cordova-ios Updated Branches: refs/heads/master 34da32625 -> 3964a50b0
CB-10004 - Rename CDVSystemSchemes plugin name to something more appropriate Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/3964a50b Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/3964a50b Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/3964a50b Branch: refs/heads/master Commit: 3964a50b0ed01ca9822c2c6e30cd3a8514b45504 Parents: 34da326 Author: Shazron Abdullah <[email protected]> Authored: Tue Nov 17 16:15:41 2015 -0800 Committer: Shazron Abdullah <[email protected]> Committed: Tue Nov 17 16:15:41 2015 -0800 ---------------------------------------------------------------------- .../CDVIntentAndNavigationFilter.h | 24 +++++ .../CDVIntentAndNavigationFilter.m | 98 ++++++++++++++++++++ .../Plugins/CDVSystemSchemes/CDVSystemSchemes.h | 24 ----- .../Plugins/CDVSystemSchemes/CDVSystemSchemes.m | 98 -------------------- CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 22 ++--- .../project/__PROJECT_NAME__/config.xml | 4 +- bin/templates/scripts/cordova/defaults.xml | 4 +- tests/CordovaLibTests/CordovaLibApp/config.xml | 4 +- .../CordovaLibTests.xcodeproj/project.pbxproj | 47 ++-------- 9 files changed, 149 insertions(+), 176 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3964a50b/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.h ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.h b/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.h new file mode 100644 index 0000000..7f18c59 --- /dev/null +++ b/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.h @@ -0,0 +1,24 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import "CDVPlugin.h" + +@interface CDVIntentAndNavigationFilter : CDVPlugin <NSXMLParserDelegate> + +@end http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3964a50b/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m b/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m new file mode 100644 index 0000000..67eb2e5 --- /dev/null +++ b/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m @@ -0,0 +1,98 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import "CDVIntentAndNavigationFilter.h" +#import <Cordova/CDV.h> + +@interface CDVIntentAndNavigationFilter () + +@property (nonatomic, readwrite) NSMutableArray* allowIntents; +@property (nonatomic, readwrite) NSMutableArray* allowNavigations; +@property (nonatomic, readwrite) CDVWhitelist* allowIntentsWhitelist; +@property (nonatomic, readwrite) CDVWhitelist* allowNavigationsWhitelist; + +@end + +@implementation CDVIntentAndNavigationFilter + +#pragma mark NSXMLParserDelegate + +- (void)parser:(NSXMLParser*)parser didStartElement:(NSString*)elementName namespaceURI:(NSString*)namespaceURI qualifiedName:(NSString*)qualifiedName attributes:(NSDictionary*)attributeDict +{ + if ([elementName isEqualToString:@"allow-navigation"]) { + [self.allowNavigations addObject:attributeDict[@"href"]]; + } + if ([elementName isEqualToString:@"allow-intent"]) { + [self.allowIntents addObject:attributeDict[@"href"]]; + } +} + +- (void)parserDidStartDocument:(NSXMLParser*)parser +{ + // file: url <allow-navigations> are added by default + self.allowNavigations = [[NSMutableArray alloc] initWithArray:@[ @"file://" ]]; + // no intents are added by default + self.allowIntents = [[NSMutableArray alloc] init]; +} + +- (void)parserDidEndDocument:(NSXMLParser*)parser +{ + self.allowIntentsWhitelist = [[CDVWhitelist alloc] initWithArray:self.allowIntents]; + self.allowIntentsWhitelist.whitelistRejectionFormatString = @"ERROR External navigation rejected - <allow-intent> not set for url='%@'"; + + self.allowNavigationsWhitelist = [[CDVWhitelist alloc] initWithArray:self.allowNavigations]; + self.allowNavigationsWhitelist.whitelistRejectionFormatString = @"ERROR Internal navigation rejected - <allow-navigation> not set for url='%@'"; + +} + +- (void)parser:(NSXMLParser*)parser parseErrorOccurred:(NSError*)parseError +{ + NSAssert(NO, @"config.xml parse error line %ld col %ld", (long)[parser lineNumber], (long)[parser columnNumber]); +} + +#pragma mark CDVPlugin + +- (void)pluginInitialize +{ + if ([self.viewController isKindOfClass:[CDVViewController class]]) { + [(CDVViewController*)self.viewController parseSettingsWithParser:self]; + } +} + +- (BOOL)shouldOverrideLoadWithRequest:(NSURLRequest*)request navigationType:(UIWebViewNavigationType)navigationType +{ + NSURL* url = [request URL]; + + switch (navigationType) { + case UIWebViewNavigationTypeLinkClicked: + // Note that the rejection strings will *only* print if + // it's a link click (and url is not whitelisted by <allow-*>) + if ([self.allowIntentsWhitelist URLIsAllowed:url]) { + // the url *is* in a <allow-intent> tag, push to the system + [[UIApplication sharedApplication] openURL:url]; + return NO; + } + // fall through, to check whether you can load this in the webview + default: + // check whether we can internally navigate to this url + return ([self.allowNavigationsWhitelist URLIsAllowed:url]); + } +} + +@end http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3964a50b/CordovaLib/Classes/Private/Plugins/CDVSystemSchemes/CDVSystemSchemes.h ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/Private/Plugins/CDVSystemSchemes/CDVSystemSchemes.h b/CordovaLib/Classes/Private/Plugins/CDVSystemSchemes/CDVSystemSchemes.h deleted file mode 100644 index 429e244..0000000 --- a/CordovaLib/Classes/Private/Plugins/CDVSystemSchemes/CDVSystemSchemes.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - */ - -#import "CDVPlugin.h" - -@interface CDVSystemSchemes : CDVPlugin <NSXMLParserDelegate> - -@end http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3964a50b/CordovaLib/Classes/Private/Plugins/CDVSystemSchemes/CDVSystemSchemes.m ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/Private/Plugins/CDVSystemSchemes/CDVSystemSchemes.m b/CordovaLib/Classes/Private/Plugins/CDVSystemSchemes/CDVSystemSchemes.m deleted file mode 100644 index b7eaea5..0000000 --- a/CordovaLib/Classes/Private/Plugins/CDVSystemSchemes/CDVSystemSchemes.m +++ /dev/null @@ -1,98 +0,0 @@ -/* - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - */ - -#import "CDVSystemSchemes.h" -#import <Cordova/CDV.h> - -@interface CDVSystemSchemes () - -@property (nonatomic, readwrite) NSMutableArray* allowIntents; -@property (nonatomic, readwrite) NSMutableArray* allowNavigations; -@property (nonatomic, readwrite) CDVWhitelist* allowIntentsWhitelist; -@property (nonatomic, readwrite) CDVWhitelist* allowNavigationsWhitelist; - -@end - -@implementation CDVSystemSchemes - -#pragma mark NSXMLParserDelegate - -- (void)parser:(NSXMLParser*)parser didStartElement:(NSString*)elementName namespaceURI:(NSString*)namespaceURI qualifiedName:(NSString*)qualifiedName attributes:(NSDictionary*)attributeDict -{ - if ([elementName isEqualToString:@"allow-navigation"]) { - [self.allowNavigations addObject:attributeDict[@"href"]]; - } - if ([elementName isEqualToString:@"allow-intent"]) { - [self.allowIntents addObject:attributeDict[@"href"]]; - } -} - -- (void)parserDidStartDocument:(NSXMLParser*)parser -{ - // file: url <allow-navigations> are added by default - self.allowNavigations = [[NSMutableArray alloc] initWithArray:@[ @"file://" ]]; - // no intents are added by default - self.allowIntents = [[NSMutableArray alloc] init]; -} - -- (void)parserDidEndDocument:(NSXMLParser*)parser -{ - self.allowIntentsWhitelist = [[CDVWhitelist alloc] initWithArray:self.allowIntents]; - self.allowIntentsWhitelist.whitelistRejectionFormatString = @"ERROR External navigation rejected - <allow-intent> not set for url='%@'"; - - self.allowNavigationsWhitelist = [[CDVWhitelist alloc] initWithArray:self.allowNavigations]; - self.allowNavigationsWhitelist.whitelistRejectionFormatString = @"ERROR Internal navigation rejected - <allow-navigation> not set for url='%@'"; - -} - -- (void)parser:(NSXMLParser*)parser parseErrorOccurred:(NSError*)parseError -{ - NSAssert(NO, @"config.xml parse error line %ld col %ld", (long)[parser lineNumber], (long)[parser columnNumber]); -} - -#pragma mark CDVPlugin - -- (void)pluginInitialize -{ - if ([self.viewController isKindOfClass:[CDVViewController class]]) { - [(CDVViewController*)self.viewController parseSettingsWithParser:self]; - } -} - -- (BOOL)shouldOverrideLoadWithRequest:(NSURLRequest*)request navigationType:(UIWebViewNavigationType)navigationType -{ - NSURL* url = [request URL]; - - switch (navigationType) { - case UIWebViewNavigationTypeLinkClicked: - // Note that the rejection strings will *only* print if - // it's a link click (and url is not whitelisted by <allow-*>) - if ([self.allowIntentsWhitelist URLIsAllowed:url]) { - // the url *is* in a <allow-intent> tag, push to the system - [[UIApplication sharedApplication] openURL:url]; - return NO; - } - // fall through, to check whether you can load this in the webview - default: - // check whether we can internally navigate to this url - return ([self.allowNavigationsWhitelist URLIsAllowed:url]); - } -} - -@end http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3964a50b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj index 2c0c164..394bc4e 100644 --- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj +++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj @@ -9,8 +9,8 @@ /* Begin PBXBuildFile section */ 30193A501AE6350A0069A75F /* CDVUIWebViewNavigationDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 30193A4E1AE6350A0069A75F /* CDVUIWebViewNavigationDelegate.m */; }; 30193A511AE6350A0069A75F /* CDVUIWebViewNavigationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 30193A4F1AE6350A0069A75F /* CDVUIWebViewNavigationDelegate.h */; }; - 3093E2231B16D6A3003F381A /* CDVSystemSchemes.h in Headers */ = {isa = PBXBuildFile; fileRef = 3093E2211B16D6A3003F381A /* CDVSystemSchemes.h */; }; - 3093E2241B16D6A3003F381A /* CDVSystemSchemes.m in Sources */ = {isa = PBXBuildFile; fileRef = 3093E2221B16D6A3003F381A /* CDVSystemSchemes.m */; }; + 3093E2231B16D6A3003F381A /* CDVIntentAndNavigationFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3093E2211B16D6A3003F381A /* CDVIntentAndNavigationFilter.h */; }; + 3093E2241B16D6A3003F381A /* CDVIntentAndNavigationFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3093E2221B16D6A3003F381A /* CDVIntentAndNavigationFilter.m */; }; 7E7F69B61ABA35D8007546F4 /* CDVLocalStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ED95CFB1AB9028C008C4574 /* CDVLocalStorage.h */; }; 7E7F69B81ABA368F007546F4 /* CDVUIWebViewEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ED95D001AB9028C008C4574 /* CDVUIWebViewEngine.h */; }; 7E7F69B91ABA3692007546F4 /* CDVHandleOpenURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ED95CF81AB9028C008C4574 /* CDVHandleOpenURL.h */; }; @@ -67,8 +67,8 @@ 30193A4E1AE6350A0069A75F /* CDVUIWebViewNavigationDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVUIWebViewNavigationDelegate.m; sourceTree = "<group>"; }; 30193A4F1AE6350A0069A75F /* CDVUIWebViewNavigationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVUIWebViewNavigationDelegate.h; sourceTree = "<group>"; }; 30325A0B136B343700982B63 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; }; - 3093E2211B16D6A3003F381A /* CDVSystemSchemes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVSystemSchemes.h; sourceTree = "<group>"; }; - 3093E2221B16D6A3003F381A /* CDVSystemSchemes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVSystemSchemes.m; sourceTree = "<group>"; }; + 3093E2211B16D6A3003F381A /* CDVIntentAndNavigationFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVIntentAndNavigationFilter.h; sourceTree = "<group>"; }; + 3093E2221B16D6A3003F381A /* CDVIntentAndNavigationFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVIntentAndNavigationFilter.m; sourceTree = "<group>"; }; 68A32D7114102E1C006B237C /* libCordova.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCordova.a; sourceTree = BUILT_PRODUCTS_DIR; }; 7ED95CF21AB9028C008C4574 /* CDVDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVDebug.h; sourceTree = "<group>"; }; 7ED95CF31AB9028C008C4574 /* CDVJSON_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVJSON_private.h; sourceTree = "<group>"; }; @@ -153,13 +153,13 @@ name = CordovaLib; sourceTree = "<group>"; }; - 3093E2201B16D6A3003F381A /* CDVSystemSchemes */ = { + 3093E2201B16D6A3003F381A /* CDVIntentAndNavigationFilter */ = { isa = PBXGroup; children = ( - 3093E2211B16D6A3003F381A /* CDVSystemSchemes.h */, - 3093E2221B16D6A3003F381A /* CDVSystemSchemes.m */, + 3093E2211B16D6A3003F381A /* CDVIntentAndNavigationFilter.h */, + 3093E2221B16D6A3003F381A /* CDVIntentAndNavigationFilter.m */, ); - path = CDVSystemSchemes; + path = CDVIntentAndNavigationFilter; sourceTree = "<group>"; }; 7ED95CF11AB9028C008C4574 /* Private */ = { @@ -180,7 +180,7 @@ isa = PBXGroup; children = ( A3B082D11BB15CEA00D8DC35 /* CDVGestureHandler */, - 3093E2201B16D6A3003F381A /* CDVSystemSchemes */, + 3093E2201B16D6A3003F381A /* CDVIntentAndNavigationFilter */, 7ED95CF71AB9028C008C4574 /* CDVHandleOpenURL */, 7ED95CFA1AB9028C008C4574 /* CDVLocalStorage */, 7ED95CFD1AB9028C008C4574 /* CDVUIWebViewEngine */, @@ -306,7 +306,7 @@ 7ED95D021AB9028C008C4574 /* CDVDebug.h in Headers */, 7ED95D051AB9028C008C4574 /* CDVPlugin+Private.h in Headers */, 7E7F69B61ABA35D8007546F4 /* CDVLocalStorage.h in Headers */, - 3093E2231B16D6A3003F381A /* CDVSystemSchemes.h in Headers */, + 3093E2231B16D6A3003F381A /* CDVIntentAndNavigationFilter.h in Headers */, 7E7F69B81ABA368F007546F4 /* CDVUIWebViewEngine.h in Headers */, 7E7F69B91ABA3692007546F4 /* CDVHandleOpenURL.h in Headers */, 30193A511AE6350A0069A75F /* CDVUIWebViewNavigationDelegate.h in Headers */, @@ -389,7 +389,7 @@ 7ED95D0D1AB9028C008C4574 /* CDVUIWebViewEngine.m in Sources */, 7ED95D461AB9029B008C4574 /* CDVPlugin.m in Sources */, 7ED95D091AB9028C008C4574 /* CDVLocalStorage.m in Sources */, - 3093E2241B16D6A3003F381A /* CDVSystemSchemes.m in Sources */, + 3093E2241B16D6A3003F381A /* CDVIntentAndNavigationFilter.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3964a50b/bin/templates/project/__PROJECT_NAME__/config.xml ---------------------------------------------------------------------- diff --git a/bin/templates/project/__PROJECT_NAME__/config.xml b/bin/templates/project/__PROJECT_NAME__/config.xml index 96a1d42..2995b66 100644 --- a/bin/templates/project/__PROJECT_NAME__/config.xml +++ b/bin/templates/project/__PROJECT_NAME__/config.xml @@ -69,8 +69,8 @@ <param name="ios-package" value="CDVHandleOpenURL"/> <param name="onload" value="true"/> </feature> - <feature name="SystemSchemes"> - <param name="ios-package" value="CDVSystemSchemes"/> + <feature name="IntentAndNavigationFilter"> + <param name="ios-package" value="CDVIntentAndNavigationFilter"/> <param name="onload" value="true"/> </feature> <feature name="GestureHandler"> http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3964a50b/bin/templates/scripts/cordova/defaults.xml ---------------------------------------------------------------------- diff --git a/bin/templates/scripts/cordova/defaults.xml b/bin/templates/scripts/cordova/defaults.xml index f1c3e37..f3ae207 100644 --- a/bin/templates/scripts/cordova/defaults.xml +++ b/bin/templates/scripts/cordova/defaults.xml @@ -43,8 +43,8 @@ <param name="ios-package" value="CDVHandleOpenURL"/> <param name="onload" value="true"/> </feature> - <feature name="SystemSchemes"> - <param name="ios-package" value="CDVSystemSchemes"/> + <feature name="IntentAndNavigationFilter"> + <param name="ios-package" value="CDVIntentAndNavigationFilter"/> <param name="onload" value="true"/> </feature> <feature name="GestureHandler"> http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3964a50b/tests/CordovaLibTests/CordovaLibApp/config.xml ---------------------------------------------------------------------- diff --git a/tests/CordovaLibTests/CordovaLibApp/config.xml b/tests/CordovaLibTests/CordovaLibApp/config.xml index 6bc52d0..8acdea7 100644 --- a/tests/CordovaLibTests/CordovaLibApp/config.xml +++ b/tests/CordovaLibTests/CordovaLibApp/config.xml @@ -57,8 +57,8 @@ <param name="ios-package" value="CDVHandleOpenURL"/> <param name="onload" value="true"/> </feature> - <feature name="SystemSchemes"> - <param name="ios-package" value="CDVSystemSchemes"/> + <feature name="IntentAndNavigationFilter"> + <param name="ios-package" value="CDVIntentAndNavigationFilter"/> <param name="onload" value="true"/> </feature> <feature name="GestureHandler"> http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3964a50b/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --git a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj b/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj index 87c76e0..c4b9007 100644 --- a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj +++ b/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj @@ -443,10 +443,7 @@ CLANG_ENABLE_OBJC_ARC = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -455,16 +452,10 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "CordovaLibApp/CordovaLibApp-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/cordova-ios-hirjxekmjkchqifveonwrrdrhjqd/Build/Products/Debug-iphoneos", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../CordovaLib/Classes/Private/**"; @@ -480,24 +471,14 @@ CLANG_ENABLE_OBJC_ARC = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(BUILT_PRODUCTS_DIR)/usr/local/include", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "CordovaLibApp/CordovaLibApp-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/cordova-ios-hirjxekmjkchqifveonwrrdrhjqd/Build/Products/Debug-iphoneos", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -515,11 +496,7 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; GCC_SYMBOLS_PRIVATE_EXTERN = NO; @@ -532,7 +509,7 @@ "$(BUILT_PRODUCTS_DIR)/include/Cordova/**", ); INFOPLIST_FILE = "CordovaLibTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-all_load", @@ -552,11 +529,7 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; @@ -567,7 +540,7 @@ "$(BUILT_PRODUCTS_DIR)/include/Cordova/**", ); INFOPLIST_FILE = "CordovaLibTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-all_load", --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
