Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 95EBB200CBA for ; Mon, 19 Jun 2017 02:27:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 94A72160BEE; Mon, 19 Jun 2017 00:27:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B7587160BE3 for ; Mon, 19 Jun 2017 02:27:49 +0200 (CEST) Received: (qmail 19524 invoked by uid 500); 19 Jun 2017 00:27:48 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 19515 invoked by uid 99); 19 Jun 2017 00:27:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2017 00:27:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 02A03F4A43; Mon, 19 Jun 2017 00:27:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shazron@apache.org To: commits@cordova.apache.org Date: Mon, 19 Jun 2017 00:27:47 -0000 Message-Id: <905fbcb21cf143feb867f2a8ad7002d4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/15] ios commit: Update bundled ios-sim to 6.0.0 archived-at: Mon, 19 Jun 2017 00:27:51 -0000 Repository: cordova-ios Updated Branches: refs/heads/master df5441df8 -> 4490abf27 http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/lib/parser/pbxproj.pegjs ---------------------------------------------------------------------- diff --git a/node_modules/xcode/lib/parser/pbxproj.pegjs b/node_modules/xcode/lib/parser/pbxproj.pegjs index 5140c05..c612689 100644 --- a/node_modules/xcode/lib/parser/pbxproj.pegjs +++ b/node_modules/xcode/lib/parser/pbxproj.pegjs @@ -1,16 +1,7 @@ { - function merge(hash, secondHash) { - secondHash = secondHash[0] - for(var i in secondHash) { - hash[i] = merge_obj(hash[i], secondHash[i]); - } - - return hash; - } - function merge_obj(obj, secondObj) { - if (!obj) - return secondObj; + if (!obj) + return secondObj; for(var i in secondObj) obj[i] = merge_obj(obj[i], secondObj[i]); @@ -47,15 +38,14 @@ EmptyBody { return Object.create(null) } AssignmentList - = _ head:Assignment _ tail:AssignmentList* _ - { - if (tail) return merge(head,tail) - else return head - } - / _ head:DelimitedSection _ tail:AssignmentList* + = _ list:((a:Assignment / d:DelimitedSection) _)+ { - if (tail) return merge(head,tail) - else return head + var returnObject = list[0][0]; + for(var i = 1; i < list.length; i++){ + var another = list[i][0]; + returnObject = merge_obj(returnObject, another); + } + return returnObject; } /* @@ -68,7 +58,7 @@ Assignment SimpleAssignment = id:Identifier _ "=" _ val:Value ";" - { + { var result = Object.create(null); result[id] = val return result @@ -195,7 +185,7 @@ NumberValue DecimalValue = decimal:(IntegerValue "." IntegerValue) - { + { // store decimals as strings // as JS doesn't differentiate bw strings and numbers return decimal.join('') http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/lib/pbxFile.js ---------------------------------------------------------------------- diff --git a/node_modules/xcode/lib/pbxFile.js b/node_modules/xcode/lib/pbxFile.js index 67cb6cf..768122a 100644 --- a/node_modules/xcode/lib/pbxFile.js +++ b/node_modules/xcode/lib/pbxFile.js @@ -29,7 +29,8 @@ var FILETYPE_BY_EXTENSION = { xcdatamodel: 'wrapper.xcdatamodel', xcodeproj: 'wrapper.pb-project', xctest: 'wrapper.cfbundle', - xib: 'file.xib' + xib: 'file.xib', + strings: 'text.plist.strings' }, GROUP_BY_FILETYPE = { 'archive.ar': 'Frameworks', @@ -59,7 +60,8 @@ var FILETYPE_BY_EXTENSION = { 'text': 4, 'text.plist.xml': 4, 'text.script.sh': 4, - 'text.xcconfig': 4 + 'text.xcconfig': 4, + 'text.plist.strings': 4 }; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/lib/pbxProject.js ---------------------------------------------------------------------- diff --git a/node_modules/xcode/lib/pbxProject.js b/node_modules/xcode/lib/pbxProject.js index 9a2f5ed..18033bb 100644 --- a/node_modules/xcode/lib/pbxProject.js +++ b/node_modules/xcode/lib/pbxProject.js @@ -2,7 +2,7 @@ var util = require('util'), f = util.format, EventEmitter = require('events').EventEmitter, path = require('path'), - uuid = require('node-uuid'), + uuid = require('uuid'), fork = require('child_process').fork, pbxWriter = require('./pbxWriter'), pbxFile = require('./pbxFile'), @@ -230,7 +230,7 @@ pbxProject.prototype.addResourceFile = function(path, opt, group) { file = this.addPluginFile(path, opt); if (!file) return false; } else { - file = new pbxFile(path, opt); + file = new pbxFile(path, opt); if (this.hasFile(file.path)) return false; } @@ -241,21 +241,28 @@ pbxProject.prototype.addResourceFile = function(path, opt, group) { correctForResourcesPath(file, this); file.fileRef = this.generateUuid(); } - - this.addToPbxBuildFileSection(file); // PBXBuildFile - this.addToPbxResourcesBuildPhase(file); // PBXResourcesBuildPhase - + + if (!opt.variantGroup) { + this.addToPbxBuildFileSection(file); // PBXBuildFile + this.addToPbxResourcesBuildPhase(file); // PBXResourcesBuildPhase + } + if (!opt.plugin) { this.addToPbxFileReferenceSection(file); // PBXFileReference if (group) { - this.addToPbxGroup(file, group); //Group other than Resources (i.e. 'splash') + if (this.getPBXGroupByKey(group)) { + this.addToPbxGroup(file, group); //Group other than Resources (i.e. 'splash') + } + else if (this.getPBXVariantGroupByKey(group)) { + this.addToPbxVariantGroup(file, group); // PBXVariantGroup + } } else { this.addToResourcesPbxGroup(file); // PBXGroup } - + } - + return file; } @@ -275,11 +282,16 @@ pbxProject.prototype.removeResourceFile = function(path, opt, group) { this.removeFromPbxBuildFileSection(file); // PBXBuildFile this.removeFromPbxFileReferenceSection(file); // PBXFileReference if (group) { - this.removeFromPbxGroup(file, group); //Group other than Resources (i.e. 'splash') + if (this.getPBXGroupByKey(group)) { + this.removeFromPbxGroup(file, group); //Group other than Resources (i.e. 'splash') + } + else if (this.getPBXVariantGroupByKey(group)) { + this.removeFromPbxVariantGroup(file, group); // PBXVariantGroup + } } else { this.removeFromResourcesPbxGroup(file); // PBXGroup - } + } this.removeFromPbxResourcesBuildPhase(file); // PBXResourcesBuildPhase return file; @@ -811,7 +823,7 @@ pbxProject.prototype.addTargetDependency = function(target, dependencyTargets) { return { uuid: target, target: nativeTargets[target] }; } -pbxProject.prototype.addBuildPhase = function(filePathsArray, buildPhaseType, comment, target, folderType, subfolderPath) { +pbxProject.prototype.addBuildPhase = function(filePathsArray, buildPhaseType, comment, target, optionsOrFolderType, subfolderPath) { var buildPhaseSection, fileReferenceSection = this.pbxFileReferenceSection(), buildFileSection = this.pbxBuildFileSection(), @@ -827,7 +839,9 @@ pbxProject.prototype.addBuildPhase = function(filePathsArray, buildPhaseType, co filePathToBuildFile = {}; if (buildPhaseType === 'PBXCopyFilesBuildPhase') { - buildPhase = pbxCopyFilesBuildPhaseObj(buildPhase, folderType, subfolderPath, comment); + buildPhase = pbxCopyFilesBuildPhaseObj(buildPhase, optionsOrFolderType, subfolderPath, comment); + } else if (buildPhaseType === 'PBXShellScriptBuildPhase') { + buildPhase = pbxShellScriptBuildPhaseObj(buildPhase, optionsOrFolderType, comment) } if (!this.hash.project.objects[buildPhaseType]) { @@ -1490,7 +1504,7 @@ function pbxBuildPhaseObj(file) { return obj; } -function pbxCopyFilesBuildPhaseObj(obj, folderType, subfolderPath, phaseName){ +function pbxCopyFilesBuildPhaseObj(obj, folderType, subfolderPath, phaseName) { // Add additional properties for 'CopyFiles' build phase var DESTINATION_BY_TARGETTYPE = { @@ -1527,6 +1541,16 @@ function pbxCopyFilesBuildPhaseObj(obj, folderType, subfolderPath, phaseName){ return obj; } +function pbxShellScriptBuildPhaseObj(obj, options, phaseName) { + obj.name = '"' + phaseName + '"'; + obj.inputPaths = options.inputPaths || []; + obj.outputPaths = options.outputPaths || []; + obj.shellPath = options.shellPath; + obj.shellScript = '"' + options.shellScript.replace(/"/g, '\\"') + '"'; + + return obj; +} + function pbxBuildFileComment(file) { return longComment(file); } @@ -1684,15 +1708,20 @@ pbxProject.prototype.getFirstTarget = function() { /*** NEW ***/ -pbxProject.prototype.addToPbxGroup = function (file, groupKey) { - var group = this.getPBXGroupByKey(groupKey); +pbxProject.prototype.addToPbxGroupType = function (file, groupKey, groupType) { + var group = this.getPBXGroupByKeyAndType(groupKey, groupType); if (group && group.children !== undefined) { if (typeof file === 'string') { //Group Key var childGroup = { value:file, - comment: this.getPBXGroupByKey(file).name }; + if (this.getPBXGroupByKey(file)) { + childGroup.comment = this.getPBXGroupByKey(file).name; + } + else if (this.getPBXVariantGroupByKey(file)) { + childGroup.comment = this.getPBXVariantGroupByKey(file).name; + } group.children.push(childGroup); } @@ -1703,8 +1732,53 @@ pbxProject.prototype.addToPbxGroup = function (file, groupKey) { } } -pbxProject.prototype.removeFromPbxGroup = function (file, groupKey) { - var group = this.getPBXGroupByKey(groupKey); +pbxProject.prototype.addToPbxVariantGroup = function (file, groupKey) { + this.addToPbxGroupType(file, groupKey, 'PBXVariantGroup'); +} + +pbxProject.prototype.addToPbxGroup = function (file, groupKey) { + this.addToPbxGroupType(file, groupKey, 'PBXGroup'); +} + + + +pbxProject.prototype.pbxCreateGroupWithType = function(name, pathName, groupType) { + //Create object + var model = { + isa: '"' + groupType + '"', + children: [], + name: name, + sourceTree: '""' + }; + if (pathName) model.path = pathName; + var key = this.generateUuid(); + + //Create comment + var commendId = key + '_comment'; + + //add obj and commentObj to groups; + var groups = this.hash.project.objects[groupType]; + if (!groups) { + groups = this.hash.project.objects[groupType] = new Object(); + } + groups[commendId] = name; + groups[key] = model; + + return key; +} + +pbxProject.prototype.pbxCreateVariantGroup = function(name) { + return this.pbxCreateGroupWithType(name, undefined, 'PBXVariantGroup') +} + +pbxProject.prototype.pbxCreateGroup = function(name, pathName) { + return this.pbxCreateGroupWithType(name, pathName, 'PBXGroup'); +} + + + +pbxProject.prototype.removeFromPbxGroupAndType = function (file, groupKey, groupType) { + var group = this.getPBXGroupByKeyAndType(groupKey, groupType); if (group) { var groupChildren = group.children, i; for(i in groupChildren) { @@ -1717,12 +1791,32 @@ pbxProject.prototype.removeFromPbxGroup = function (file, groupKey) { } } +pbxProject.prototype.removeFromPbxGroup = function (file, groupKey) { + this.removeFromPbxGroupAndType(file, groupKey, 'PBXGroup'); +} + +pbxProject.prototype.removeFromPbxVariantGroup = function (file, groupKey) { + this.removeFromPbxGroupAndType(file, groupKey, 'PBXVariantGroup'); +} + + + +pbxProject.prototype.getPBXGroupByKeyAndType = function(key, groupType) { + return this.hash.project.objects[groupType][key]; +}; + pbxProject.prototype.getPBXGroupByKey = function(key) { return this.hash.project.objects['PBXGroup'][key]; }; -pbxProject.prototype.findPBXGroupKey = function(criteria) { - var groups = this.hash.project.objects['PBXGroup']; +pbxProject.prototype.getPBXVariantGroupByKey = function(key) { + return this.hash.project.objects['PBXVariantGroup'][key]; +}; + + + +pbxProject.prototype.findPBXGroupKeyAndType = function(criteria, groupType) { + var groups = this.hash.project.objects[groupType]; var target; for (var key in groups) { @@ -1753,29 +1847,64 @@ pbxProject.prototype.findPBXGroupKey = function(criteria) { return target; } -pbxProject.prototype.pbxCreateGroup = function(name, pathName) { +pbxProject.prototype.findPBXGroupKey = function(criteria) { + return this.findPBXGroupKeyAndType(criteria, 'PBXGroup'); +} - //Create object - var model = { - isa:"PBXGroup", - children: [], - name: name, - path: pathName, - sourceTree: '""' - }; - var key = this.generateUuid(); +pbxProject.prototype.findPBXVariantGroupKey = function(criteria) { + return this.findPBXGroupKeyAndType(criteria, 'PBXVariantGroup'); +} - //Create comment - var commendId = key + '_comment'; +pbxProject.prototype.addLocalizationVariantGroup = function(name) { + var groupKey = this.pbxCreateVariantGroup(name); - //add obj and commentObj to groups; - var groups = this.hash.project.objects['PBXGroup']; - groups[commendId] = name; - groups[key] = model; + var resourceGroupKey = this.findPBXGroupKey({name: 'Resources'}); + this.addToPbxGroup(groupKey, resourceGroupKey); - return key; + var localizationVariantGroup = { + uuid: this.generateUuid(), + fileRef: groupKey, + basename: name + } + this.addToPbxBuildFileSection(localizationVariantGroup); // PBXBuildFile + this.addToPbxResourcesBuildPhase(localizationVariantGroup); //PBXResourcesBuildPhase + + return localizationVariantGroup; +}; + +pbxProject.prototype.addKnownRegion = function (name) { + if (!this.pbxProjectSection()[this.getFirstProject()['uuid']]['knownRegions']) { + this.pbxProjectSection()[this.getFirstProject()['uuid']]['knownRegions'] = []; + } + if (!this.hasKnownRegion(name)) { + this.pbxProjectSection()[this.getFirstProject()['uuid']]['knownRegions'].push(name); + } +} + +pbxProject.prototype.removeKnownRegion = function (name) { + var regions = this.pbxProjectSection()[this.getFirstProject()['uuid']]['knownRegions']; + if (regions) { + for (var i = 0; i < regions.length; i++) { + if (regions[i] === name) { + regions.splice(i, 1); + break; + } + } + this.pbxProjectSection()[this.getFirstProject()['uuid']]['knownRegions'] = regions; + } } +pbxProject.prototype.hasKnownRegion = function (name) { + var regions = this.pbxProjectSection()[this.getFirstProject()['uuid']]['knownRegions']; + if (regions) { + for (var i in regions) { + if (regions[i] === name) { + return true; + } + } + } + return false; +} pbxProject.prototype.getPBXObject = function(name) { return this.hash.project.objects[name]; @@ -1792,7 +1921,13 @@ pbxProject.prototype.addFile = function (path, group, opt) { file.fileRef = this.generateUuid(); this.addToPbxFileReferenceSection(file); // PBXFileReference - this.addToPbxGroup(file, group); // PBXGroup + + if (this.getPBXGroupByKey(group)) { + this.addToPbxGroup(file, group); // PBXGroup + } + else if (this.getPBXVariantGroupByKey(group)) { + this.addToPbxVariantGroup(file, group); // PBXVariantGroup + } return file; } @@ -1801,7 +1936,13 @@ pbxProject.prototype.removeFile = function (path, group, opt) { var file = new pbxFile(path, opt); this.removeFromPbxFileReferenceSection(file); // PBXFileReference - this.removeFromPbxGroup(file, group); // PBXGroup + + if (this.getPBXGroupByKey(group)) { + this.removeFromPbxGroup(file, group); // PBXGroup + } + else if (this.getPBXVariantGroupByKey(group)) { + this.removeFromPbxVariantGroup(file, group); // PBXVariantGroup + } return file; } @@ -1894,5 +2035,25 @@ pbxProject.prototype.addDataModelDocument = function(filePath, group, opt) { return file; } +pbxProject.prototype.addTargetAttribute = function(prop, value, target) { + var attributes = this.getFirstProject()['firstProject']['attributes']; + if (attributes['TargetAttributes'] === undefined) { + attributes['TargetAttributes'] = {}; + } + target = target || this.getFirstTarget(); + if (attributes['TargetAttributes'][target.uuid] === undefined) { + attributes['TargetAttributes'][target.uuid] = {}; + } + attributes['TargetAttributes'][target.uuid][prop] = value; +} + +pbxProject.prototype.removeTargetAttribute = function(prop, target) { + var attributes = this.getFirstProject()['firstProject']['attributes']; + target = target || this.getFirstTarget(); + if (attributes['TargetAttributes'] && + attributes['TargetAttributes'][target.uuid]) { + delete attributes['TargetAttributes'][target.uuid][prop]; + } +} module.exports = pbxProject; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/.bin/uuid ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/.bin/uuid b/node_modules/xcode/node_modules/.bin/uuid new file mode 120000 index 0000000..b3e45bc --- /dev/null +++ b/node_modules/xcode/node_modules/.bin/uuid @@ -0,0 +1 @@ +../uuid/bin/uuid \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/.npmignore ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/.npmignore b/node_modules/xcode/node_modules/uuid/.npmignore new file mode 100644 index 0000000..67b8872 --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/.npmignore @@ -0,0 +1,8 @@ +node_modules +.DS_Store + +# VIM temp files +*.sw* + +# Mac desktop services store +.DS_Store http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/.travis.yml ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/.travis.yml b/node_modules/xcode/node_modules/uuid/.travis.yml new file mode 100644 index 0000000..8a2c585 --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/.travis.yml @@ -0,0 +1,5 @@ +language: node_js +node_js: + - "0.12" + - "4" + - "6" http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/AUTHORS ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/AUTHORS b/node_modules/xcode/node_modules/uuid/AUTHORS new file mode 100644 index 0000000..5a10523 --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/AUTHORS @@ -0,0 +1,5 @@ +Robert Kieffer +Christoph Tavan +AJ ONeal +Vincent Voyer +Roman Shtylman http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/HISTORY.md ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/HISTORY.md b/node_modules/xcode/node_modules/uuid/HISTORY.md new file mode 100644 index 0000000..c6050ec --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/HISTORY.md @@ -0,0 +1,28 @@ +# 3.0.1 (2016-11-28) + + * split uuid versions into separate files + +# 3.0.0 (2016-11-17) + + * remove .parse and .unparse + +# 2.0.0 + + * Removed uuid.BufferClass + +# 1.4.0 + + * Improved module context detection + * Removed public RNG functions + +# 1.3.2 + + * Improve tests and handling of v1() options (Issue #24) + * Expose RNG option to allow for perf testing with different generators + +# 1.3.0 + + * Support for version 1 ids, thanks to [@ctavan](https://github.com/ctavan)! + * Support for node.js crypto API + * De-emphasizing performance in favor of a) cryptographic quality PRNGs where available and b) more manageable code + http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/LICENSE.md ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/LICENSE.md b/node_modules/xcode/node_modules/uuid/LICENSE.md new file mode 100644 index 0000000..8c84e39 --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/LICENSE.md @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2010-2016 Robert Kieffer and other contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/README.md ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/README.md b/node_modules/xcode/node_modules/uuid/README.md new file mode 100644 index 0000000..82a79eb --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/README.md @@ -0,0 +1,132 @@ +# uuid [![Build Status](https://secure.travis-ci.org/kelektiv/node-uuid.svg?branch=master)](http://travis-ci.org/kelektiv/node-uuid) # + +Simple, fast generation of [RFC4122](http://www.ietf.org/rfc/rfc4122.txt) UUIDS. + +Features: + +* Generate RFC4122 version 1 or version 4 UUIDs +* Runs in node.js and browsers +* Cryptographically strong random number generation on supporting platforms +* Small footprint (Want something smaller? [Check this out](https://gist.github.com/982883)!) + +## Quickstart - CommonJS (Recommended) + +```shell +npm install uuid +``` + +```javascript +// Generate a v1 UUID (time-based) +const uuidV1 = require('uuid/v1'); +uuidV1(); // -> '6c84fb90-12c4-11e1-840d-7b25c5ee775a' + +// Generate a v4 UUID (random) +const uuidV4 = require('uuid/v4'); +uuidV4(); // -> '110ec58a-a0f2-4ac4-8393-c866d813b8d1' +``` + +## Quickstart - Pre-packaged for browsers (Not recommended) + +Browser-ready versions of this module are available via [wzrd.in](https://github.com/jfhbrook/wzrd.in). + +```html + + + +``` + +(Note: Do not do this in production. Just don't. wzrd.in is a great service, but if you're deploying a "real" service you should be using a packaging tool like browserify or webpack. If you do go this route you would be well advised to link to a specific version instead of `uuid@latest` to avoid having your code break when we roll out breaking changes.) + + +## API + +### uuid(...) + +Generate a V4 uuid. See uuid.v4 documentation below. + +### uuid.v1([`options` [, `buffer` [, `offset`]]]) + +Generate and return a RFC4122 v1 (timestamp-based) UUID. + +* `options` - (Object) Optional uuid state to apply. Properties may include: + + * `node` - (Array) Node id as Array of 6 bytes (per 4.1.6). Default: Randomly generated ID. See note 1. + * `clockseq` - (Number between 0 - 0x3fff) RFC clock sequence. Default: An internally maintained clockseq is used. + * `msecs` - (Number | Date) Time in milliseconds since unix Epoch. Default: The current time is used. + * `nsecs` - (Number between 0-9999) additional time, in 100-nanosecond units. Ignored if `msecs` is unspecified. Default: internal uuid counter is used, as per 4.2.1.2. + +* `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written. +* `offset` - (Number) Starting index in `buffer` at which to begin writing. + +Returns `buffer`, if specified, otherwise the string form of the UUID + +Notes: + +1. The randomly generated node id is only guaranteed to stay constant for the lifetime of the current JS runtime. (Future versions of this module may use persistent storage mechanisms to extend this guarantee.) + +Example: Generate string UUID with fully-specified options + +```javascript +uuid.v1({ + node: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab], + clockseq: 0x1234, + msecs: new Date('2011-11-01').getTime(), + nsecs: 5678 +}); // -> "710b962e-041c-11e1-9234-0123456789ab" +``` + +Example: In-place generation of two binary IDs + +```javascript +// Generate two ids in an array +const arr = new Array(32); // -> [] +uuid.v1(null, arr, 0); // -> [02 a2 ce 90 14 32 11 e1 85 58 0b 48 8e 4f c1 15] +uuid.v1(null, arr, 16); // -> [02 a2 ce 90 14 32 11 e1 85 58 0b 48 8e 4f c1 15 02 a3 1c b0 14 32 11 e1 85 58 0b 48 8e 4f c1 15] +``` + +### uuid.v4([`options` [, `buffer` [, `offset`]]]) + +Generate and return a RFC4122 v4 UUID. + +* `options` - (Object) Optional uuid state to apply. Properties may include: + + * `random` - (Number[16]) Array of 16 numbers (0-255) to use in place of randomly generated values + * `rng` - (Function) Random # generator to use. Set to one of the built-in generators - `uuid.mathRNG` (all platforms), `uuid.nodeRNG` (node.js only), `uuid.whatwgRNG` (WebKit only) - or a custom function that returns an array[16] of byte values. + +* `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written. +* `offset` - (Number) Starting index in `buffer` at which to begin writing. + +Returns `buffer`, if specified, otherwise the string form of the UUID + +Example: Generate string UUID with fully-specified options + +```javascript +uuid.v4({ + random: [ + 0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea, + 0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36 + ] +}); +// -> "109156be-c4fb-41ea-b1b4-efe1671c5836" +``` + +Example: Generate two IDs in a single buffer + +```javascript +const buffer = new Array(32); // (or 'new Buffer' in node.js) +uuid.v4(null, buffer, 0); +uuid.v4(null, buffer, 16); +``` + +## Testing + +``` +npm test +``` + +## Legacy node-uuid package + +The code for the legacy node-uuid package is available in the `node-uuid` branch. http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/bin/uuid ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/bin/uuid b/node_modules/xcode/node_modules/uuid/bin/uuid new file mode 100755 index 0000000..f732e99 --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/bin/uuid @@ -0,0 +1,26 @@ +#!/usr/bin/env node + +var path = require('path'); +var uuid = require(path.join(__dirname, '..')); + +var arg = process.argv[2]; + +if ('--help' === arg) { + console.log('\n USAGE: uuid [version] [options]\n\n'); + console.log(' options:\n'); + console.log(' --help Display this message and exit\n'); + process.exit(0); +} + +if (null == arg) { + console.log(uuid()); + process.exit(0); +} + +if ('v1' !== arg && 'v4' !== arg) { + console.error('Version must be RFC4122 version 1 or version 4, denoted as "v1" or "v4"'); + process.exit(1); +} + +console.log(uuid[arg]()); +process.exit(0); http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/index.js ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/index.js b/node_modules/xcode/node_modules/uuid/index.js new file mode 100644 index 0000000..e96791a --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/index.js @@ -0,0 +1,8 @@ +var v1 = require('./v1'); +var v4 = require('./v4'); + +var uuid = v4; +uuid.v1 = v1; +uuid.v4 = v4; + +module.exports = uuid; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/lib/bytesToUuid.js ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/lib/bytesToUuid.js b/node_modules/xcode/node_modules/uuid/lib/bytesToUuid.js new file mode 100644 index 0000000..9ee989c --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/lib/bytesToUuid.js @@ -0,0 +1,23 @@ +/** + * Convert array of 16 byte values to UUID string format of the form: + * XXXXXXXX-XXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX + */ +var byteToHex = []; +for (var i = 0; i < 256; ++i) { + byteToHex[i] = (i + 0x100).toString(16).substr(1); +} + +function bytesToUuid(buf, offset) { + var i = offset || 0; + var bth = byteToHex; + return bth[buf[i++]] + bth[buf[i++]] + + bth[buf[i++]] + bth[buf[i++]] + '-' + + bth[buf[i++]] + bth[buf[i++]] + '-' + + bth[buf[i++]] + bth[buf[i++]] + '-' + + bth[buf[i++]] + bth[buf[i++]] + '-' + + bth[buf[i++]] + bth[buf[i++]] + + bth[buf[i++]] + bth[buf[i++]] + + bth[buf[i++]] + bth[buf[i++]]; +} + +module.exports = bytesToUuid; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/lib/rng-browser.js ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/lib/rng-browser.js b/node_modules/xcode/node_modules/uuid/lib/rng-browser.js new file mode 100644 index 0000000..88b7dfb --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/lib/rng-browser.js @@ -0,0 +1,33 @@ +// Unique ID creation requires a high quality random # generator. In the +// browser this is a little complicated due to unknown quality of Math.random() +// and inconsistent support for the `crypto` API. We do the best we can via +// feature-detection +var rng; + +var crypto = global.crypto || global.msCrypto; // for IE 11 +if (crypto && crypto.getRandomValues) { + // WHATWG crypto RNG - http://wiki.whatwg.org/wiki/Crypto + var rnds8 = new Uint8Array(16); + rng = function whatwgRNG() { + crypto.getRandomValues(rnds8); + return rnds8; + }; +} + +if (!rng) { + // Math.random()-based (RNG) + // + // If all else fails, use Math.random(). It's fast, but is of unspecified + // quality. + var rnds = new Array(16); + rng = function() { + for (var i = 0, r; i < 16; i++) { + if ((i & 0x03) === 0) r = Math.random() * 0x100000000; + rnds[i] = r >>> ((i & 0x03) << 3) & 0xff; + } + + return rnds; + }; +} + +module.exports = rng; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/lib/rng.js ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/lib/rng.js b/node_modules/xcode/node_modules/uuid/lib/rng.js new file mode 100644 index 0000000..5624d91 --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/lib/rng.js @@ -0,0 +1,10 @@ +// Unique ID creation requires a high quality random # generator. In node.js +// this is prett straight-forward - we use the crypto API. + +var rb = require('crypto').randomBytes; + +function rng() { + return rb(16); +}; + +module.exports = rng; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/package.json ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/package.json b/node_modules/xcode/node_modules/uuid/package.json new file mode 100644 index 0000000..1b3b7dc --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/package.json @@ -0,0 +1,122 @@ +{ + "_args": [ + [ + { + "raw": "uuid@3.0.1", + "scope": null, + "escapedName": "uuid", + "name": "uuid", + "rawSpec": "3.0.1", + "spec": "3.0.1", + "type": "version" + }, + "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/xcode" + ] + ], + "_from": "uuid@3.0.1", + "_id": "uuid@3.0.1", + "_inCache": true, + "_location": "/xcode/uuid", + "_nodeVersion": "6.7.0", + "_npmOperationalInternal": { + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/uuid-3.0.1.tgz_1480403886767_0.2584113120101392" + }, + "_npmUser": { + "name": "defunctzombie", + "email": "shtylman@gmail.com" + }, + "_npmVersion": "3.10.3", + "_phantomChildren": {}, + "_requested": { + "raw": "uuid@3.0.1", + "scope": null, + "escapedName": "uuid", + "name": "uuid", + "rawSpec": "3.0.1", + "spec": "3.0.1", + "type": "version" + }, + "_requiredBy": [ + "/xcode" + ], + "_resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", + "_shasum": "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1", + "_shrinkwrap": null, + "_spec": "uuid@3.0.1", + "_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/xcode", + "bin": { + "uuid": "./bin/uuid" + }, + "browser": { + "./lib/rng.js": "./lib/rng-browser.js" + }, + "bugs": { + "url": "https://github.com/kelektiv/node-uuid/issues" + }, + "contributors": [ + { + "name": "Robert Kieffer", + "email": "robert@broofa.com" + }, + { + "name": "Christoph Tavan", + "email": "dev@tavan.de" + }, + { + "name": "AJ ONeal", + "email": "coolaj86@gmail.com" + }, + { + "name": "Vincent Voyer", + "email": "vincent@zeroload.net" + }, + { + "name": "Roman Shtylman", + "email": "shtylman@gmail.com" + } + ], + "dependencies": {}, + "description": "RFC4122 (v1 and v4) generator", + "devDependencies": { + "mocha": "3.1.2" + }, + "directories": {}, + "dist": { + "shasum": "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1", + "tarball": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz" + }, + "gitHead": "374de826de71d8997f71b4641f65552e48956ced", + "homepage": "https://github.com/kelektiv/node-uuid#readme", + "keywords": [ + "uuid", + "guid", + "rfc4122" + ], + "license": "MIT", + "maintainers": [ + { + "name": "broofa", + "email": "robert@broofa.com" + }, + { + "name": "defunctzombie", + "email": "shtylman@gmail.com" + }, + { + "name": "vvo", + "email": "vincent.voyer@gmail.com" + } + ], + "name": "uuid", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/kelektiv/node-uuid.git" + }, + "scripts": { + "test": "mocha test/test.js" + }, + "version": "3.0.1" +} http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/test/mocha.opts ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/test/mocha.opts b/node_modules/xcode/node_modules/uuid/test/mocha.opts new file mode 100644 index 0000000..5d6a311 --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/test/mocha.opts @@ -0,0 +1,3 @@ +--ui qunit +--reporter spec +--check-leaks http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/test/test.js ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/test/test.js b/node_modules/xcode/node_modules/uuid/test/test.js new file mode 100644 index 0000000..ec33bec --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/test/test.js @@ -0,0 +1,96 @@ +var assert = require('assert'); + +var uuid = require('../'); + +// Verify ordering of v1 ids created with explicit times +var TIME = 1321644961388; // 2011-11-18 11:36:01.388-08:00 + +function compare(name, ids) { + test(name, function() { + // avoid .map for older browsers + for (var i=0 ; i 10k ids created in 1ms', function() { + // Verify throw if too many ids created + var thrown = false; + try { + uuid.v1({msecs: TIME, nsecs: 10000}); + } catch (e) { + thrown = true; + } + assert(thrown, 'Exception thrown when > 10K ids created in 1 ms'); +}); + +test('clock regression by msec', function() { + // Verify clock regression bumps clockseq + var uidt = uuid.v1({msecs: TIME}); + var uidtb = uuid.v1({msecs: TIME - 1}); + assert( + parseInt(uidtb.split('-')[3], 16) - parseInt(uidt.split('-')[3], 16) === 1, + 'Clock regression by msec increments the clockseq' + ); +}); + +test('clock regression by nsec', function() { + // Verify clock regression bumps clockseq + var uidtn = uuid.v1({msecs: TIME, nsecs: 10}); + var uidtnb = uuid.v1({msecs: TIME, nsecs: 9}); + assert( + parseInt(uidtnb.split('-')[3], 16) - parseInt(uidtn.split('-')[3], 16) === 1, + 'Clock regression by nsec increments the clockseq' + ); +}); + +test('explicit options product expected id', function() { + // Verify explicit options produce expected id + var id = uuid.v1({ + msecs: 1321651533573, + nsecs: 5432, + clockseq: 0x385c, + node: [ 0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10 ] + }); + assert(id == 'd9428888-122b-11e1-b85c-61cd3cbb3210', 'Explicit options produce expected id'); +}); + +test('ids spanning 1ms boundary are 100ns apart', function() { + // Verify adjacent ids across a msec boundary are 1 time unit apart + var u0 = uuid.v1({msecs: TIME, nsecs: 9999}); + var u1 = uuid.v1({msecs: TIME + 1, nsecs: 0}); + + var before = u0.split('-')[0], after = u1.split('-')[0]; + var dt = parseInt(after, 16) - parseInt(before, 16); + assert(dt === 1, 'Ids spanning 1ms boundary are 100ns apart'); +}); http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/v1.js ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/v1.js b/node_modules/xcode/node_modules/uuid/v1.js new file mode 100644 index 0000000..315bd4c --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/v1.js @@ -0,0 +1,103 @@ +// Unique ID creation requires a high quality random # generator. We feature +// detect to determine the best RNG source, normalizing to a function that +// returns 128-bits of randomness, since that's what's usually required +var rng = require('./lib/rng'); +var bytesToUuid = require('./lib/bytesToUuid'); + +// **`v1()` - Generate time-based UUID** +// +// Inspired by https://github.com/LiosK/UUID.js +// and http://docs.python.org/library/uuid.html + +// random #'s we need to init node and clockseq +var _seedBytes = rng(); + +// Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1) +var _nodeId = [ + _seedBytes[0] | 0x01, + _seedBytes[1], _seedBytes[2], _seedBytes[3], _seedBytes[4], _seedBytes[5] +]; + +// Per 4.2.2, randomize (14 bit) clockseq +var _clockseq = (_seedBytes[6] << 8 | _seedBytes[7]) & 0x3fff; + +// Previous uuid creation time +var _lastMSecs = 0, _lastNSecs = 0; + +// See https://github.com/broofa/node-uuid for API details +function v1(options, buf, offset) { + var i = buf && offset || 0; + var b = buf || []; + + options = options || {}; + + var clockseq = options.clockseq !== undefined ? options.clockseq : _clockseq; + + // UUID timestamps are 100 nano-second units since the Gregorian epoch, + // (1582-10-15 00:00). JSNumbers aren't precise enough for this, so + // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs' + // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00. + var msecs = options.msecs !== undefined ? options.msecs : new Date().getTime(); + + // Per 4.2.1.2, use count of uuid's generated during the current clock + // cycle to simulate higher resolution clock + var nsecs = options.nsecs !== undefined ? options.nsecs : _lastNSecs + 1; + + // Time since last uuid creation (in msecs) + var dt = (msecs - _lastMSecs) + (nsecs - _lastNSecs)/10000; + + // Per 4.2.1.2, Bump clockseq on clock regression + if (dt < 0 && options.clockseq === undefined) { + clockseq = clockseq + 1 & 0x3fff; + } + + // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new + // time interval + if ((dt < 0 || msecs > _lastMSecs) && options.nsecs === undefined) { + nsecs = 0; + } + + // Per 4.2.1.2 Throw error if too many uuids are requested + if (nsecs >= 10000) { + throw new Error('uuid.v1(): Can\'t create more than 10M uuids/sec'); + } + + _lastMSecs = msecs; + _lastNSecs = nsecs; + _clockseq = clockseq; + + // Per 4.1.4 - Convert from unix epoch to Gregorian epoch + msecs += 12219292800000; + + // `time_low` + var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000; + b[i++] = tl >>> 24 & 0xff; + b[i++] = tl >>> 16 & 0xff; + b[i++] = tl >>> 8 & 0xff; + b[i++] = tl & 0xff; + + // `time_mid` + var tmh = (msecs / 0x100000000 * 10000) & 0xfffffff; + b[i++] = tmh >>> 8 & 0xff; + b[i++] = tmh & 0xff; + + // `time_high_and_version` + b[i++] = tmh >>> 24 & 0xf | 0x10; // include version + b[i++] = tmh >>> 16 & 0xff; + + // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant) + b[i++] = clockseq >>> 8 | 0x80; + + // `clock_seq_low` + b[i++] = clockseq & 0xff; + + // `node` + var node = options.node || _nodeId; + for (var n = 0; n < 6; ++n) { + b[i + n] = node[n]; + } + + return buf ? buf : bytesToUuid(b); +} + +module.exports = v1; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/node_modules/uuid/v4.js ---------------------------------------------------------------------- diff --git a/node_modules/xcode/node_modules/uuid/v4.js b/node_modules/xcode/node_modules/uuid/v4.js new file mode 100644 index 0000000..38b6f76 --- /dev/null +++ b/node_modules/xcode/node_modules/uuid/v4.js @@ -0,0 +1,29 @@ +var rng = require('./lib/rng'); +var bytesToUuid = require('./lib/bytesToUuid'); + +function v4(options, buf, offset) { + var i = buf && offset || 0; + + if (typeof(options) == 'string') { + buf = options == 'binary' ? new Array(16) : null; + options = null; + } + options = options || {}; + + var rnds = options.random || (options.rng || rng)(); + + // Per 4.4, set bits for version and `clock_seq_hi_and_reserved` + rnds[6] = (rnds[6] & 0x0f) | 0x40; + rnds[8] = (rnds[8] & 0x3f) | 0x80; + + // Copy bytes to buffer, if provided + if (buf) { + for (var ii = 0; ii < 16; ++ii) { + buf[i + ii] = rnds[ii]; + } + } + + return buf || bytesToUuid(rnds); +} + +module.exports = v4; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/node_modules/xcode/package.json ---------------------------------------------------------------------- diff --git a/node_modules/xcode/package.json b/node_modules/xcode/package.json index 2a5aff3..d24741c 100644 --- a/node_modules/xcode/package.json +++ b/node_modules/xcode/package.json @@ -2,48 +2,48 @@ "_args": [ [ { - "raw": "xcode@^0.8.5", + "raw": "xcode@^0.9.0", "scope": null, "escapedName": "xcode", "name": "xcode", - "rawSpec": "^0.8.5", - "spec": ">=0.8.5 <0.9.0", + "rawSpec": "^0.9.0", + "spec": ">=0.9.0 <0.10.0", "type": "range" }, "/Users/shazron/Documents/git/apache/cordova-ios" ] ], - "_from": "xcode@>=0.8.5 <0.9.0", - "_id": "xcode@0.8.9", + "_from": "xcode@>=0.9.0 <0.10.0", + "_id": "xcode@0.9.3", "_inCache": true, "_location": "/xcode", - "_nodeVersion": "4.2.6", + "_nodeVersion": "6.9.5", "_npmOperationalInternal": { - "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/xcode-0.8.9.tgz_1469137632459_0.21505266707390547" + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/xcode-0.9.3.tgz_1491573003748_0.7576456561218947" }, "_npmUser": { "name": "anis", "email": "anis.kadri@gmail.com" }, - "_npmVersion": "2.14.12", + "_npmVersion": "3.10.10", "_phantomChildren": {}, "_requested": { - "raw": "xcode@^0.8.5", + "raw": "xcode@^0.9.0", "scope": null, "escapedName": "xcode", "name": "xcode", - "rawSpec": "^0.8.5", - "spec": ">=0.8.5 <0.9.0", + "rawSpec": "^0.9.0", + "spec": ">=0.9.0 <0.10.0", "type": "range" }, "_requiredBy": [ "/" ], - "_resolved": "https://registry.npmjs.org/xcode/-/xcode-0.8.9.tgz", - "_shasum": "ec6765f70e9dccccc9f6e9a5b9b4e7e814b4cf35", + "_resolved": "https://registry.npmjs.org/xcode/-/xcode-0.9.3.tgz", + "_shasum": "910a89c16aee6cc0b42ca805a6d0b4cf87211cf3", "_shrinkwrap": null, - "_spec": "xcode@^0.8.5", + "_spec": "xcode@^0.9.0", "_where": "/Users/shazron/Documents/git/apache/cordova-ios", "author": { "name": "Andrew Lunny", @@ -79,24 +79,25 @@ } ], "dependencies": { - "node-uuid": "1.4.7", - "pegjs": "0.9.0", - "simple-plist": "0.1.4" + "pegjs": "^0.10.0", + "simple-plist": "^0.2.1", + "uuid": "3.0.1" }, "description": "parser for xcodeproj/project.pbxproj files", "devDependencies": { - "nodeunit": "0.9.1" + "nodeunit": "^0.11.0" }, "directories": {}, "dist": { - "shasum": "ec6765f70e9dccccc9f6e9a5b9b4e7e814b4cf35", - "tarball": "https://registry.npmjs.org/xcode/-/xcode-0.8.9.tgz" + "shasum": "910a89c16aee6cc0b42ca805a6d0b4cf87211cf3", + "tarball": "https://registry.npmjs.org/xcode/-/xcode-0.9.3.tgz" }, "engines": { "node": ">=0.6.7" }, - "gitHead": "9f3726f6d766875500eebd85d9712925e3faa8b3", + "gitHead": "1cd220819906b62fc06c8833f905897600a53127", "homepage": "https://github.com/alunny/node-xcode#readme", + "license": "Apache-2.0", "main": "index.js", "maintainers": [ { @@ -125,5 +126,5 @@ "scripts": { "test": "nodeunit test/parser test" }, - "version": "0.8.9" + "version": "0.9.3" } http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4490abf2/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index c61e86f..63927a0 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ }, "dependencies": { "cordova-common": "2.0.2", - "ios-sim": "^5.1.0", + "ios-sim": "^6.0.0", "nopt": "^3.0.6", "plist": "^1.2.0", "q": "^1.4.1", --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org