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/07/22 07:27:16 UTC
[1/7] ios commit: Fix build warnings
Repository: cordova-ios
Updated Branches:
refs/heads/wkwebview 3d39ef4e3 -> 1e84e301b
Fix build warnings
* CordovaLib/Classes/CDVURLProtocol.m:169:46: Implicit conversion loses integer precision: 'long long' to 'unsigned long'
* CordovaLib/Classes/CDVURLProtocol.m:170:100: Implicit conversion loses integer precision: 'long long' to 'NSUInteger' (aka 'unsigned int')
close #99
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/0bf656c3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/0bf656c3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/0bf656c3
Branch: refs/heads/wkwebview
Commit: 0bf656c3bccbe85813964bcf13c6705e0da37192
Parents: 40b9ddf
Author: 利辺羅エルネスト <ri...@cyberagent.co.jp>
Authored: Thu Jul 10 11:44:04 2014 +0900
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jul 14 15:20:10 2014 -0400
----------------------------------------------------------------------
CordovaLib/Classes/CDVURLProtocol.m | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/0bf656c3/CordovaLib/Classes/CDVURLProtocol.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVURLProtocol.m b/CordovaLib/Classes/CDVURLProtocol.m
index feb7c99..3ecb6a0 100644
--- a/CordovaLib/Classes/CDVURLProtocol.m
+++ b/CordovaLib/Classes/CDVURLProtocol.m
@@ -168,8 +168,8 @@ static CDVViewController *viewControllerForRequest(NSURLRequest* request)
// We have the asset! Get the data and send it along.
ALAssetRepresentation* assetRepresentation = [asset defaultRepresentation];
NSString* MIMEType = (__bridge_transfer NSString*)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)[assetRepresentation UTI], kUTTagClassMIMEType);
- Byte* buffer = (Byte*)malloc([assetRepresentation size]);
- NSUInteger bufferSize = [assetRepresentation getBytes:buffer fromOffset:0.0 length:[assetRepresentation size] error:nil];
+ Byte* buffer = (Byte*)malloc((unsigned long)[assetRepresentation size]);
+ NSUInteger bufferSize = [assetRepresentation getBytes:buffer fromOffset:0.0 length:(NSUInteger)[assetRepresentation size] error:nil];
NSData* data = [NSData dataWithBytesNoCopy:buffer length:bufferSize freeWhenDone:YES];
[self sendResponseWithResponseCode:200 data:data mimeType:MIMEType];
} else {
[7/7] ios commit: Merge branch 'master' into wkwebview
Posted by sh...@apache.org.
Merge branch 'master' into wkwebview
Conflicts:
CordovaLib/Classes/CDVPlugin.h
CordovaLib/CordovaLib.xcodeproj/project.pbxproj
bin/templates/project/__CLI__.xcodeproj/project.pbxproj
bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/1e84e301
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/1e84e301
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/1e84e301
Branch: refs/heads/wkwebview
Commit: 1e84e301b098385a9b67a620c589c55b515db771
Parents: 3d39ef4 bab65b9
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Jul 21 22:25:20 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Jul 21 22:25:20 2014 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVPlugin.h | 7 +--
CordovaLib/Classes/CDVPluginResult.h | 9 ++-
CordovaLib/Classes/CDVShared.h | 15 +----
CordovaLib/Classes/CDVShared.m | 59 --------------------
CordovaLib/Classes/CDVURLProtocol.m | 4 +-
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 4 --
.../project/__CLI__.xcodeproj/project.pbxproj | 5 --
.../__NON-CLI__.xcodeproj/project.pbxproj | 5 --
.../Classes/MainViewController.m | 2 +-
hooks/pre-commit | 2 +
10 files changed, 16 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/1e84e301/CordovaLib/Classes/CDVPlugin.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/1e84e301/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --cc CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index 844db7b,6e67777..141fee8
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@@ -382,8 -356,6 +379,7 @@@
EB96673C16A8970A00D86CDF /* CDVUserAgentUtil.m in Sources */,
EBFF4DBC16D3FE2E008F452B /* CDVWebViewDelegate.m in Sources */,
7E14B5A91705050A0032169E /* CDVTimer.m in Sources */,
- 1B701029177A61CF00AE11F4 /* CDVShared.m in Sources */,
+ 302D72FC19554BFC0028C99F /* CDVWebViewOperationsDelegate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/1e84e301/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/1e84e301/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------
[6/7] ios commit: CB-7187 Delete CDVShared.m & remove dependency on
CoreLocation
Posted by sh...@apache.org.
CB-7187 Delete CDVShared.m & remove dependency on CoreLocation
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/bab65b99
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/bab65b99
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/bab65b99
Branch: refs/heads/wkwebview
Commit: bab65b994818f04f9a7fd61cd33a6bcb3a2599da
Parents: ae2dd08
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Jul 21 22:55:18 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jul 21 22:55:18 2014 -0400
----------------------------------------------------------------------
CordovaLib/Classes/CDVShared.h | 15 +----
CordovaLib/Classes/CDVShared.m | 59 --------------------
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 4 --
.../project/__CLI__.xcodeproj/project.pbxproj | 4 --
.../__NON-CLI__.xcodeproj/project.pbxproj | 4 --
5 files changed, 2 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/bab65b99/CordovaLib/Classes/CDVShared.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVShared.h b/CordovaLib/Classes/CDVShared.h
index c54567a..68acc5c 100644
--- a/CordovaLib/Classes/CDVShared.h
+++ b/CordovaLib/Classes/CDVShared.h
@@ -17,17 +17,6 @@
under the License.
*/
-#import <Foundation/Foundation.h>
+// This file was emptied out in 3.6.0 release (July 2014).
+// It will be deleted in a future release.
#import <CoreLocation/CoreLocation.h>
-
-@interface NSError (JSONMethods)
-
-- (NSString*)JSONRepresentation;
-
-@end
-
-@interface CLLocation (JSONMethods)
-
-- (NSString*)JSONRepresentation;
-
-@end
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/bab65b99/CordovaLib/Classes/CDVShared.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVShared.m b/CordovaLib/Classes/CDVShared.m
deleted file mode 100644
index ac82234..0000000
--- a/CordovaLib/Classes/CDVShared.m
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-#import "CDVShared.h"
-
-#pragma mark -
-#pragma mark CLLocation(JSONMethods)
-
-@implementation CLLocation (JSONMethods)
-
-- (NSString*)JSONRepresentation
-{
- return [NSString stringWithFormat:
- @"{ timestamp: %.00f, \
- coords: { latitude: %f, longitude: %f, altitude: %.02f, heading: %.02f, speed: %.02f, accuracy: %.02f, altitudeAccuracy: %.02f } \
- }",
- [self.timestamp timeIntervalSince1970] * 1000.0,
- self.coordinate.latitude,
- self.coordinate.longitude,
- self.altitude,
- self.course,
- self.speed,
- self.horizontalAccuracy,
- self.verticalAccuracy
- ];
-}
-
-@end
-
-#pragma mark NSError(JSONMethods)
-
-@implementation NSError (JSONMethods)
-
-- (NSString*)JSONRepresentation
-{
- return [NSString stringWithFormat:
- @"{ code: %ld, message: '%@'}",
- (long)self.code,
- [self localizedDescription]
- ];
-}
-
-@end
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/bab65b99/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index a084d16..6e67777 100644
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
/* Begin PBXBuildFile section */
1B701028177A61CF00AE11F4 /* CDVShared.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B701026177A61CF00AE11F4 /* CDVShared.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 1B701029177A61CF00AE11F4 /* CDVShared.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B701027177A61CF00AE11F4 /* CDVShared.m */; };
1F92F4A01314023E0046367C /* CDVPluginResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F92F49E1314023E0046367C /* CDVPluginResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
1F92F4A11314023E0046367C /* CDVPluginResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F92F49F1314023E0046367C /* CDVPluginResult.m */; };
301F2F2A14F3C9CA003FE9FC /* CDV.h in Headers */ = {isa = PBXBuildFile; fileRef = 301F2F2914F3C9CA003FE9FC /* CDV.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -56,7 +55,6 @@
/* Begin PBXFileReference section */
1B701026177A61CF00AE11F4 /* CDVShared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVShared.h; path = Classes/CDVShared.h; sourceTree = "<group>"; };
- 1B701027177A61CF00AE11F4 /* CDVShared.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVShared.m; path = Classes/CDVShared.m; sourceTree = "<group>"; };
1F92F49E1314023E0046367C /* CDVPluginResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVPluginResult.h; path = Classes/CDVPluginResult.h; sourceTree = "<group>"; };
1F92F49F1314023E0046367C /* CDVPluginResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVPluginResult.m; path = Classes/CDVPluginResult.m; sourceTree = "<group>"; };
301F2F2914F3C9CA003FE9FC /* CDV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDV.h; path = Classes/CDV.h; sourceTree = "<group>"; };
@@ -204,7 +202,6 @@
30C684931407044A004C1A8E /* CDVURLProtocol.m */,
30C6847E1406CB38004C1A8E /* CDVWhitelist.h */,
1B701026177A61CF00AE11F4 /* CDVShared.h */,
- 1B701027177A61CF00AE11F4 /* CDVShared.m */,
30C6847F1406CB38004C1A8E /* CDVWhitelist.m */,
30E33AF013A7E24B00594D64 /* CDVPlugin.h */,
30E33AF113A7E24B00594D64 /* CDVPlugin.m */,
@@ -359,7 +356,6 @@
EB96673C16A8970A00D86CDF /* CDVUserAgentUtil.m in Sources */,
EBFF4DBC16D3FE2E008F452B /* CDVWebViewDelegate.m in Sources */,
7E14B5A91705050A0032169E /* CDVTimer.m in Sources */,
- 1B701029177A61CF00AE11F4 /* CDVShared.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/bab65b99/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 4fc1058..cf949d0 100755
--- a/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
+++ b/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
@@ -26,7 +26,6 @@
308D05391370CCF300D202BF /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 308D05301370CCF300D202BF /* icon@2x.png */; };
30A0434814DC770100060A13 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 30A0434314DC770100060A13 /* Localizable.strings */; };
30FC414916E50CA1004E6F35 /* icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 30FC414816E50CA1004E6F35 /* icon-72@2x.png */; };
- 5AEE5B35173C68D80009041E /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5AEE5B34173C68D80009041E /* CoreLocation.framework */; };
5B1594DD16A7569C00FEF299 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B1594DC16A7569C00FEF299 /* AssetsLibrary.framework */; };
7E7966DE1810823500FA85AD /* icon-40.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E7966D41810823500FA85AD /* icon-40.png */; };
7E7966DF1810823500FA85AD /* icon-40@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E7966D51810823500FA85AD /* icon-40@2x.png */; };
@@ -85,7 +84,6 @@
30A0434714DC770100060A13 /* se */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = se; path = Localizable.strings; sourceTree = "<group>"; };
30FC414816E50CA1004E6F35 /* icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-72@2x.png"; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* __PROJECT_NAME__-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "__PROJECT_NAME__-Prefix.pch"; sourceTree = "<group>"; };
- 5AEE5B34173C68D80009041E /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
5B1594DC16A7569C00FEF299 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; };
7E7966D41810823500FA85AD /* icon-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-40.png"; sourceTree = "<group>"; };
7E7966D51810823500FA85AD /* icon-40@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-40@2x.png"; sourceTree = "<group>"; };
@@ -114,7 +112,6 @@
301BF552109A68D80062928A /* libCordova.a in Frameworks */,
288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
305D5FD1115AB8F900A74A75 /* MobileCoreServices.framework in Frameworks */,
- 5AEE5B35173C68D80009041E /* CoreLocation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -204,7 +201,6 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
- 5AEE5B34173C68D80009041E /* CoreLocation.framework */,
5B1594DC16A7569C00FEF299 /* AssetsLibrary.framework */,
288765FC0DF74451002DB57D /* CoreGraphics.framework */,
305D5FD0115AB8F900A74A75 /* MobileCoreServices.framework */,
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/bab65b99/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 a59b3bd..afc446c 100755
--- a/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
+++ b/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
@@ -26,7 +26,6 @@
308D05391370CCF300D202BF /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 308D05301370CCF300D202BF /* icon@2x.png */; };
30A0434814DC770100060A13 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 30A0434314DC770100060A13 /* Localizable.strings */; };
30FC414916E50CA1004E6F35 /* icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 30FC414816E50CA1004E6F35 /* icon-72@2x.png */; };
- 5AEE5B35173C68D80009041E /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5AEE5B34173C68D80009041E /* CoreLocation.framework */; };
5B1594DD16A7569C00FEF299 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B1594DC16A7569C00FEF299 /* AssetsLibrary.framework */; };
7E7966DE1810823500FA85AD /* icon-40.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E7966D41810823500FA85AD /* icon-40.png */; };
7E7966DF1810823500FA85AD /* icon-40@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E7966D51810823500FA85AD /* icon-40@2x.png */; };
@@ -85,7 +84,6 @@
30A0434714DC770100060A13 /* se */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = se; path = Localizable.strings; sourceTree = "<group>"; };
30FC414816E50CA1004E6F35 /* icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-72@2x.png"; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* __PROJECT_NAME__-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "__PROJECT_NAME__-Prefix.pch"; sourceTree = "<group>"; };
- 5AEE5B34173C68D80009041E /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
5B1594DC16A7569C00FEF299 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; };
7E7966D41810823500FA85AD /* icon-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-40.png"; sourceTree = "<group>"; };
7E7966D51810823500FA85AD /* icon-40@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-40@2x.png"; sourceTree = "<group>"; };
@@ -111,7 +109,6 @@
301BF552109A68D80062928A /* libCordova.a in Frameworks */,
288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
305D5FD1115AB8F900A74A75 /* MobileCoreServices.framework in Frameworks */,
- 5AEE5B35173C68D80009041E /* CoreLocation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -199,7 +196,6 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
- 5AEE5B34173C68D80009041E /* CoreLocation.framework */,
5B1594DC16A7569C00FEF299 /* AssetsLibrary.framework */,
288765FC0DF74451002DB57D /* CoreGraphics.framework */,
305D5FD0115AB8F900A74A75 /* MobileCoreServices.framework */,
[4/7] ios commit: CB-7162 - cordova-ios pre-commit hook can't find
uncrustify in path in Git GUI apps
Posted by sh...@apache.org.
CB-7162 - cordova-ios pre-commit hook can't find uncrustify in path in Git GUI apps
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/822d2a5f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/822d2a5f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/822d2a5f
Branch: refs/heads/wkwebview
Commit: 822d2a5fdfa91da2f6717c3e2c4334149007f27d
Parents: ee5a9a8
Author: Shazron Abdullah <sh...@apache.org>
Authored: Thu Jul 17 13:24:22 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Thu Jul 17 13:25:23 2014 -0700
----------------------------------------------------------------------
hooks/pre-commit | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/822d2a5f/hooks/pre-commit
----------------------------------------------------------------------
diff --git a/hooks/pre-commit b/hooks/pre-commit
index 80550f1..1611f52 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -18,6 +18,8 @@
# under the License.
#
+PATH=$PATH:/usr/local/bin:/usr/local/sbin
+
# Redirect output to stderr.
exec 1>&2
test $SKIP_UNCRUSTIFY && exit 0
[2/7] ios commit: CB-7134 - Deprecate CDVPluginResult methods
Posted by sh...@apache.org.
CB-7134 - Deprecate CDVPluginResult methods
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/0f28c935
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/0f28c935
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/0f28c935
Branch: refs/heads/wkwebview
Commit: 0f28c9358842b4a3dccdab3ced98daa5a4246115
Parents: 0bf656c
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Jul 14 13:11:29 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Jul 14 13:11:29 2014 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVPluginResult.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/0f28c935/CordovaLib/Classes/CDVPluginResult.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVPluginResult.h b/CordovaLib/Classes/CDVPluginResult.h
index 11b5377..e624d4d 100644
--- a/CordovaLib/Classes/CDVPluginResult.h
+++ b/CordovaLib/Classes/CDVPluginResult.h
@@ -18,6 +18,7 @@
*/
#import <Foundation/Foundation.h>
+#import "CDVAvailability.h"
typedef enum {
CDVCommandStatus_NO_RESULT = 0,
@@ -61,8 +62,10 @@ typedef enum {
- (NSString*)argumentsAsJSON;
// These methods are used by the legacy plugin return result method
-- (NSString*)toJSONString;
-- (NSString*)toSuccessCallbackString:(NSString*)callbackId;
-- (NSString*)toErrorCallbackString:(NSString*)callbackId;
+- (NSString*)toJSONString CDV_DEPRECATED(3.6, "Only used by toSuccessCallbackString and toErrorCallbackString which are deprecated. This will be removed in 4.0.0");
+
+- (NSString*)toSuccessCallbackString:(NSString*)callbackId CDV_DEPRECATED(3.6, "Use the CDVCommandDelegate method sendPluginResult:callbackId instead. This will be removed in 4.0.0");
+
+- (NSString*)toErrorCallbackString:(NSString*)callbackId CDV_DEPRECATED(3.6, "Use the CDVCommandDelegate method sendPluginResult:callbackId instead. This will be removed in 4.0.0");
@end
[3/7] ios commit: CB-6997 - Deprecate obsolete CDVPlugin methods
Posted by sh...@apache.org.
CB-6997 - Deprecate obsolete CDVPlugin methods
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/ee5a9a8a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/ee5a9a8a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/ee5a9a8a
Branch: refs/heads/wkwebview
Commit: ee5a9a8ae406a092a604ea0b5db35621cbca9908
Parents: 0f28c93
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Jul 14 13:13:36 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Jul 14 13:13:36 2014 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVPlugin.h | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ee5a9a8a/CordovaLib/Classes/CDVPlugin.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVPlugin.h b/CordovaLib/Classes/CDVPlugin.h
index 20c209b..5e8b283 100644
--- a/CordovaLib/Classes/CDVPlugin.h
+++ b/CordovaLib/Classes/CDVPlugin.h
@@ -58,11 +58,10 @@ extern NSString* const CDVRemoteNotificationError;
- (id)appDelegate;
-// TODO(agrieve): Deprecate these in favour of using CDVCommandDelegate directly.
-- (NSString*)writeJavascript:(NSString*)javascript CDV_DEPRECATED(3.6, "Use the CDVCommandDelegate equivalent of evalJs:");
+- (NSString*)writeJavascript:(NSString*)javascript CDV_DEPRECATED(3.6, "Use the CDVCommandDelegate equivalent of evalJs:. This will be removed in 4.0.0");
-- (NSString*)success:(CDVPluginResult*)pluginResult callbackId:(NSString*)callbackId CDV_DEPRECATED(3.6, "Use the CDVCommandDelegate equivalent of sendPluginResult:callbackId");
+- (NSString*)success:(CDVPluginResult*)pluginResult callbackId:(NSString*)callbackId CDV_DEPRECATED(3.6, "Use the CDVCommandDelegate equivalent of sendPluginResult:callbackId. This will be removed in 4.0.0");
-- (NSString*)error:(CDVPluginResult*)pluginResult callbackId:(NSString*)callbackId CDV_DEPRECATED(3.6, "Use the CDVCommandDelegate equivalent of sendPluginResult:callbackId");
+- (NSString*)error:(CDVPluginResult*)pluginResult callbackId:(NSString*)callbackId CDV_DEPRECATED(3.6, "Use the CDVCommandDelegate equivalent of sendPluginResult:callbackId. This will be removed in 4.0.0");
@end
[5/7] ios commit: Fix warning in MainViewController.m (spurious
semi-colon)
Posted by sh...@apache.org.
Fix warning in MainViewController.m (spurious semi-colon)
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/ae2dd088
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/ae2dd088
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/ae2dd088
Branch: refs/heads/wkwebview
Commit: ae2dd08815292d2a9d853123cbcd42b4d21bf191
Parents: 822d2a5
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Jul 21 21:32:59 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jul 21 21:32:59 2014 -0400
----------------------------------------------------------------------
.../project/__PROJECT_NAME__/Classes/MainViewController.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ae2dd088/bin/templates/project/__PROJECT_NAME__/Classes/MainViewController.m
----------------------------------------------------------------------
diff --git a/bin/templates/project/__PROJECT_NAME__/Classes/MainViewController.m b/bin/templates/project/__PROJECT_NAME__/Classes/MainViewController.m
index c185916..4a41014 100644
--- a/bin/templates/project/__PROJECT_NAME__/Classes/MainViewController.m
+++ b/bin/templates/project/__PROJECT_NAME__/Classes/MainViewController.m
@@ -144,7 +144,7 @@
return [super getCommandInstance:className];
}
-- (NSString*)pathForResource:(NSString*)resourcepath;
+- (NSString*)pathForResource:(NSString*)resourcepath
{
return [super pathForResource:resourcepath];
}