fix: uuid module overwritten

Author: KristianDD

lib/pbxProject.js

@@ -19,7 +19,7 @@ var util = require('util'),
     f = util.format,
     EventEmitter = require('events').EventEmitter,
     $path = require('path'),
-    uuid = require('uuid'),
+    $uuid = require('uuid'),
     fork = require('child_process').fork,
     pbxWriter = require('./pbxWriter'),
     pbxFile = require('./pbxFile').pbxFile,
@@ -91,7 +91,7 @@ pbxProject.prototype.allUuids = function() {
 }
 
 pbxProject.prototype.generateUuid = function() {
-    var id = uuid.v4()
+    var id = $uuid.v4()
         .replace(/-/g, '')
         .substr(0, 24)
         .toUpperCase()
@@ -482,19 +482,19 @@ pbxProject.prototype.addToPbxBuildFileSection = function(file) {
 }
 
 pbxProject.prototype.removeFromPbxBuildFileSection = function(file) {
-    var uuid;
+    var fileUuid;
 
-    for (uuid in this.pbxBuildFileSection()) {
-        if (this.pbxBuildFileSection()[uuid].fileRef_comment == file.basename) {
-            file.uuid = uuid;
-            this.removeFromPbxBuildFileSectionByUuid(uuid);
+    for (fileUuid in this.pbxBuildFileSection()) {
+        if (this.pbxBuildFileSection()[fileUuid].fileRef_comment == file.basename) {
+            file.uuid = fileUuid;
+            this.removeFromPbxBuildFileSectionByUuid(fileUuid);
         }
     }
 }
 
-pbxProject.prototype.removeFromPbxBuildFileSectionByUuid = function(uuid) {
+pbxProject.prototype.removeFromPbxBuildFileSectionByUuid = function(itemUuid) {
     var buildSection = this.pbxBuildFileSection();
-    removeItemAndCommentFromSectionByUuid(buildSection, uuid);
+    removeItemAndCommentFromSectionByUuid(buildSection, itemUuid);
 }
 
 pbxProject.prototype.findMainPbxGroup = function () {
@@ -1639,8 +1639,8 @@ pbxProject.prototype.removeTarget = function(target, targetKey) {
 
     //remove files from all build phases from PBXBuildFile section
     for (let k = 0; k < files.length; k++) {
-        const uuid = files[k].value;
-        this.removeFromPbxBuildFileSectionByUuid(uuid);
+        const fileUuid = files[k].value;
+        this.removeFromPbxBuildFileSectionByUuid(fileUuid);
     }
 
     //remove target from the project itself
@@ -1712,7 +1712,7 @@ pbxProject.prototype.removeTarget = function(target, targetKey) {
                         removeItemAndCommentFromSectionByUuid(pbxCopySection, copyPhaseId);
                     } else {
                         //if there are other files in the copy phase, just remove the product
-                        copyPhase.files(p, 1);
+                        copyPhase.files.splice(p, 1);
                     }
                     break;
                 }
@@ -1769,10 +1769,10 @@ pbxProject.prototype.removeTarget = function(target, targetKey) {
     this.removePbxGroup(unquote(target.name));
 };
 
-function removeItemAndCommentFromSectionByUuid(section, uuid) {
-    var commentKey = f("%s_comment", uuid)
+function removeItemAndCommentFromSectionByUuid(section, itemUuid) {
+    var commentKey = f("%s_comment", itemUuid)
     delete section[commentKey];
-    delete section[uuid];
+    delete section[itemUuid];
 }
 
 // helper recursive prop search+replace