fix: framework not aded to build phase if present in file reference

Author: KristianDD

lib/pbxProject.js

@@ -338,14 +338,19 @@ pbxProject.prototype.addFramework = function(fpath, opt) {
     file.fileRef = this.generateUuid();
     file.target = opt ? opt.target : undefined;
 
-    if (this.hasFile(file.path)) return false;
-
-    this.addToPbxBuildFileSection(file);        // PBXBuildFile
-    this.addToPbxFileReferenceSection(file);    // PBXFileReference
-    this.addToFrameworksPbxGroup(file);         // PBXGroup
+    var fileReference = this.hasFile(file.path);
+    if (fileReference) {
+        var key = this.getFileKey(file.path);
+        file.fileRef = key;
+    } else {
+        this.addToPbxFileReferenceSection(file);    // PBXFileReference
+        this.addToFrameworksPbxGroup(file);         // PBXGroup
+    }
 
     if (link) {
-      this.addToPbxFrameworksBuildPhase(file);    // PBXFrameworksBuildPhase
+        if(this.addToPbxFrameworksBuildPhase(file)) {   // PBXFrameworksBuildPhase)
+            this.addToPbxBuildFileSection(file);        // PBXBuildFile
+        }
     }
 
     if (customFramework) {
@@ -357,13 +362,13 @@ pbxProject.prototype.addFramework = function(fpath, opt) {
 
           embeddedFile.uuid = this.generateUuid();
           embeddedFile.fileRef = file.fileRef;
+          embeddedFile.target = file.target;
 
-          //keeping a separate PBXBuildFile entry for Embed Frameworks
-          this.addToPbxBuildFileSection(embeddedFile);        // PBXBuildFile
-
-          this.addToPbxEmbedFrameworksBuildPhase(embeddedFile); // PBXCopyFilesBuildPhase
-
-          return embeddedFile;
+            if(this.addToPbxEmbedFrameworksBuildPhase(embeddedFile)) {  // PBXCopyFilesBuildPhase
+                //keeping a separate PBXBuildFile entry for Embed Frameworks
+                this.addToPbxBuildFileSection(embeddedFile);            // PBXBuildFile
+                return embeddedFile;
+            }
         }
     }
 
@@ -856,10 +861,25 @@ pbxProject.prototype.removeFromFrameworksPbxGroup = function(file) {
     }
 }
 
+function hasReferenceInPbxBuildFile(buildFileReferences, fileReference) {
+    var buildFileSection = this.pbxBuildFileSection();
+    for(let buildFileReference of buildFileReferences) {
+        if(buildFileSection[buildFileReference.value] && buildFileSection[buildFileReference.value].fileRef === fileReference.fileRef){
+            return true;
+        }
+    }
+}
+
 pbxProject.prototype.addToPbxEmbedFrameworksBuildPhase = function (file) {
     var sources = this.pbxEmbedFrameworksBuildPhaseObj(file.target);
+
     if (sources) {
+        if(hasReferenceInPbxBuildFile.call(this, sources.files, file)){
+            return false;
+        }
+
         sources.files.push(pbxBuildPhaseObj(file));
+        return true;
     }
 }
 
@@ -933,7 +953,15 @@ pbxProject.prototype.removeFromPbxResourcesBuildPhase = function(file) {
 
 pbxProject.prototype.addToPbxFrameworksBuildPhase = function(file) {
     var sources = this.pbxFrameworksBuildPhaseObj(file.target);
-    sources.files.push(pbxBuildPhaseObj(file));
+
+    if (sources) {
+        if (hasReferenceInPbxBuildFile.call(this, sources.files, file)) {
+            return false;
+        }
+
+        sources.files.push(pbxBuildPhaseObj(file));
+        return true;
+    }
 }
 
 pbxProject.prototype.removeFromPbxFrameworksBuildPhase = function(file) {
@@ -1353,8 +1381,10 @@ pbxProject.prototype.addToFrameworkSearchPaths = function(file) {
             || buildSettings['FRAMEWORK_SEARCH_PATHS'] === INHERITED) {
             buildSettings['FRAMEWORK_SEARCH_PATHS'] = [INHERITED];
         }
-
-        buildSettings['FRAMEWORK_SEARCH_PATHS'].push(searchPathForFile(file, this));
+        var searchPath = searchPathForFile(file, this);
+        if(buildSettings['FRAMEWORK_SEARCH_PATHS'].indexOf(searchPath) < 0){
+            buildSettings['FRAMEWORK_SEARCH_PATHS'].push(searchPath);
+        }
     }
 }
 
@@ -1565,6 +1595,19 @@ pbxProject.prototype.hasFile = function(filePath) {
     return false;
 }
 
+pbxProject.prototype.getFileKey = function(filePath) {
+    var files = nonComments(this.pbxFileReferenceSection()),
+        file, id;
+    for (id in files) {
+        file = files[id];
+        if (file.path == filePath || file.path == ('"' + filePath + '"')) {
+            return id;
+        }
+    }
+
+    return false;
+}
+
 pbxProject.prototype.addTarget = function(name, type, subfolder) {
 
     // Setup uuid and name of new target