cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject [36/50] [abbrv] ios commit: CB-8270 - Update Objective-C unit tests for JSON serialization. Cleaned up unit test workspace as well.
Date Thu, 19 Mar 2015 16:56:25 GMT
CB-8270 - Update Objective-C unit tests for JSON serialization. Cleaned up unit test workspace
as well.


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/987c515c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/987c515c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/987c515c

Branch: refs/heads/unplug-whitelist
Commit: 987c515c97c83423e82ebe2aa62544dbd8410a79
Parents: c057eb7
Author: Shazron Abdullah <shazron@apache.org>
Authored: Wed Mar 18 14:20:07 2015 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Wed Mar 18 14:20:07 2015 -0700

----------------------------------------------------------------------
 tests/CordovaLibTests/CDVBase64Tests.m          |   4 +-
 .../CDVPluginResultJSONSerializationTests.m     |   2 +-
 .../CordovaLibTests.xcodeproj/project.pbxproj   | 196 ++++---------------
 .../xcschemes/CordovaLibApp.xcscheme            |   6 +-
 4 files changed, 49 insertions(+), 159 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/987c515c/tests/CordovaLibTests/CDVBase64Tests.m
----------------------------------------------------------------------
diff --git a/tests/CordovaLibTests/CDVBase64Tests.m b/tests/CordovaLibTests/CDVBase64Tests.m
index 0d44c2a..34c010e 100644
--- a/tests/CordovaLibTests/CDVBase64Tests.m
+++ b/tests/CordovaLibTests/CDVBase64Tests.m
@@ -46,7 +46,7 @@
     NSData* decodedData = [decodedString dataUsingEncoding:NSUTF8StringEncoding];
 
     NSString* expectedEncodedString = @"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwIUAjJCVeJg==";
-    NSString* actualEncodedString = [decodedData base64EncodedString];
+    NSString* actualEncodedString = [decodedData cdv_base64EncodedString];
 
     XCTAssertTrue([expectedEncodedString isEqualToString:actualEncodedString]);
 }
@@ -56,7 +56,7 @@
     NSString* encodedString = @"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwIUAjJCVeJg==";
     NSString* decodedString = @"abcdefghijklmnopqrstuvwxyz1234567890!@#$%^&";
     NSData* encodedData = [decodedString dataUsingEncoding:NSUTF8StringEncoding];
-    NSData* decodedData = [NSData dataFromBase64String:encodedString];
+    NSData* decodedData = [NSData cdv_dataFromBase64String:encodedString];
 
     XCTAssertTrue([encodedData isEqualToData:decodedData]);
 }

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/987c515c/tests/CordovaLibTests/CDVPluginResultJSONSerializationTests.m
----------------------------------------------------------------------
diff --git a/tests/CordovaLibTests/CDVPluginResultJSONSerializationTests.m b/tests/CordovaLibTests/CDVPluginResultJSONSerializationTests.m
index 83ed4d4..fbecaaa 100644
--- a/tests/CordovaLibTests/CDVPluginResultJSONSerializationTests.m
+++ b/tests/CordovaLibTests/CDVPluginResultJSONSerializationTests.m
@@ -21,7 +21,7 @@
 #import <XCTest/XCTest.h>
 
 #import <Cordova/CDVPluginResult.h>
-#import <Cordova/CDVJSON.h>
+#import "CDVJSON_private.h"
 
 @interface CDVPluginResultJSONSerializationTests : XCTestCase
 @end

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/987c515c/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj b/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
index be2e74a..eb6ce33 100644
--- a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
+++ b/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
@@ -7,12 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3019D58D1918C00C00D72DCC /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef
= 3019D58B1918BFF800D72DCC /* XCTest.framework */; };
-		302193F91745430F00BC8D2B /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef
= 302193F81745430F00BC8D2B /* ImageIO.framework */; };
 		3035621714104C34006C2D43 /* CDVWhitelistTests.m in Sources */ = {isa = PBXBuildFile; fileRef
= 30356213141049E1006C2D43 /* CDVWhitelistTests.m */; };
-		303A406A152124BB00182201 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef
= 686357AA141002F100DF4CF2 /* UIKit.framework */; };
-		303A406B152124BB00182201 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357AC141002F100DF4CF2 /* Foundation.framework */; };
-		303A406C152124BB00182201 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357AE141002F100DF4CF2 /* CoreGraphics.framework */; };
 		303A4072152124BB00182201 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef
= 303A4070152124BB00182201 /* InfoPlist.strings */; };
 		303A4074152124BB00182201 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A4073152124BB00182201
/* main.m */; };
 		303A4078152124BB00182201 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef
= 303A4077152124BB00182201 /* AppDelegate.m */; };
@@ -21,33 +16,12 @@
 		3062D1AE151D4D9D000D9128 /* CDVLocalStorageTests.m in Sources */ = {isa = PBXBuildFile;
fileRef = 3062D1AD151D4D9D000D9128 /* CDVLocalStorageTests.m */; };
 		30B342F515224B360070E6A5 /* CDVWebViewTest.m in Sources */ = {isa = PBXBuildFile; fileRef
= 30B342F415224B360070E6A5 /* CDVWebViewTest.m */; };
 		30D1B08C15A2B36D0060C291 /* CDVBase64Tests.m in Sources */ = {isa = PBXBuildFile; fileRef
= 30D1B08B15A2B36D0060C291 /* CDVBase64Tests.m */; };
-		30F8AE0515212587006625B3 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 68A32D7414103017006B237C /* AddressBook.framework */; };
-		30F8AE0615212587006625B3 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357CC14100AAD00DF4CF2 /* AddressBookUI.framework */; };
-		30F8AE0715212587006625B3 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357CE14100ADA00DF4CF2 /* AudioToolbox.framework */; };
-		30F8AE0815212587006625B3 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357CF14100ADB00DF4CF2 /* AVFoundation.framework */; };
-		30F8AE0915212587006625B3 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357D014100ADE00DF4CF2 /* CoreLocation.framework */; };
-		30F8AE0A15212587006625B3 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357DC14100B1600DF4CF2 /* CoreMedia.framework */; };
-		30F8AE0B15212587006625B3 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357D414100AF200DF4CF2 /* SystemConfiguration.framework */; };
-		30F8AE0C152125B6006625B3 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357D214100AE700DF4CF2 /* MobileCoreServices.framework */; };
 		30F8AE1D152129DA006625B3 /* www in Resources */ = {isa = PBXBuildFile; fileRef = 30F8AE1C152129DA006625B3
/* www */; };
 		686357B5141002F200DF4CF2 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef
= 686357B3141002F200DF4CF2 /* InfoPlist.strings */; };
 		686357BA141002F200DF4CF2 /* CDVPluginResultJSONSerializationTests.m in Sources */ = {isa
= PBXBuildFile; fileRef = 686357B9141002F200DF4CF2 /* CDVPluginResultJSONSerializationTests.m
*/; };
-		68A32D7514103017006B237C /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 68A32D7414103017006B237C /* AddressBook.framework */; };
-		68A32D7614103078006B237C /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357DC14100B1600DF4CF2 /* CoreMedia.framework */; };
-		68A32D7714103082006B237C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357CE14100ADA00DF4CF2 /* AudioToolbox.framework */; };
-		68A32D781410308B006B237C /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357CF14100ADB00DF4CF2 /* AVFoundation.framework */; };
-		68A32D7914103097006B237C /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357D014100ADE00DF4CF2 /* CoreLocation.framework */; };
-		68A32D7A141030AB006B237C /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357D214100AE700DF4CF2 /* MobileCoreServices.framework */; };
-		68A32D7B141030C8006B237C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357D414100AF200DF4CF2 /* SystemConfiguration.framework */; };
-		68A32D7C141030D0006B237C /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357CC14100AAD00DF4CF2 /* AddressBookUI.framework */; };
-		68A32D7D141030E4006B237C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357AE141002F100DF4CF2 /* CoreGraphics.framework */; };
-		68A32D7E141030EB006B237C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef
= 686357AA141002F100DF4CF2 /* UIKit.framework */; };
-		68A32D7F141030F3006B237C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 686357AC141002F100DF4CF2 /* Foundation.framework */; };
-		7E4F37A119E753FE0005159C /* libCordova.a in Frameworks */ = {isa = PBXBuildFile; fileRef
= 7E4F379E19E753740005159C /* libCordova.a */; };
 		7E91406017711D88002C6A3F /* CDVWebViewDelegateTests.m in Sources */ = {isa = PBXBuildFile;
fileRef = 7E91405F17711D88002C6A3F /* CDVWebViewDelegateTests.m */; };
+		7ED95D5E1ABA2098008C4574 /* libCordova.a in Frameworks */ = {isa = PBXBuildFile; fileRef
= 7ED95D5D1ABA2098008C4574 /* libCordova.a */; };
 		7EF33BD71911ABA20048544E /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile;
fileRef = 7EF33BD61911ABA20048544E /* Default-568h@2x.png */; };
-		8220B5C216D541BD00EC3921 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 8220B5C116D541BD00EC3921 /* AssetsLibrary.framework */; };
-		8220B5C616D542F500EC3921 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 8220B5C116D541BD00EC3921 /* AssetsLibrary.framework */; };
 		EB89634A15FE66EA00E12277 /* CDVInvokedUrlCommandTests.m in Sources */ = {isa = PBXBuildFile;
fileRef = EB89634915FE66EA00E12277 /* CDVInvokedUrlCommandTests.m */; };
 		EB96677216ADBCF500D86CDF /* CDVUserAgentTest.m in Sources */ = {isa = PBXBuildFile; fileRef
= EB96677116ADBCF500D86CDF /* CDVUserAgentTest.m */; };
 		EBA3554615A731F100F4DE24 /* CDVFakeFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef
= EBA3554515A731F100F4DE24 /* CDVFakeFileManager.m */; };
@@ -63,32 +37,9 @@
 			remoteGlobalIDString = 303A4067152124BB00182201;
 			remoteInfo = CordovaLibApp;
 		};
-		7E4F379D19E753740005159C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 7E4F379919E753740005159C /* CordovaLib.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 68A32D7114102E1C006B237C;
-			remoteInfo = CordovaLib;
-		};
-		7E4F379F19E753B40005159C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 7E4F379919E753740005159C /* CordovaLib.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = D2AAC07D0554694100DB518D;
-			remoteInfo = CordovaLib;
-		};
-		7E4F37A219E754240005159C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 7E4F379919E753740005159C /* CordovaLib.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = D2AAC07D0554694100DB518D;
-			remoteInfo = CordovaLib;
-		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		3019D58B1918BFF800D72DCC /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework;
sourceTree = DEVELOPER_DIR; };
-		302193F81745430F00BC8D2B /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework;
sourceTree = SDKROOT; };
 		30356213141049E1006C2D43 /* CDVWhitelistTests.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path = CDVWhitelistTests.m; sourceTree = "<group>";
};
 		303A4068152124BB00182201 /* CordovaLibApp.app */ = {isa = PBXFileReference; explicitFileType
= wrapper.application; includeInIndex = 0; path = CordovaLibApp.app; sourceTree = BUILT_PRODUCTS_DIR;
};
 		303A406F152124BB00182201 /* CordovaLibApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType
= text.plist; path = "CordovaLibApp-Info.plist"; sourceTree = "<group>"; };
@@ -104,36 +55,20 @@
 		30D1B08B15A2B36D0060C291 /* CDVBase64Tests.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path = CDVBase64Tests.m; sourceTree = "<group>";
};
 		30F8AE1C152129DA006625B3 /* www */ = {isa = PBXFileReference; lastKnownFileType = folder;
path = www; sourceTree = "<group>"; };
 		686357A9141002F100DF4CF2 /* CordovaLibTests.xctest */ = {isa = PBXFileReference; explicitFileType
= wrapper.cfbundle; includeInIndex = 0; path = CordovaLibTests.xctest; sourceTree = BUILT_PRODUCTS_DIR;
};
-		686357AA141002F100DF4CF2 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework;
sourceTree = SDKROOT; };
-		686357AC141002F100DF4CF2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework;
sourceTree = SDKROOT; };
-		686357AE141002F100DF4CF2 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework;
sourceTree = SDKROOT; };
 		686357B2141002F200DF4CF2 /* CordovaLibTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType
= text.plist.xml; path = "CordovaLibTests-Info.plist"; sourceTree = "<group>"; };
 		686357B4141002F200DF4CF2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings;
name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		686357B9141002F200DF4CF2 /* CDVPluginResultJSONSerializationTests.m */ = {isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc; path = CDVPluginResultJSONSerializationTests.m; sourceTree
= "<group>"; };
-		686357CC14100AAD00DF4CF2 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework;
sourceTree = SDKROOT; };
-		686357CE14100ADA00DF4CF2 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework;
sourceTree = SDKROOT; };
-		686357CF14100ADB00DF4CF2 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework;
sourceTree = SDKROOT; };
-		686357D014100ADE00DF4CF2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework;
sourceTree = SDKROOT; };
-		686357D214100AE700DF4CF2 /* MobileCoreServices.framework */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework;
sourceTree = SDKROOT; };
-		686357D414100AF200DF4CF2 /* SystemConfiguration.framework */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework;
sourceTree = SDKROOT; };
-		686357DC14100B1600DF4CF2 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework;
sourceTree = SDKROOT; };
-		68A32D7414103017006B237C /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework;
sourceTree = SDKROOT; };
-		7E4F379119E74D610005159C /* libCordova.a */ = {isa = PBXFileReference; lastKnownFileType
= archive.ar; name = libCordova.a; path = "../../CordovaLib/build/Debug-iphoneos/libCordova.a";
sourceTree = "<group>"; };
-		7E4F379319E74DE70005159C /* libCordova.a */ = {isa = PBXFileReference; lastKnownFileType
= archive.ar; name = libCordova.a; path = "../../CordovaLib/build/Debug-iphoneos/libCordova.a";
sourceTree = "<group>"; };
-		7E4F379519E752070005159C /* libCordova.a */ = {isa = PBXFileReference; lastKnownFileType
= archive.ar; name = libCordova.a; path = "../../CordovaLib/build/Debug-iphoneos/libCordova.a";
sourceTree = "<group>"; };
-		7E4F379719E752230005159C /* libCordova.a */ = {isa = PBXFileReference; lastKnownFileType
= archive.ar; name = libCordova.a; path = "../../CordovaLib/build/Debug-iphoneos/libCordova.a";
sourceTree = "<group>"; };
-		7E4F379919E753740005159C /* CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType
= "wrapper.pb-project"; name = CordovaLib.xcodeproj; path = ../../CordovaLib/CordovaLib.xcodeproj;
sourceTree = "<group>"; };
 		7E91405F17711D88002C6A3F /* CDVWebViewDelegateTests.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path = CDVWebViewDelegateTests.m; sourceTree =
"<group>"; };
+		7ED95D5D1ABA2098008C4574 /* libCordova.a */ = {isa = PBXFileReference; lastKnownFileType
= archive.ar; name = libCordova.a; path = "../../../../../../Library/Developer/Xcode/DerivedData/cordova-ios-hirjxekmjkchqifveonwrrdrhjqd/Build/Products/Debug-iphoneos/libCordova.a";
sourceTree = "<group>"; };
 		7EF33BD61911ABA20048544E /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType
= image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
-		8220B5C116D541BD00EC3921 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework;
sourceTree = SDKROOT; };
 		EB89634915FE66EA00E12277 /* CDVInvokedUrlCommandTests.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path = CDVInvokedUrlCommandTests.m; sourceTree
= "<group>"; };
 		EB96677116ADBCF500D86CDF /* CDVUserAgentTest.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path = CDVUserAgentTest.m; sourceTree = "<group>";
};
 		EBA3550F15A5F18900F4DE24 /* CDVWebViewTest.h */ = {isa = PBXFileReference; lastKnownFileType
= sourcecode.c.h; path = CDVWebViewTest.h; sourceTree = "<group>"; };
 		EBA3554415A731F100F4DE24 /* CDVFakeFileManager.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; path = CDVFakeFileManager.h; sourceTree = "<group>";
};
 		EBA3554515A731F100F4DE24 /* CDVFakeFileManager.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path = CDVFakeFileManager.m; sourceTree = "<group>";
};
 		EBA7F20417962CCD001A0CE6 /* CDVStartPageTests.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path = CDVStartPageTests.m; sourceTree = "<group>";
};
+		ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>";
};
 		F8EB14D0165FFD3200616F39 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType
= text.xml; name = config.xml; path = CordovaLibApp/config.xml; sourceTree = "<group>";
};
-		ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "Bridging-Header.h";
sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -141,20 +76,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7E4F37A119E753FE0005159C /* libCordova.a in Frameworks */,
-				302193F91745430F00BC8D2B /* ImageIO.framework in Frameworks */,
-				8220B5C216D541BD00EC3921 /* AssetsLibrary.framework in Frameworks */,
-				30F8AE0C152125B6006625B3 /* MobileCoreServices.framework in Frameworks */,
-				30F8AE0515212587006625B3 /* AddressBook.framework in Frameworks */,
-				30F8AE0615212587006625B3 /* AddressBookUI.framework in Frameworks */,
-				30F8AE0715212587006625B3 /* AudioToolbox.framework in Frameworks */,
-				30F8AE0815212587006625B3 /* AVFoundation.framework in Frameworks */,
-				30F8AE0915212587006625B3 /* CoreLocation.framework in Frameworks */,
-				30F8AE0A15212587006625B3 /* CoreMedia.framework in Frameworks */,
-				303A406B152124BB00182201 /* Foundation.framework in Frameworks */,
-				30F8AE0B15212587006625B3 /* SystemConfiguration.framework in Frameworks */,
-				303A406A152124BB00182201 /* UIKit.framework in Frameworks */,
-				303A406C152124BB00182201 /* CoreGraphics.framework in Frameworks */,
+				7ED95D5E1ABA2098008C4574 /* libCordova.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -162,19 +84,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3019D58D1918C00C00D72DCC /* XCTest.framework in Frameworks */,
-				68A32D7514103017006B237C /* AddressBook.framework in Frameworks */,
-				8220B5C616D542F500EC3921 /* AssetsLibrary.framework in Frameworks */,
-				68A32D7614103078006B237C /* CoreMedia.framework in Frameworks */,
-				68A32D7714103082006B237C /* AudioToolbox.framework in Frameworks */,
-				68A32D781410308B006B237C /* AVFoundation.framework in Frameworks */,
-				68A32D7914103097006B237C /* CoreLocation.framework in Frameworks */,
-				68A32D7A141030AB006B237C /* MobileCoreServices.framework in Frameworks */,
-				68A32D7B141030C8006B237C /* SystemConfiguration.framework in Frameworks */,
-				68A32D7C141030D0006B237C /* AddressBookUI.framework in Frameworks */,
-				68A32D7D141030E4006B237C /* CoreGraphics.framework in Frameworks */,
-				68A32D7E141030EB006B237C /* UIKit.framework in Frameworks */,
-				68A32D7F141030F3006B237C /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -206,25 +115,7 @@
 		0867D69AFE84028FC02AAC07 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				7E4F379919E753740005159C /* CordovaLib.xcodeproj */,
-				7E4F379719E752230005159C /* libCordova.a */,
-				7E4F379519E752070005159C /* libCordova.a */,
-				7E4F379319E74DE70005159C /* libCordova.a */,
-				7E4F379119E74D610005159C /* libCordova.a */,
-				3019D58B1918BFF800D72DCC /* XCTest.framework */,
-				302193F81745430F00BC8D2B /* ImageIO.framework */,
-				68A32D7414103017006B237C /* AddressBook.framework */,
-				8220B5C116D541BD00EC3921 /* AssetsLibrary.framework */,
-				686357DC14100B1600DF4CF2 /* CoreMedia.framework */,
-				686357CE14100ADA00DF4CF2 /* AudioToolbox.framework */,
-				686357CF14100ADB00DF4CF2 /* AVFoundation.framework */,
-				686357D014100ADE00DF4CF2 /* CoreLocation.framework */,
-				686357D214100AE700DF4CF2 /* MobileCoreServices.framework */,
-				686357D414100AF200DF4CF2 /* SystemConfiguration.framework */,
-				686357CC14100AAD00DF4CF2 /* AddressBookUI.framework */,
-				686357AA141002F100DF4CF2 /* UIKit.framework */,
-				686357AC141002F100DF4CF2 /* Foundation.framework */,
-				686357AE141002F100DF4CF2 /* CoreGraphics.framework */,
+				7ED95D5D1ABA2098008C4574 /* libCordova.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -262,14 +153,6 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		7E4F379A19E753740005159C /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				7E4F379E19E753740005159C /* libCordova.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		EB3B34F4161B585D003DBE7D /* CordovaLibTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -306,7 +189,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				7E4F37A019E753B40005159C /* PBXTargetDependency */,
 			);
 			name = CordovaLibApp;
 			productName = CordovaLibApp;
@@ -325,7 +207,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				7E4F37A319E754240005159C /* PBXTargetDependency */,
 				30F8AE3315212F07006625B3 /* PBXTargetDependency */,
 			);
 			name = CordovaLibTests;
@@ -355,12 +236,6 @@
 			mainGroup = 0867D691FE84028FC02AAC07 /* CordovaLib */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = 7E4F379A19E753740005159C /* Products */;
-					ProjectRef = 7E4F379919E753740005159C /* CordovaLib.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
 				686357A8141002F100DF4CF2 /* CordovaLibTests */,
@@ -369,16 +244,6 @@
 		};
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-		7E4F379E19E753740005159C /* libCordova.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libCordova.a;
-			remoteRef = 7E4F379D19E753740005159C /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
 		303A4066152124BB00182201 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -470,16 +335,6 @@
 			target = 303A4067152124BB00182201 /* CordovaLibApp */;
 			targetProxy = 30F8AE3215212F07006625B3 /* PBXContainerItemProxy */;
 		};
-		7E4F37A019E753B40005159C /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = CordovaLib;
-			targetProxy = 7E4F379F19E753B40005159C /* PBXContainerItemProxy */;
-		};
-		7E4F37A319E754240005159C /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = CordovaLib;
-			targetProxy = 7E4F37A219E754240005159C /* PBXContainerItemProxy */;
-		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -505,6 +360,7 @@
 		1DEB922308733DC00010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -525,6 +381,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DDEBUG";
 				OTHER_LDFLAGS = (
@@ -534,16 +391,16 @@
 				PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				SWIFT_OBJC_BRIDGING_HEADER = "__PROJECT_NAME__/Bridging-Header.h";
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "Classes/**";
+				USER_HEADER_SEARCH_PATHS = "Classes/** \"${BUILT_PRODUCTS_DIR}\"";
 			};
 			name = Debug;
 		};
 		1DEB922408733DC00010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -563,6 +420,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-all_load",
@@ -571,10 +429,9 @@
 				PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				SWIFT_OBJC_BRIDGING_HEADER = "__PROJECT_NAME__/Bridging-Header.h";
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "Classes/**";
+				USER_HEADER_SEARCH_PATHS = "Classes/** \"${BUILT_PRODUCTS_DIR}\"";
 			};
 			name = Release;
 		};
@@ -582,6 +439,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
@@ -597,8 +455,16 @@
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+				);
 				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",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
@@ -610,6 +476,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
@@ -620,8 +487,17 @@
 				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",
+				);
 				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",
+				);
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -636,6 +512,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/CordovaLibApp.app/CordovaLibApp";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
@@ -647,6 +524,11 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(BUILT_PRODUCTS_DIR)/usr/local/include",
+				);
 				INFOPLIST_FILE = "CordovaLibTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = YES;
@@ -665,6 +547,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/CordovaLibApp.app/CordovaLibApp";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
@@ -674,6 +557,11 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(BUILT_PRODUCTS_DIR)/usr/local/include",
+				);
 				INFOPLIST_FILE = "CordovaLibTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = NO;

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/987c515c/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme
----------------------------------------------------------------------
diff --git a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme
index 41f6d8e..93ab0f3 100644
--- a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme
+++ b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme
@@ -90,7 +90,8 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "303A4067152124BB00182201"
@@ -108,7 +109,8 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "303A4067152124BB00182201"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message