Update version to 1.2.0

Fix AFCFileRef[Read|Write] prototypes

.gitignore

@@ -1,5 +1,6 @@
 demo
 demo.app
 ios-deploy
-
-/.DS_Store
+ios-deploy.dSYM
+/.DS_Store
+*~

CONTRIBUTING.md

@@ -0,0 +1,31 @@
+## Contributing to ios-deploy
+
+Github url: 
+
+        https://github.com/phonegap/ios-deploy
+
+Git clone url: 
+
+        https://github.com/phonegap/ios-deploy.git
+
+## Filing an issue
+
+Please run the commands below in your Terminal.app and include it in the issue:
+
+```
+1. sw_vers -productVersion
+2. ios-deploy -V
+3. xcodebuild -version
+4. xcode-select --print-path
+5. gcc --version
+6. lldb --version
+
+```
+Also include **command line arguments** you used for ios-deploy.
+
+
+## Sending a Pull Request
+
+Please **create a topic branch** for your issue before submitting your pull request. You will be asked to re-submit if your pull request contains unrelated commits.
+
+Please elaborate regarding the problem the pull request is supposed to solve, and perhaps also link to any relevant issues the pull request is trying to fix.

Info.plist

@@ -10,6 +10,8 @@
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>demo</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
 	<key>CFBundleIdentifier</key>
 	<string>demo</string>
 	<key>CFBundleResourceSpecification</key>

Makefile

@@ -1,6 +1,8 @@
+IOS_SDK_VERSION = 7.1
+
 IOS_CC = gcc -ObjC
-IOS_SDK = $(shell xcode-select --print-path)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk
 DEVICE_SUPPORT = $(shell xcode-select --print-path)/Platforms/iPhoneOS.platform/DeviceSupport
+IOS_SDK = $(shell xcode-select --print-path)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(IOS_SDK_VERSION).sdk
 
 all: clean ios-deploy
 

MobileDevice.h

@@ -396,11 +396,11 @@ afc_error_t AFCFileRefOpen(afc_connection *conn, const char *path,
 afc_error_t AFCFileRefSeek(afc_connection *conn, afc_file_ref ref,
     unsigned long long offset1, unsigned long long offset2);
 afc_error_t AFCFileRefRead(afc_connection *conn, afc_file_ref ref,
-    void *buf, unsigned int *len);
+    void *buf, size_t *len);
 afc_error_t AFCFileRefSetFileSize(afc_connection *conn, afc_file_ref ref,
     unsigned long long offset);
 afc_error_t AFCFileRefWrite(afc_connection *conn, afc_file_ref ref,
-    const void *buf, unsigned int len);
+    const void *buf, size_t len);
 afc_error_t AFCFileRefClose(afc_connection *conn, afc_file_ref ref);
 
 afc_error_t AFCFileInfoOpen(afc_connection *conn, const char *path, struct
@@ -453,6 +453,8 @@ typedef int (*am_device_install_application_callback)(CFDictionaryRef, int);
 mach_error_t AMDeviceInstallApplication(service_conn_t socket, CFStringRef path, CFDictionaryRef options, am_device_install_application_callback callback, void *user);
 mach_error_t AMDeviceTransferApplication(service_conn_t socket, CFStringRef path, CFDictionaryRef options, am_device_install_application_callback callbackj, void *user);
 
+int AMDeviceSecureUninstallApplication(int unknown0, struct am_device *device, CFStringRef bundle_id, int unknown1, void *callback, int callback_arg);
+
 /* ----------------------------------------------------------------------------
  *   Semi-private routines
  * ------------------------------------------------------------------------- */
@@ -491,4 +493,4 @@ typedef unsigned int (*t_performOperation)(struct am_restore_device *rdev,
 }
 #endif
 
-#endif
+#endif

README.md

@@ -10,21 +10,29 @@ Install and debug iPhone apps without using Xcode. Designed to work on unjailbro
 
 ## Usage
 
-    ./ios-deploy [OPTION]...
-      -d, --debug                  launch the app in GDB after installation
-      -i, --id <device_id>         the id of the device to connect to
-      -c, --detect                 only detect if the device is connected
-      -b, --bundle <bundle.app>    the path to the app bundle to be installed
-      -a, --args <args>            command line arguments to pass to the app when launching it
-      -t, --timeout <timeout>      number of seconds to wait for a device to be connected
-      -u, --unbuffered             don't buffer stdout
-      -g, --gdbargs <args>         extra arguments to pass to GDB when starting the debugger
-      -x, --gdbexec <file>         GDB commands script file
-      -n, --nostart                do not start the app when debugging
-      -v, --verbose                enable verbose output
-      -m, --noinstall              directly start debugging without app install (-d not required) 
-      -V, --version                print the executable version
-
+	Usage: ./ios-deploy [OPTION]...
+	  -d, --debug                  launch the app in GDB after installation
+	  -i, --id <device_id>         the id of the device to connect to
+	  -c, --detect                 only detect if the device is connected
+	  -b, --bundle <bundle.app>    the path to the app bundle to be installed
+	  -a, --args <args>            command line arguments to pass to the app when launching it
+	  -t, --timeout <timeout>      number of seconds to wait for a device to be connected
+	  -u, --unbuffered             don't buffer stdout
+	  -g, --gdbargs <args>         extra arguments to pass to GDB when starting the debugger
+	  -x, --gdbexec <file>         GDB commands script file
+	  -n, --nostart                do not start the app when debugging
+	  -I, --noninteractive         start in non interactive mode (quit when app crashes or exits)
+	  -L, --justlaunch             just launch the app and exit lldb
+	  -v, --verbose                enable verbose output
+	  -m, --noinstall              directly start debugging without app install (-d not required)
+	  -p, --port <number>          port used for device, default: 12345 
+	  -r, --uninstall              uninstall the app before install (do not use with -m; app cache and data are cleared) 
+	  -1, --bundle_id <bundle id>  specify bundle id for list and upload
+	  -l, --list                   list files
+	  -o, --upload <file>          upload file
+	  -2, --to <target pathname>	use together with upload file. specify target for upload
+	  -V, --version                print the executable version
+	  
 ## Demo
 
 * The included demo.app represents the minimum required to get code running on iOS.
@@ -40,4 +48,4 @@ Install and debug iPhone apps without using Xcode. Designed to work on unjailbro
 
 Device Ids are the UDIDs of the iOS devices. From the command line, you can list device ids [this way](http://javierhz.blogspot.com/2012/06/how-to-get-udid-of-iphone-using-shell.html):
 
-        system_profiler SPUSBDataType | sed -n -e '/iPad/,/Serial/p' -e '/iPhone/,/Serial/p' | grep "Serial Number:" | awk -F ": " '{print $2}'
+        system_profiler SPUSBDataType | sed -n -e '/iPod/,/Serial/p' | sed -n -e '/iPad/,/Serial/p' -e '/iPhone/,/Serial/p' | grep "Serial Number:" | awk -F ": " '{print $2}'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ios-deploy",
-  "version": "1.0.5",
-  "description": "launch iOS apps iOS devices from the command line (Xcode 4)",
+  "version": "1.2.0",
+  "description": "launch iOS apps iOS devices from the command line (Xcode 6)",
   "main": "ios-deploy",
   "scripts": {
       "preinstall": "make ios-deploy"