fix: plist added to build phase, assets not added to resources

Author: KristianDD

lib/pbxFile.js

@@ -75,8 +75,7 @@ var FILETYPE_BY_EXTENSION = {
         'sourcecode.c.objc': 'Sources',
         'sourcecode.swift': 'Sources',
         'sourcecode.cpp.cpp': 'Sources',
-        'sourcecode.cpp.objcpp': 'Sources',
-        'text.plist.entitlements': 'Reference' //only in file reference
+        'sourcecode.cpp.objcpp': 'Sources'
     },
     PATH_BY_FILETYPE = {
         'compiled.mach-o.dylib': 'usr/lib/',
@@ -112,6 +111,10 @@ function isSourceFileType(fileType) {
     return fileType.startsWith(SOURCE_CODE_FILE_TYPE_PREFIX) && !isHeaderFileType(fileType);
 }
 
+function isAssetFileType(fileType) {
+    return fileType === FILETYPE_BY_EXTENSION.xcassets;
+}
+
 function isResource(group) {
     return group === "Resources";
 }
@@ -120,6 +123,10 @@ function isEntitlement(fileType) {
     return fileType.endsWith(ENTITLEMENTS_FILE_TYPE_SUFFIX);
 }
 
+function isPlist(fileType) {
+    return fileType === FILETYPE_BY_EXTENSION.plist;
+}
+
 function unquoted(text){
     return text == null ? '' : text.replace (/(^")|("$)/g, '')
 }
@@ -273,5 +280,7 @@ module.exports = {
     isSourceFileType,
     isHeaderFileType,
     isResource,
-    isEntitlement
+    isEntitlement,
+    isAssetFileType,
+    isPlist
 }

lib/pbxProject.js

@@ -26,7 +26,9 @@ var util = require('util'),
     isSourceFileType = require('./pbxFile').isSourceFileType,
     isHeaderFileType = require('./pbxFile').isHeaderFileType,
     isResource = require('./pbxFile').isResource,
-    isEntitlement = require('./pbxFile').isEntitlement
+    isEntitlement = require('./pbxFile').isEntitlement,
+    isAssetFileType = require('./pbxFile').isAssetFileType,
+    isPlist = require('./pbxFile').isPlist,
     fs = require('fs'),
     parser = require('./parser/pbxproj'),
     plist = require('simple-plist'),
@@ -566,18 +568,11 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
         if(opt.target) {
             file.target = opt.target;
         }
-        if (fs.existsSync(filePath) && fs.lstatSync(filePath).isDirectory()) {
+        if (fs.existsSync(filePath) && fs.lstatSync(filePath).isDirectory() && !isAssetFileType(file.lastKnownFileType)) {
             file.fileRef = file.uuid;
             var files = fs.readdirSync(filePath).map(p => $path.join(filePath, p));
             if($path.extname(filePath) === ".lproj") {
-                for (var i = 0; i < files.length; i++) {
-                    var variantGroup = this.addLocalizationVariantGroup($path.basename(files[i]), { target: opt.target, skipAddToResourcesGroup: true });
-                    var refFile = new pbxFile($path.relative(srcRootPath, files[i]), {basename: $path.parse(file.basename).name});
-                    refFile.fileRef = this.generateUuid();
-                    this.addToPbxFileReferenceSection(refFile);
-                    this.addToPbxVariantGroup(refFile, variantGroup.fileRef);
-                    pbxGroup.children.push(pbxGroupChild(variantGroup));
-                }
+                addLocalizationGroup.call(this, pbxGroup, file, files, srcRootPath, opt);
             } else {
                 this.addToPbxFileReferenceSection(file);    // PBXFileReference
                 this.addToPbxBuildFileSection(file);
@@ -587,18 +582,22 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
         } else {
             this.addToPbxFileReferenceSection(file);    // PBXFileReference
             pbxGroup.children.push(pbxGroupChild(file));
-            if(isHeaderFileType(file.lastKnownFileType)) {
+            if(isHeaderFileType(file.lastKnownFileType) || isPlist(file.lastKnownFileType)) {
                 continue;
-            } else if (isSourceFileType(file.lastKnownFileType)) {
-                this.addToPbxBuildFileSection(file);        // PBXBuildFile
-                this.addToPbxSourcesBuildPhase(file);
-            } else if(isEntitlement(file.lastKnownFileType)) {
+            } 
+
+            if(isEntitlement(file.lastKnownFileType)) {
                 this.addToBuildSettings('CODE_SIGN_ENTITLEMENTS', file.path, opt.target);
+                continue;
+            }
+
+            if (isSourceFileType(file.lastKnownFileType)) {    // PBXBuildFile
+                this.addToPbxSourcesBuildPhase(file);
             } else if(isResource(file.group)) {
                 this.addToPbxResourcesBuildPhase(file)
-            } else {
-                this.addToPbxBuildFileSection(file);
             }
+
+            this.addToPbxBuildFileSection(file);
         }
     }
 
@@ -619,6 +618,21 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
     return {uuid: pbxGroupUuid, pbxGroup: pbxGroup};
 }
 
+function addLocalizationGroup(pbxGroup, variantFile, files, srcRootPath, opt) {
+    for (var i = 0; i < files.length; i++) {
+        var variantGroupName = $path.parse($path.basename(files[i])).name + ".storyboard";
+        var variantGroup = this.findPBXVariantGroupKey({name: variantGroupName});
+        if(!variantGroup) {
+            variantGroup = this.addLocalizationVariantGroup(variantGroupName, { target: opt.target, skipAddToResourcesGroup: true });
+            pbxGroup.children.push(pbxGroupChild(variantGroup));
+        }
+        var refFile = new pbxFile($path.relative(srcRootPath, files[i]), {basename: $path.parse(variantFile.basename).name});
+        refFile.fileRef = this.generateUuid();
+        this.addToPbxFileReferenceSection(refFile);
+        this.addToPbxVariantGroup(refFile, variantGroup.fileRef);
+    }
+}
+
 pbxProject.prototype.removePbxGroup = function(groupName, path) {
     var group = this.pbxGroupByName(groupName);
     if (!group) { 
@@ -1375,15 +1389,17 @@ pbxProject.prototype.removeFromHeaderSearchPaths = function(file) {
 
     }
 }
-pbxProject.prototype.addToHeaderSearchPaths = function(file) {
+pbxProject.prototype.addToHeaderSearchPaths = function(file, productName) {
     var configurations = nonComments(this.pbxXCBuildConfigurationSection()),
         INHERITED = '"$(inherited)"',
         config, buildSettings, searchPaths;
 
+    productName = unquote(productName || this.productName);
+
     for (config in configurations) {
         buildSettings = configurations[config].buildSettings;
 
-        if (unquote(buildSettings['PRODUCT_NAME']) != this.productName)
+        if (unquote(buildSettings['PRODUCT_NAME']) != productName)
             continue;
 
         if (!buildSettings['HEADER_SEARCH_PATHS']) {