CB-11006 fix merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/c5c33bad Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/c5c33bad Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/c5c33bad Branch: refs/heads/4.1.x Commit: c5c33bad301ea4721fef5478299d21360c661860 Parents: ba60273 b3794e2 Author: Edna Morales <[email protected]> Authored: Mon Apr 4 12:25:55 2016 -0400 Committer: Edna Morales <[email protected]> Committed: Mon Apr 4 12:25:55 2016 -0400 ---------------------------------------------------------------------- CordovaLib/VERSION | 2 +- CordovaLib/cordova.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c5c33bad/CordovaLib/VERSION ---------------------------------------------------------------------- diff --cc CordovaLib/VERSION index 627a3f4,ee74734..2582ddd --- a/CordovaLib/VERSION +++ b/CordovaLib/VERSION @@@ -1,1 -1,1 +1,1 @@@ - 4.1.1 -4.1.0 ++4.1.1 http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c5c33bad/CordovaLib/cordova.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c5c33bad/package.json ---------------------------------------------------------------------- diff --cc package.json index 4cf937f,b6e0a0d..b626efa --- a/package.json +++ b/package.json @@@ -1,55 -1,52 +1,55 @@@ { - "name": "cordova-ios", - "version": "4.1.0", - "description": "cordova-ios release", - "main": "bin/templates/scripts/cordova/Api.js", - "repository": { - "type": "git", - "url": "https://git-wip-us.apache.org/repos/asf/cordova-ios.git"; - }, - "keywords": [ - "ios", - "cordova", - "apache", - "ecosystem:cordova", - "cordova:platform" - ], - "scripts": { - "test": "npm run jshint && npm run jasmine", - "jasmine": "npm run objc-tests && npm run jasmine-tests", - "objc-tests": "jasmine-node --captureExceptions --color tests/spec/cordovalib.spec.js", - "jasmine-tests": "jasmine-node --captureExceptions --color tests/spec/create.spec.js", - "jshint": "node node_modules/jshint/bin/jshint bin && node node_modules/jshint/bin/jshint tests" - }, - "author": "Apache Software Foundation", - "license": "Apache Version 2.0", - "devDependencies": { - "jshint": "^2.6.0", - "uncrustify": "^0.6.1", - "tmp": "^0.0.26", - "jasmine-node": "~1", - "coffee-script": "^1.7.1", - "nodeunit": "^0.8.7" - }, - "dependencies": { - "cordova-common": "^1.1.0", - "ios-sim": "^5.0.6", - "nopt": "^3.0.6", - "plist": "^1.2.0", - "q": "^1.4.1", - "shelljs": "^0.5.3", - "xcode": "^0.8.3" - }, - "bundledDependencies": [ - "cordova-common", - "ios-sim", - "nopt", - "plist", - "q", - "shelljs", - "xcode" - ] + "name": "cordova-ios", + "version": "4.1.1", + "description": "cordova-ios release", + "main": "bin/templates/scripts/cordova/Api.js", + "repository": { + "type": "git", + "url": "https://git-wip-us.apache.org/repos/asf/cordova-ios.git"; + }, + "keywords": [ + "ios", + "cordova", + "apache", + "ecosystem:cordova", + "cordova:platform" + ], + "scripts": { + "test": "npm run jshint && npm run e2e-tests && npm run objc-tests && npm run unit-tests", + "cover": "istanbul cover node_modules/jasmine-node/bin/jasmine-node -- tests/spec/unit", + "e2e-tests": "jasmine-node --captureExceptions --color tests/spec/create.spec.js", + "objc-tests": "jasmine-node --captureExceptions --color tests/spec/cordovalib.spec.js", + "unit-tests": "jasmine-node --captureExceptions --color tests/spec/unit", + "jshint": "jshint bin tests" + }, + "author": "Apache Software Foundation", + "license": "Apache Version 2.0", + "devDependencies": { + "coffee-script": "^1.7.1", + "istanbul": "^0.4.2", + "jasmine-node": "~1", + "jshint": "^2.6.0", + "nodeunit": "^0.8.7", + "rewire": "^2.5.1", + "tmp": "^0.0.26", + "uncrustify": "^0.6.1" + }, + "dependencies": { + "cordova-common": "^1.1.0", + "ios-sim": "^5.0.7", + "nopt": "^3.0.6", + "plist": "^1.2.0", + "q": "^1.4.1", + "shelljs": "^0.5.3", + "xcode": "^0.8.3" + }, + "bundledDependencies": [ + "cordova-common", + "ios-sim", + "nopt", + "plist", + "q", + "shelljs", + "xcode" + ] - } + } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
