You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2014/03/29 00:34:01 UTC
[01/12] ios commit: CB-6217 iOS simulator targets not consistent
across scripts
Repository: cordova-ios
Updated Branches:
refs/heads/3.4.x a026bbcd4 -> a96d2360f
CB-6217 iOS simulator targets not consistent across scripts
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/f4155e4e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/f4155e4e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/f4155e4e
Branch: refs/heads/3.4.x
Commit: f4155e4e2f2abf783a7ab0c0e0c6a65fa42ad98d
Parents: 9821899
Author: Carlos Santana <cs...@gmail.com>
Authored: Tue Mar 11 11:51:55 2014 -0400
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:09:02 2014 -0700
----------------------------------------------------------------------
bin/templates/scripts/cordova/lib/install-emulator | 15 ++++++++-------
.../scripts/cordova/lib/list-emulator-images | 10 +++++-----
2 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/f4155e4e/bin/templates/scripts/cordova/lib/install-emulator
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/install-emulator b/bin/templates/scripts/cordova/lib/install-emulator
index a928c62..ae2c47a 100755
--- a/bin/templates/scripts/cordova/lib/install-emulator
+++ b/bin/templates/scripts/cordova/lib/install-emulator
@@ -25,7 +25,7 @@
# "iPad (Retina)"
OPTION_RESULT=()
-TARGET="iPhone Retina (3.5-inch)"
+TARGET="iPhone (Retina 3.5-inch)"
TARGET_FLAG='--family iphone --retina'
# separates "key=value", sets an array with 0th index as key, 1st index as value
@@ -65,22 +65,23 @@ TARGET_LC=`echo $TARGET | tr '[:upper:]' '[:lower:]'`
# remember the comparison is lowercase
case "$TARGET_LC" in
- "iphone retina (3.5-inch)")
+ "iphone (retina 3.5-inch)")
TARGET_FLAG="--family iphone --retina"
;;
- "iphone retina (4-inch)")
+ "iphone (retina 4-inch)")
TARGET_FLAG="--family iphone --retina --tall"
;;
- "iphone retina (4-inch 64-bit)")
- TARGET_FLAG="--family iphone --retina --tall --64bit"
- ;;
+ # --64bit not supportted by ios-sim yet
+ #"iphone retina (4-inch 64-bit)")
+ #TARGET_FLAG="--family iphone --retina --tall --64bit"
+ #;;
"iphone")
TARGET_FLAG="--family iphone"
;;
"ipad")
TARGET_FLAG="--family ipad"
;;
- "ipad retina")
+ "ipad (retina)")
TARGET_FLAG="--family ipad --retina"
;;
esac
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/f4155e4e/bin/templates/scripts/cordova/lib/list-emulator-images
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/list-emulator-images b/bin/templates/scripts/cordova/lib/list-emulator-images
index df2586b..a73de7b 100755
--- a/bin/templates/scripts/cordova/lib/list-emulator-images
+++ b/bin/templates/scripts/cordova/lib/list-emulator-images
@@ -26,15 +26,15 @@
set -e
-echo \""iPhone Retina (3.5-inch)"\"
-echo \""iPhone Retina (4-inch)"\"
+echo \""iPhone (Retina 3.5-inch)"\"
+echo \""iPhone (Retina 4-inch)"\"
-# this assumes Xcode 5 minimum
-echo \""iPhone Retina (4-inch 64-bit)"\"
+# this assumes Xcode 5 minimum not supported by ios-sim yet
+# echo \""iPhone (Retina 4-inch 64-bit)"\"
echo \""iPhone"\"
echo \""iPad"\"
-echo \""iPad Retina"\"
+echo \""iPad (Retina)"\"
[09/12] ios commit: Updated VERSION to 3.4.1
Posted by sh...@apache.org.
Updated VERSION to 3.4.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/a4e81b02
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/a4e81b02
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/a4e81b02
Branch: refs/heads/3.4.x
Commit: a4e81b02db88a3c8b20dab6ed3a90b2392ca4f40
Parents: 56eb0a7
Author: Shazron Abdullah <sh...@apache.org>
Authored: Fri Mar 28 16:09:36 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:09:36 2014 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVAvailability.h | 1 +
CordovaLib/VERSION | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/a4e81b02/CordovaLib/Classes/CDVAvailability.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVAvailability.h b/CordovaLib/Classes/CDVAvailability.h
index 32a6f38..57e346e 100644
--- a/CordovaLib/Classes/CDVAvailability.h
+++ b/CordovaLib/Classes/CDVAvailability.h
@@ -48,6 +48,7 @@
#define __CORDOVA_3_2_0 30200
#define __CORDOVA_3_3_0 30300
#define __CORDOVA_3_4_0 30400
+#define __CORDOVA_3_4_1 30401
#define __CORDOVA_NA 99999 /* not available */
/*
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/a4e81b02/CordovaLib/VERSION
----------------------------------------------------------------------
diff --git a/CordovaLib/VERSION b/CordovaLib/VERSION
index 1809198..47b322c 100644
--- a/CordovaLib/VERSION
+++ b/CordovaLib/VERSION
@@ -1 +1 @@
-3.4.0
+3.4.1
[03/12] ios commit: CB-5286 - Fix warnings when compiled under arm64
Posted by sh...@apache.org.
CB-5286 - Fix warnings when compiled under arm64
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/9821899b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/9821899b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/9821899b
Branch: refs/heads/3.4.x
Commit: 9821899b54b49483a19a5162a069ea8ea1e3f401
Parents: 279eefc
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Mar 3 16:14:43 2014 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:09:02 2014 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVConfigParser.m | 4 ++--
CordovaLib/Classes/CDVShared.m | 4 ++--
CordovaLib/Classes/CDVUserAgentUtil.m | 6 +++---
CordovaLib/Classes/CDVViewController.m | 4 ++--
CordovaLib/Classes/CDVWebViewDelegate.m | 12 ++++++------
5 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/9821899b/CordovaLib/Classes/CDVConfigParser.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVConfigParser.m b/CordovaLib/Classes/CDVConfigParser.m
index 7a5685d..4b73b60 100644
--- a/CordovaLib/Classes/CDVConfigParser.m
+++ b/CordovaLib/Classes/CDVConfigParser.m
@@ -62,7 +62,7 @@
pluginsDict[featureName] = value;
}
BOOL paramIsOnload = ([paramName isEqualToString:@"onload"] && [@"true" isEqualToString : value]);
- BOOL attribIsOnload = [@"true" isEqualToString : [attributeDict[@"onload"] lowercaseString]];
+ BOOL attribIsOnload = [@"true" isEqualToString :[attributeDict[@"onload"] lowercaseString]];
if (paramIsOnload || attribIsOnload) {
[self.startupPluginNames addObject:featureName];
}
@@ -82,7 +82,7 @@
- (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
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/9821899b/CordovaLib/Classes/CDVShared.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVShared.m b/CordovaLib/Classes/CDVShared.m
index 0617ece..ac82234 100644
--- a/CordovaLib/Classes/CDVShared.m
+++ b/CordovaLib/Classes/CDVShared.m
@@ -50,8 +50,8 @@
- (NSString*)JSONRepresentation
{
return [NSString stringWithFormat:
- @"{ code: %d, message: '%@'}",
- self.code,
+ @"{ code: %ld, message: '%@'}",
+ (long)self.code,
[self localizedDescription]
];
}
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/9821899b/CordovaLib/Classes/CDVUserAgentUtil.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVUserAgentUtil.m b/CordovaLib/Classes/CDVUserAgentUtil.m
index 8476e53..c3402d0 100644
--- a/CordovaLib/Classes/CDVUserAgentUtil.m
+++ b/CordovaLib/Classes/CDVUserAgentUtil.m
@@ -91,14 +91,14 @@ static NSMutableArray* gPendingSetUserAgentBlocks = nil;
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;
@@ -108,7 +108,7 @@ static NSMutableArray* gPendingSetUserAgentBlocks = nil;
+ (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.
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/9821899b/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.m b/CordovaLib/Classes/CDVViewController.m
index 7bda2cc..3a5cd7d 100644
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@ -506,8 +506,8 @@
{
// 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) {
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/9821899b/CordovaLib/Classes/CDVWebViewDelegate.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVWebViewDelegate.m b/CordovaLib/Classes/CDVWebViewDelegate.m
index 416abfd..b396565 100644
--- a/CordovaLib/Classes/CDVWebViewDelegate.m
+++ b/CordovaLib/Classes/CDVWebViewDelegate.m
@@ -139,13 +139,13 @@ static NSString *stripFragment(NSString* url)
{
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]];
}
- (NSString*)evalForCurrentURL:(UIWebView*)webView
@@ -223,7 +223,7 @@ static NSString *stripFragment(NSString* url)
// 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;
@@ -239,7 +239,7 @@ static NSString *stripFragment(NSString* url)
{
_loadCount = 0;
_state = STATE_WAITING_FOR_LOAD_START;
- 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};
@@ -287,7 +287,7 @@ static NSString *stripFragment(NSString* url)
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;
@@ -307,7 +307,7 @@ static NSString *stripFragment(NSString* url)
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:)]) {
[11/12] ios commit: Minor release notes updates.
Posted by sh...@apache.org.
Minor release notes updates.
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/4398df56
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/4398df56
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/4398df56
Branch: refs/heads/3.4.x
Commit: 4398df56474d56e9d989e655ba2e4e70c84385fd
Parents: d8ee263
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Feb 18 21:40:02 2014 -0500
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:30:01 2014 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4398df56/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5cc3b4f..db440b4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -24,29 +24,26 @@ Update these notes using: git log --pretty=format:'* %s' --topo-order --no-merge
Cordova is a static library that enables developers to include the Cordova API in their iOS application projects easily, and also create new Cordova-based iOS application projects through the command-line.
-### 3.4.0 (201301XX) ###
+### 3.4.0 (201402XX) ###
* CB-5794 iOS build script: 1. don't clean 2. recognize --emulator vs --device
-* Don't show environment vars in build log for copy-www script
* CB-4910 Update CLI project template to point to config.xml at the root now that it's not in www/ by default.
-* Move .gitignore in template to gitignore (and add the dot in the script).
* Fix create script copying project template twice.
* CB-5740 Use UIScrollViewDecelerationRateNormal by default.
* CB-5420 Add device model to User-Agent cache key.
-* Copy config.xml within copy-www-build-step.sh instead of in Copy Resoruces step
+* Copy config.xml within copy-www-build-step.sh instead of in Copy Resources step
* CB-5397 Add a --cli option to bin/create that has ../../www/ ../../merges/ within the project
* CB-5697 Fix location.reload() not firing deviceready.
* CB-4330 Fix hash changes being treated as top-level navigations
* CB-3359 Parse large JSON payloads on a background thread, and yield when executing multiple commands is taking too long.
-* CB-5134 Fix up bugs with new hash-based exec() bridge.
* CB-5134 Add location.hash based exec() bridge.
* CB-5658 Fix whitelist crash when URL path has a space.
* CB-5583 WebView doesn't properly initialize when instantiated from a xib
-* CB-5046: Adding a defaults.xml template
+* CB-5046 Adding a defaults.xml template
* CB-5290 templates: Updated launch images sizes to include the status bar region
* CB-5276 Add ability to load start page from a place other then the bundle folder
* CB-5298 Have bin/create run bin/check_reqs.
-* CB-5328 - .gitignore from cordova-ios excludes `platforms/cordova/build` file
+* CB-5328 Fix .gitignore from cordova-ios excludes `platforms/cordova/build` file
### 3.3.0 (20131214) ###
[06/12] ios commit: CB-4863 - Drop iOS 5.0 support,
and support arm64 (closes #90)
Posted by sh...@apache.org.
CB-4863 - Drop iOS 5.0 support, and support arm64 (closes #90)
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/279eefcb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/279eefcb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/279eefcb
Branch: refs/heads/3.4.x
Commit: 279eefcbaefeaf9993f58516f0c77798df44d0da
Parents: 00cecd2
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Mar 3 15:59:43 2014 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:09:02 2014 -0700
----------------------------------------------------------------------
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 40 +++++++-------------
.../project/__CLI__.xcodeproj/project.pbxproj | 10 +++--
.../__NON-CLI__.xcodeproj/project.pbxproj | 10 +++--
3 files changed, 26 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/279eefcb/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index 730be24..361f6f4 100644
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -375,11 +375,8 @@
armv7,
armv7s,
);
- "ARCHS[sdk=iphoneos7.*]" = (
- armv7,
- armv7s,
- );
- "ARCHS[sdk=iphonesimulator*]" = i386;
+ "ARCHS[sdk=iphoneos7.*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+ "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
DSTROOT = "/tmp/$(PROJECT_NAME).dst";
@@ -392,7 +389,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INSTALL_PATH = /usr/local/lib;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
PRODUCT_NAME = Cordova;
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
SKIP_INSTALL = YES;
@@ -408,11 +405,8 @@
armv7,
armv7s,
);
- "ARCHS[sdk=iphoneos7.*]" = (
- armv7,
- armv7s,
- );
- "ARCHS[sdk=iphonesimulator*]" = i386;
+ "ARCHS[sdk=iphoneos7.*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+ "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
DSTROOT = "/tmp/$(PROJECT_NAME).dst";
GCC_MODEL_TUNING = G5;
@@ -422,7 +416,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INSTALL_PATH = /usr/local/lib;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
PRODUCT_NAME = Cordova;
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
SKIP_INSTALL = YES;
@@ -437,11 +431,8 @@
armv7,
armv7s,
);
- "ARCHS[sdk=iphoneos7.*]" = (
- armv7,
- armv7s,
- );
- "ARCHS[sdk=iphonesimulator*]" = i386;
+ "ARCHS[sdk=iphoneos7.*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+ "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -458,7 +449,7 @@
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 = NO;
OTHER_CFLAGS = "-DDEBUG";
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
@@ -466,7 +457,7 @@
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "";
- VALID_ARCHS = "i386 armv7 armv7s";
+ VALID_ARCHS = "i386 armv7 armv7s arm64";
};
name = Debug;
};
@@ -478,11 +469,8 @@
armv7,
armv7s,
);
- "ARCHS[sdk=iphoneos7.*]" = (
- armv7,
- armv7s,
- );
- "ARCHS[sdk=iphonesimulator*]" = i386;
+ "ARCHS[sdk=iphoneos7.*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+ "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -498,13 +486,13 @@
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 = NO;
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
- VALID_ARCHS = "i386 armv7 armv7s";
+ VALID_ARCHS = "i386 armv7 armv7s arm64";
};
name = Release;
};
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/279eefcb/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/bin/templates/project/__CLI__.xcodeproj/project.pbxproj b/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
index 0c2470f..8c75375 100755
--- a/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
+++ b/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
@@ -470,6 +470,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
@@ -479,7 +480,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
OTHER_LDFLAGS = (
"-weak_framework",
CoreFoundation,
@@ -503,6 +504,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -510,7 +512,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
OTHER_LDFLAGS = (
"-weak_framework",
CoreFoundation,
@@ -554,7 +556,7 @@
"\"$(OBJROOT)/UninstalledProducts/include\"",
"\"$(BUILT_PRODUCTS_DIR)\"",
);
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-weak_framework",
@@ -600,7 +602,7 @@
"\"$(OBJROOT)/UninstalledProducts/include\"",
"\"$(BUILT_PRODUCTS_DIR)\"",
);
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
OTHER_LDFLAGS = (
"-weak_framework",
CoreFoundation,
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/279eefcb/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj b/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
index 85890cb..1ac11f3 100755
--- a/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
+++ b/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
@@ -456,6 +456,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
@@ -465,7 +466,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
OTHER_LDFLAGS = (
"-weak_framework",
CoreFoundation,
@@ -489,6 +490,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -496,7 +498,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
OTHER_LDFLAGS = (
"-weak_framework",
CoreFoundation,
@@ -540,7 +542,7 @@
"\"$(OBJROOT)/UninstalledProducts/include\"",
"\"$(BUILT_PRODUCTS_DIR)\"",
);
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-weak_framework",
@@ -586,7 +588,7 @@
"\"$(OBJROOT)/UninstalledProducts/include\"",
"\"$(BUILT_PRODUCTS_DIR)\"",
);
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
OTHER_LDFLAGS = (
"-weak_framework",
CoreFoundation,
[07/12] ios commit: CB-6287 - Add build script support for arm64
Posted by sh...@apache.org.
CB-6287 - Add build script support for arm64
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/514e958a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/514e958a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/514e958a
Branch: refs/heads/3.4.x
Commit: 514e958aa78a0f6de6074bf9e44d04d0b4910ec5
Parents: f4155e4
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Mar 24 15:20:55 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:09:03 2014 -0700
----------------------------------------------------------------------
bin/templates/scripts/cordova/build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/514e958a/bin/templates/scripts/cordova/build
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/build b/bin/templates/scripts/cordova/build
index 3fe3169..220c3af 100755
--- a/bin/templates/scripts/cordova/build
+++ b/bin/templates/scripts/cordova/build
@@ -51,6 +51,6 @@ done
if (( $EMULATOR )); then
exec xcodebuild -project "$PROJECT_NAME.xcodeproj" -arch i386 -target "$PROJECT_NAME" -configuration $CONFIGURATION -sdk iphonesimulator build VALID_ARCHS="i386" CONFIGURATION_BUILD_DIR="$PROJECT_PATH/build/emulator"
else
- exec xcodebuild -xcconfig "$CORDOVA_PATH/build.xcconfig" -project "$PROJECT_NAME.xcodeproj" ARCHS="armv7 armv7s" -target "$PROJECT_NAME" -configuration $CONFIGURATION -sdk iphoneos build VALID_ARCHS="armv7 armv7s" CONFIGURATION_BUILD_DIR="$PROJECT_PATH/build/device"
+ exec xcodebuild -xcconfig "$CORDOVA_PATH/build.xcconfig" -project "$PROJECT_NAME.xcodeproj" ARCHS="armv7 armv7s arm64" -target "$PROJECT_NAME" -configuration $CONFIGURATION -sdk iphoneos build VALID_ARCHS="armv7 armv7s arm64" CONFIGURATION_BUILD_DIR="$PROJECT_PATH/build/device"
fi
[05/12] ios commit: Validate that callback IDs are always well-formed
Posted by sh...@apache.org.
Validate that callback IDs are always well-formed
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/d5928f63
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/d5928f63
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/d5928f63
Branch: refs/heads/3.4.x
Commit: d5928f63dc49ec92c64e95598095a9aa207cdd1c
Parents: d0f7efd
Author: Ian Clelland <ic...@chromium.org>
Authored: Wed Feb 19 00:37:24 2014 -0500
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:09:02 2014 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVCommandDelegateImpl.h | 1 +
CordovaLib/Classes/CDVCommandDelegateImpl.m | 25 ++++++++++++++++++++++++
2 files changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d5928f63/CordovaLib/Classes/CDVCommandDelegateImpl.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVCommandDelegateImpl.h b/CordovaLib/Classes/CDVCommandDelegateImpl.h
index d35b32d..7b41df7 100644
--- a/CordovaLib/Classes/CDVCommandDelegateImpl.h
+++ b/CordovaLib/Classes/CDVCommandDelegateImpl.h
@@ -26,6 +26,7 @@
@interface CDVCommandDelegateImpl : NSObject <CDVCommandDelegate>{
@private
__weak CDVViewController* _viewController;
+ NSRegularExpression *_callbackIdPattern;
@protected
__weak CDVCommandQueue* _commandQueue;
BOOL _delayResponses;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d5928f63/CordovaLib/Classes/CDVCommandDelegateImpl.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVCommandDelegateImpl.m b/CordovaLib/Classes/CDVCommandDelegateImpl.m
index 5bb56b0..4c0b5cd 100644
--- a/CordovaLib/Classes/CDVCommandDelegateImpl.m
+++ b/CordovaLib/Classes/CDVCommandDelegateImpl.m
@@ -31,6 +31,7 @@
if (self != nil) {
_viewController = viewController;
_commandQueue = _viewController.commandQueue;
+ _callbackIdPattern = nil;
}
return self;
}
@@ -94,6 +95,25 @@
}
}
+- (BOOL)isValidCallbackId:(NSString *)callbackId
+{
+ NSError *err = nil;
+ // Initialize on first use
+ if (_callbackIdPattern == nil) {
+ // Catch any invalid characters in the callback id.
+ _callbackIdPattern = [NSRegularExpression regularExpressionWithPattern:@"[^A-Za-z0-9_-]" options:0 error:&err];
+ if (err != nil) {
+ // Couldn't initialize Regex; No is safer than Yes.
+ return NO;
+ }
+ }
+ // Disallow if too long or if any invalid characters were found.
+ if (([callbackId length] > 100) || [_callbackIdPattern firstMatchInString:callbackId options:0 range:NSMakeRange(0, [callbackId length])]) {
+ return NO;
+ }
+ return YES;
+}
+
- (void)sendPluginResult:(CDVPluginResult*)result callbackId:(NSString*)callbackId
{
CDV_EXEC_LOG(@"Exec(%@): Sending result. Status=%@", callbackId, result.status);
@@ -101,6 +121,11 @@
if ([@"INVALID" isEqualToString : callbackId]) {
return;
}
+ // This occurs when the callback id is malformed.
+ if (![self isValidCallbackId:callbackId]) {
+ NSLog(@"Invalid callback id received by sendPluginResult");
+ return;
+ }
int status = [result.status intValue];
BOOL keepCallback = [result.keepCallback boolValue];
NSString* argumentsAsJSON = [result argumentsAsJSON];
[02/12] ios commit: CB-5018 - bin/create on iOS should use --arc by
default
Posted by sh...@apache.org.
CB-5018 - bin/create on iOS should use --arc by default
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/d0f7efd2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/d0f7efd2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/d0f7efd2
Branch: refs/heads/3.4.x
Commit: d0f7efd2deb1531c6edc910cacf25485572ba8ad
Parents: a026bbc
Author: Shazron Abdullah <sh...@gmail.com>
Authored: Fri Feb 14 16:23:29 2014 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:09:02 2014 -0700
----------------------------------------------------------------------
bin/create | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d0f7efd2/bin/create
----------------------------------------------------------------------
diff --git a/bin/create b/bin/create
index b6aa0d4..90f9ce6 100755
--- a/bin/create
+++ b/bin/create
@@ -33,7 +33,6 @@ set -e
function usage() {
echo "Usage: $0 [--shared] [--arc] [--cli] <path_to_new_project> <package_name> <project_name> [<project_template_dir>]"
echo " --shared (optional): Link directly against the shared copy of the CordovaLib instead of a copy of it."
- echo " --arc (optional): Enable ARC."
echo " --cli (optional): Use the CLI-project template."
echo " <path_to_new_project>: Path to your new Cordova iOS project"
echo " <package_name>: Package name, following reverse-domain style convention"
@@ -43,7 +42,6 @@ function usage() {
}
USE_SHARED=0
-USE_ARC=0
USE_CLI=0
while [ $# -gt 0 ]; do
case "$1" in
@@ -155,10 +153,6 @@ else
"$BINDIR/update_cordova_subproject" "$R.xcodeproj/project.pbxproj" "$PROJECT_PATH/CordovaLib/CordovaLib.xcodeproj/project.pbxproj" > /dev/null
fi
-if [[ $USE_ARC = 1 ]]; then
- /usr/bin/sed -i '' 's/CLANG_ENABLE_OBJC_ARC = NO/CLANG_ENABLE_OBJC_ARC = YES/' "$R.xcodeproj/project.pbxproj" > /dev/null
-fi
-
# Finally copy the scripts
cp -r "$SCRIPT_TEMPLATE_DIR"/* "$PROJECT_PATH/"
[12/12] ios commit: Update RELEASENOTES for 3.4.1
Posted by sh...@apache.org.
Update RELEASENOTES for 3.4.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/a96d2360
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/a96d2360
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/a96d2360
Branch: refs/heads/3.4.x
Commit: a96d2360fa9cf5bb3006abc37bc88b81d87286d3
Parents: 4398df5
Author: Shazron Abdullah <sh...@apache.org>
Authored: Fri Mar 28 16:33:53 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:33:53 2014 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/a96d2360/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index db440b4..9c23a6e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -24,6 +24,19 @@ Update these notes using: git log --pretty=format:'* %s' --topo-order --no-merge
Cordova is a static library that enables developers to include the Cordova API in their iOS application projects easily, and also create new Cordova-based iOS application projects through the command-line.
+
+### 3.4.1 (201403XX) ###
+
+* Update Xcode .pbxproj files according to Xcode 5.1 recommendations
+* CB-6327: Allow '.' in plugin feature names (and therefore callback ids)
+* CB-6287 - Add build script support for arm64
+* CB-6217 iOS simulator targets not consistent across scripts
+* CB-5286 - Fix warnings when compiled under arm64
+* CB-4863 - Drop iOS 5.0 support, and support arm64
+* CB-6150 - objc\_msgSend causes EXC\_BAD\_ACCESS with plugins on arm64
+* Validate that callback IDs are always well-formed
+* CB-5018 - bin/create on iOS should use --arc by default
+
### 3.4.0 (201402XX) ###
* CB-5794 iOS build script: 1. don't clean 2. recognize --emulator vs --device
[08/12] ios commit: CB-6327: Allow '.' in plugin feature names (and
therefore callback ids)
Posted by sh...@apache.org.
CB-6327: Allow '.' in plugin feature names (and therefore callback ids)
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/56eb0a70
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/56eb0a70
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/56eb0a70
Branch: refs/heads/3.4.x
Commit: 56eb0a70b93db082d394435759cfbf0ee05dfdb2
Parents: 514e958
Author: Ian Clelland <ic...@chromium.org>
Authored: Fri Mar 21 13:27:23 2014 -0400
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:09:03 2014 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVCommandDelegateImpl.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/56eb0a70/CordovaLib/Classes/CDVCommandDelegateImpl.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVCommandDelegateImpl.m b/CordovaLib/Classes/CDVCommandDelegateImpl.m
index 4c0b5cd..a72ef46 100644
--- a/CordovaLib/Classes/CDVCommandDelegateImpl.m
+++ b/CordovaLib/Classes/CDVCommandDelegateImpl.m
@@ -101,7 +101,7 @@
// Initialize on first use
if (_callbackIdPattern == nil) {
// Catch any invalid characters in the callback id.
- _callbackIdPattern = [NSRegularExpression regularExpressionWithPattern:@"[^A-Za-z0-9_-]" options:0 error:&err];
+ _callbackIdPattern = [NSRegularExpression regularExpressionWithPattern:@"[^A-Za-z0-9._-]" options:0 error:&err];
if (err != nil) {
// Couldn't initialize Regex; No is safer than Yes.
return NO;
[10/12] ios commit: Update Xcode .pbxproj files according to Xcode
5.1 recommendations
Posted by sh...@apache.org.
Update Xcode .pbxproj files according to Xcode 5.1 recommendations
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/d8ee2632
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/d8ee2632
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/d8ee2632
Branch: refs/heads/3.4.x
Commit: d8ee2632b8e049bacb398f7e3a578e526d4df0dc
Parents: a4e81b0
Author: Shazron Abdullah <sh...@apache.org>
Authored: Fri Mar 28 16:27:31 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:28:25 2014 -0700
----------------------------------------------------------------------
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 4 ++--
bin/templates/project/__CLI__.xcodeproj/project.pbxproj | 6 ++----
bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj | 6 ++----
3 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d8ee2632/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index 361f6f4..7d437a2 100644
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -312,7 +312,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0510;
};
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "CordovaLib" */;
compatibilityVersion = "Xcode 3.2";
@@ -450,7 +450,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
- ONLY_ACTIVE_ARCH = NO;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DDEBUG";
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
SDKROOT = iphoneos;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d8ee2632/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/bin/templates/project/__CLI__.xcodeproj/project.pbxproj b/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
index 8c75375..4fc1058 100755
--- a/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
+++ b/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
@@ -316,7 +316,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0510;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "__CLI__" */;
compatibilityVersion = "Xcode 3.2";
@@ -405,7 +405,7 @@
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cordova/lib/copy-www-build-step.sh";
- showEnvVarsInLog = 0;
+ showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -470,7 +470,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
@@ -504,7 +503,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d8ee2632/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj b/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
index 1ac11f3..a59b3bd 100755
--- a/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
+++ b/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
@@ -302,7 +302,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0510;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "__NON-CLI__" */;
compatibilityVersion = "Xcode 3.2";
@@ -391,7 +391,7 @@
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cordova/lib/copy-www-build-step.sh";
- showEnvVarsInLog = 0;
+ showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -456,7 +456,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
@@ -490,7 +489,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
[04/12] ios commit: CB-6150 - objc_msgSend causes EXC_BAD_ACCESS with
plugins on arm64
Posted by sh...@apache.org.
CB-6150 - objc_msgSend causes EXC_BAD_ACCESS with plugins on arm64
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/00cecd29
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/00cecd29
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/00cecd29
Branch: refs/heads/3.4.x
Commit: 00cecd293195bb015ab30769e28798ed7629c8d9
Parents: d5928f6
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Mar 3 15:18:33 2014 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 28 16:09:02 2014 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVCommandQueue.m | 2 +-
CordovaLib/Classes/CDVViewController.m | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/00cecd29/CordovaLib/Classes/CDVCommandQueue.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVCommandQueue.m b/CordovaLib/Classes/CDVCommandQueue.m
index 902dfa0..1eddfe3 100644
--- a/CordovaLib/Classes/CDVCommandQueue.m
+++ b/CordovaLib/Classes/CDVCommandQueue.m
@@ -194,7 +194,7 @@ static const double MAX_EXECUTION_TIME = .008; // Half of a 60fps frame.
SEL normalSelector = NSSelectorFromString(methodName);
if ([obj respondsToSelector:normalSelector]) {
// [obj performSelector:normalSelector withObject:command];
- objc_msgSend(obj, normalSelector, command);
+ ((void (*)(id, SEL, id))objc_msgSend)(obj, normalSelector, command);
} else {
// There's no method to call, so throw an error.
NSLog(@"ERROR: Method '%@' not defined in Plugin '%@'", methodName, command.className);
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/00cecd29/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.m b/CordovaLib/Classes/CDVViewController.m
index 10cfc44..7bda2cc 100644
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@ -697,7 +697,7 @@
CDVPlugin* plugin = [pluginObjects objectForKey:pluginName];
SEL selector = NSSelectorFromString(@"shouldOverrideLoadWithRequest:navigationType:");
if ([plugin respondsToSelector:selector]) {
- if ((BOOL)objc_msgSend(plugin, selector, request, navigationType) == YES) {
+ if (((BOOL (*)(id, SEL, id, int))objc_msgSend)(plugin, selector, request, navigationType) == YES) {
return NO;
}
}