Preparation for v1.0.0

deacons · Oct 14, 2013 · 0c5dcd1 · 0c5dcd1
1 parent 51d7322
commit 0c5dcd1
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 33 deletions.
diff --git a/platforms/ios/CordovaLib/Classes/CDVConfigParser.m b/platforms/ios/CordovaLib/Classes/CDVConfigParser.m
@@ -79,7 +79,7 @@ - (void)parser:(NSXMLParser*)parser didEndElement:(NSString*)elementName namespa
 
 - (void)parser:(NSXMLParser*)parser parseErrorOccurred:(NSError*)parseError
 {
-    NSAssert(NO, @"config.xml parse error line %d col %d", [parser lineNumber], [parser columnNumber]);
+    NSAssert(NO, @"config.xml parse error line %ld col %ld", (long)[parser lineNumber], (long)[parser columnNumber]);
 }
 
 @end
diff --git a/platforms/ios/CordovaLib/Classes/CDVShared.m b/platforms/ios/CordovaLib/Classes/CDVShared.m
@@ -50,8 +50,8 @@ @implementation NSError (JSONMethods)
 - (NSString*)JSONRepresentation
 {
     return [NSString stringWithFormat:
-           @"{ code: %d, message: '%@'}",
-           self.code,
+           @"{ code: %ld, message: '%@'}",
+           (long)self.code,
            [self localizedDescription]
     ];
 }

diff --git a/platforms/ios/CordovaLib/Classes/CDVUserAgentUtil.m b/platforms/ios/CordovaLib/Classes/CDVUserAgentUtil.m
@@ -89,14 +89,14 @@ + (void)releaseLock:(NSInteger*)lockToken
     if (*lockToken == 0) {
         return;
     }
-    NSAssert(gCurrentLockToken == *lockToken, @"Got token %d, expected %d", *lockToken, gCurrentLockToken);
+    NSAssert(gCurrentLockToken == *lockToken, @"Got token %ld, expected %ld", (long)*lockToken, (long)gCurrentLockToken);
 
     VerboseLog(@"Released lock %d", *lockToken);
     if ([gPendingSetUserAgentBlocks count] > 0) {
         void (^block)() = [gPendingSetUserAgentBlocks objectAtIndex:0];
         [gPendingSetUserAgentBlocks removeObjectAtIndex:0];
         gCurrentLockToken = ++gNextLockToken;
-        NSLog(@"Gave lock %d", gCurrentLockToken);
+        NSLog(@"Gave lock %ld", (long)gCurrentLockToken);
         block(gCurrentLockToken);
     } else {
         gCurrentLockToken = 0;
@@ -106,7 +106,7 @@ + (void)releaseLock:(NSInteger*)lockToken
 
 + (void)setUserAgent:(NSString*)value lockToken:(NSInteger)lockToken
 {
-    NSAssert(gCurrentLockToken == lockToken, @"Got token %d, expected %d", lockToken, gCurrentLockToken);
+    NSAssert(gCurrentLockToken == lockToken, @"Got token %ld, expected %ld", (long)lockToken, (long)gCurrentLockToken);
     VerboseLog(@"User-Agent set to: %@", value);
 
     // Setting the UserAgent must occur before a UIWebView is instantiated.

diff --git a/platforms/ios/CordovaLib/Classes/CDVViewController.m b/platforms/ios/CordovaLib/Classes/CDVViewController.m
@@ -478,8 +478,8 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
 {
     // First, ask the webview via JS if it supports the new orientation
     NSString* jsCall = [NSString stringWithFormat:
-        @"window.shouldRotateToOrientation && window.shouldRotateToOrientation(%d);"
-        , [self mapIosOrientationToJsOrientation:interfaceOrientation]];
+        @"window.shouldRotateToOrientation && window.shouldRotateToOrientation(%ld);"
+        , (long)[self mapIosOrientationToJsOrientation:interfaceOrientation]];
     NSString* res = [webView stringByEvaluatingJavaScriptFromString:jsCall];
 
     if ([res length] > 0) {

diff --git a/platforms/ios/CordovaLib/Classes/CDVWebViewDelegate.m b/platforms/ios/CordovaLib/Classes/CDVWebViewDelegate.m
@@ -154,13 +154,13 @@ - (BOOL)isJsLoadTokenSet:(UIWebView*)webView
 {
     NSString* loadToken = [webView stringByEvaluatingJavaScriptFromString:@"window.__cordovaLoadToken"];
 
-    return [[NSString stringWithFormat:@"%d", _curLoadToken] isEqualToString:loadToken];
+    return [[NSString stringWithFormat:@"%ld", (long)_curLoadToken] isEqualToString:loadToken];
 }
 
 - (void)setLoadToken:(UIWebView*)webView
 {
     _curLoadToken += 1;
-    [webView stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"window.__cordovaLoadToken=%d", _curLoadToken]];
+    [webView stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"window.__cordovaLoadToken=%ld", (long)_curLoadToken]];
 }
 
 - (void)pollForPageLoadStart:(UIWebView*)webView
@@ -221,7 +221,7 @@ - (BOOL)webView:(UIWebView*)webView shouldStartLoadWithRequest:(NSURLRequest*)re
                     // Redirect case.
                     // We expect loadCount == 1.
                     if (_loadCount != 1) {
-                        NSLog(@"CDVWebViewDelegate: Detected redirect when loadCount=%d", _loadCount);
+                        NSLog(@"CDVWebViewDelegate: Detected redirect when loadCount=%ld", (long)_loadCount);
                     }
                     break;
 
@@ -237,7 +237,7 @@ - (BOOL)webView:(UIWebView*)webView shouldStartLoadWithRequest:(NSURLRequest*)re
                         _loadCount = 0;
                         _state = STATE_WAITING_FOR_LOAD_START;
                         if (![self request:request isFragmentIdentifierToRequest:webView.request]) {
-                            NSString* description = [NSString stringWithFormat:@"CDVWebViewDelegate: Navigation started when state=%d", _state];
+                            NSString* description = [NSString stringWithFormat:@"CDVWebViewDelegate: Navigation started when state=%ld", (long)_state];
                             NSLog(@"%@", description);
                             if ([_delegate respondsToSelector:@selector(webView:didFailLoadWithError:)]) {
                                 NSDictionary* errorDictionary = @{NSLocalizedDescriptionKey : description};
@@ -286,7 +286,7 @@ - (void)webViewDidStartLoad:(UIWebView*)webView
 
         case STATE_WAITING_FOR_LOAD_START:
             if (_loadCount != 0) {
-                NSLog(@"CDVWebViewDelegate: Unexpected loadCount in didStart. count=%d", _loadCount);
+                NSLog(@"CDVWebViewDelegate: Unexpected loadCount in didStart. count=%ld", (long)_loadCount);
             }
             fireCallback = YES;
             _state = STATE_WAITING_FOR_LOAD_FINISH;
@@ -306,7 +306,7 @@ - (void)webViewDidStartLoad:(UIWebView*)webView
             break;
 
         default:
-            NSLog(@"CDVWebViewDelegate: Unexpected didStart with state=%d loadCount=%d", _state, _loadCount);
+            NSLog(@"CDVWebViewDelegate: Unexpected didStart with state=%ld loadCount=%ld", (long)_state, (long)_loadCount);
     }
     VerboseLog(@"webView didStartLoad (after). state=%d loadCount=%d fireCallback=%d", _state, _loadCount, fireCallback);
     if (fireCallback && [_delegate respondsToSelector:@selector(webViewDidStartLoad:)]) {

diff --git a/platforms/ios/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/platforms/ios/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -378,7 +378,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				"ARCHS[sdk=iphoneos*]" = armv7;
+				"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				"ARCHS[sdk=iphonesimulator*]" = i386;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
@@ -392,7 +392,6 @@
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				PRODUCT_NAME = Cordova;
 				PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
 				SKIP_INSTALL = YES;
@@ -403,7 +402,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				"ARCHS[sdk=iphoneos*]" = armv7;
+				"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				"ARCHS[sdk=iphonesimulator*]" = i386;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				DSTROOT = "/tmp/$(PROJECT_NAME).dst";
@@ -414,7 +413,6 @@
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				PRODUCT_NAME = Cordova;
 				PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
 				SKIP_INSTALL = YES;
@@ -424,7 +422,7 @@
 		1DEB922308733DC00010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				"ARCHS[sdk=iphoneos*]" = armv7;
+				"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				"ARCHS[sdk=iphonesimulator*]" = i386;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -442,22 +440,22 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DDEBUG";
 				PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
-				VALID_ARCHS = "i386 armv7";
+				VALID_ARCHS = "i386 armv7 arm64 armv7s";
 			};
 			name = Debug;
 		};
 		1DEB922408733DC00010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				"ARCHS[sdk=iphoneos*]" = armv7;
+				"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				"ARCHS[sdk=iphonesimulator*]" = i386;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -474,13 +472,15 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				"IPHONEOS_DEPLOYMENT_TARGET[sdk=iphoneos*]" = 6.0;
+				"IPHONEOS_DEPLOYMENT_TARGET[sdk=iphonesimulator*]" = 6.0;
 				ONLY_ACTIVE_ARCH = YES;
 				PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "i386 armv7";
+				VALID_ARCHS = "i386 armv7 arm64 armv7s";
 			};
 			name = Release;
 		};

diff --git a/platforms/ios/TDA-Planner.xcodeproj/project.pbxproj b/platforms/ios/TDA-Planner.xcodeproj/project.pbxproj
@@ -15,7 +15,7 @@
 		1739A3E5180C5859004BA0E9 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 1739A3DD180C5859004BA0E9 /* icon.png */; };
 		1739A3E6180C5859004BA0E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 1739A3DE180C5859004BA0E9 /* [email protected] */; };
 		1739A3E7180C5859004BA0E9 /* iTunesArtwork.png in Resources */ = {isa = PBXBuildFile; fileRef = 1739A3DF180C5859004BA0E9 /* iTunesArtwork.png */; };
-		1739A3ED180C5874004BA0E9 /* Default-568h@2x~iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 1739A3EA180C5874004BA0E9 /* Default-568h@2x~iPhone.png */; };
+		1739A3ED180C5874004BA0E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 1739A3EA180C5874004BA0E9 /* [email protected] */; };
 		1739A3EE180C5874004BA0E9 /* Default@2x~iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 1739A3EB180C5874004BA0E9 /* Default@2x~iPhone.png */; };
 		1739A3EF180C5874004BA0E9 /* Default~iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 1739A3EC180C5874004BA0E9 /* Default~iPhone.png */; };
 		1D3623260D0F684500981E51 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* AppDelegate.m */; };
@@ -71,9 +71,9 @@
 		1739A3DD180C5859004BA0E9 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = "TDA-Planner/Resources/icons/icon.png"; sourceTree = "<group>"; };
 		1739A3DE180C5859004BA0E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "TDA-Planner/Resources/icons/[email protected]"; sourceTree = "<group>"; };
 		1739A3DF180C5859004BA0E9 /* iTunesArtwork.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iTunesArtwork.png; path = "TDA-Planner/Resources/icons/iTunesArtwork.png"; sourceTree = "<group>"; };
-		1739A3EA180C5874004BA0E9 /* Default-568h@2x~iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x~iPhone.png"; sourceTree = "<group>"; };
-		1739A3EB180C5874004BA0E9 /* Default@2x~iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x~iPhone.png"; sourceTree = "<group>"; };
-		1739A3EC180C5874004BA0E9 /* Default~iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default~iPhone.png"; sourceTree = "<group>"; };
+		1739A3EA180C5874004BA0E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "TDA-Planner/Resources/splash/[email protected]"; sourceTree = "<group>"; };
+		1739A3EB180C5874004BA0E9 /* Default@2x~iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x~iPhone.png"; path = "TDA-Planner/Resources/splash/Default@2x~iPhone.png"; sourceTree = "<group>"; };
+		1739A3EC180C5874004BA0E9 /* Default~iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default~iPhone.png"; path = "TDA-Planner/Resources/splash/Default~iPhone.png"; sourceTree = "<group>"; };
 		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		1D3623240D0F684500981E51 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		1D3623250D0F684500981E51 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -171,9 +171,6 @@
 		1739A3E9180C5874004BA0E9 /* splash */ = {
 			isa = PBXGroup;
 			children = (
-				1739A3EA180C5874004BA0E9 /* Default-568h@2x~iPhone.png */,
-				1739A3EB180C5874004BA0E9 /* Default@2x~iPhone.png */,
-				1739A3EC180C5874004BA0E9 /* Default~iPhone.png */,
 			);
 			name = splash;
 			path = "TDA-Planner/Resources/splash";
@@ -206,6 +203,9 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				1739A3EA180C5874004BA0E9 /* [email protected] */,
+				1739A3EB180C5874004BA0E9 /* Default@2x~iPhone.png */,
+				1739A3EC180C5874004BA0E9 /* Default~iPhone.png */,
 				1739A3E9180C5874004BA0E9 /* splash */,
 				1739A3E8180C5862004BA0E9 /* icons */,
 				F840E1F0165FE0F500CFE078 /* config.xml */,
@@ -381,7 +381,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				1739A3E4180C5859004BA0E9 /* icon-120.png in Resources */,
-				1739A3ED180C5874004BA0E9 /* Default-568h@2x~iPhone.png in Resources */,
+				1739A3ED180C5874004BA0E9 /* [email protected] in Resources */,
 				1739A3E1180C5859004BA0E9 /* icon-72.png in Resources */,
 				1739A3E5180C5859004BA0E9 /* icon.png in Resources */,
 				F840E1F1165FE0F500CFE078 /* config.xml in Resources */,

diff --git a/...sources/splash/Default-568h@2x~iphone.png → ...nner/Resources/splash/[email protected] b/...sources/splash/Default-568h@2x~iphone.png → ...nner/Resources/splash/[email protected]
diff --git a/platforms/ios/www/vle.html b/platforms/ios/www/vle.html
@@ -46,7 +46,6 @@ <h1>TDA VLE</h1>
 				<li data-role="fieldcontain">
 					<div class="ui-grid-a">
 						<div class="ui-block-a">
-							<!-- <label><input id="remember" name="remember" type="checkbox">Remember login?</label> -->
 						</div>
 						<div class="ui-block-b">
     	    				<input data-role="button" type="submit" value="Log On" name="SubmitCreds" id="loginButton" />