Updated Branches: refs/heads/master 0476a1953 -> d9a153c4d
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d9a153c4/lib/cordova-ios/bin/templates/project/__TESTING__/Classes/AppDelegate.m ---------------------------------------------------------------------- diff --git a/lib/cordova-ios/bin/templates/project/__TESTING__/Classes/AppDelegate.m b/lib/cordova-ios/bin/templates/project/__TESTING__/Classes/AppDelegate.m index 623ad8e..5c05ac8 100644 --- a/lib/cordova-ios/bin/templates/project/__TESTING__/Classes/AppDelegate.m +++ b/lib/cordova-ios/bin/templates/project/__TESTING__/Classes/AppDelegate.m @@ -45,7 +45,11 @@ int cacheSizeMemory = 8 * 1024 * 1024; // 8MB int cacheSizeDisk = 32 * 1024 * 1024; // 32MB - NSURLCache* sharedCache = [[[NSURLCache alloc] initWithMemoryCapacity:cacheSizeMemory diskCapacity:cacheSizeDisk diskPath:@"nsurlcache"] autorelease]; +#if __has_feature(objc_arc) + NSURLCache* sharedCache = [[NSURLCache alloc] initWithMemoryCapacity:cacheSizeMemory diskCapacity:cacheSizeDisk diskPath:@"nsurlcache"]; +#else + NSURLCache* sharedCache = [[[NSURLCache alloc] initWithMemoryCapacity:cacheSizeMemory diskCapacity:cacheSizeDisk diskPath:@"nsurlcache"] autorelease]; +#endif [NSURLCache setSharedURLCache:sharedCache]; self = [super init]; @@ -61,10 +65,18 @@ { CGRect screenBounds = [[UIScreen mainScreen] bounds]; - self.window = [[[UIWindow alloc] initWithFrame:screenBounds] autorelease]; +#if __has_feature(objc_arc) + self.window = [[UIWindow alloc] initWithFrame:screenBounds]; +#else + self.window = [[[UIWindow alloc] initWithFrame:screenBounds] autorelease]; +#endif self.window.autoresizesSubviews = YES; - self.viewController = [[[MainViewController alloc] init] autorelease]; +#if __has_feature(objc_arc) + self.viewController = [[MainViewController alloc] init]; +#else + self.viewController = [[[MainViewController alloc] init] autorelease]; +#endif self.viewController.useSplashScreen = YES; // Set your app's start page by setting the <content src='foo.html' /> tag in config.xml. http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d9a153c4/lib/cordova-ios/bin/templates/project/__TESTING__/config.xml ---------------------------------------------------------------------- diff --git a/lib/cordova-ios/bin/templates/project/__TESTING__/config.xml b/lib/cordova-ios/bin/templates/project/__TESTING__/config.xml index 8889726..537705d 100644 --- a/lib/cordova-ios/bin/templates/project/__TESTING__/config.xml +++ b/lib/cordova-ios/bin/templates/project/__TESTING__/config.xml @@ -46,7 +46,6 @@ <plugin name="Camera" value="CDVCamera" /> <plugin name="NetworkStatus" value="CDVConnection" /> <plugin name="Contacts" value="CDVContacts" /> - <plugin name="Debug Console" value="CDVDebugConsole" /> <plugin name="Echo" value="CDVEcho" /> <plugin name="File" value="CDVFile" /> <plugin name="FileTransfer" value="CDVFileTransfer" /> http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d9a153c4/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index 89c0df8..b86ae89 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova", - "version": "2.6.2", + "version": "2.7.0-rc.1", "preferGlobal": "true", "description": "Cordova command line interface tool", "main": "cordova",
