Merge pull request #4406 from NativeScript/kddimitrov/rebase-node-xcode

fix: update node-xcode library

Author: KristianDD

lib/services/ios-project-service.ts

@@ -1101,7 +1101,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 	private async prepareNativeSourceCode(groupName: string, sourceFolderPath: string, projectData: IProjectData): Promise<void> {
 		const project = this.createPbxProj(projectData);
 		const group = this.getRootGroup(groupName, sourceFolderPath);
-		project.addPbxGroup(group.files, group.name, group.path, null, { isMain: true });
+		project.addPbxGroup(group.files, group.name, group.path, null, { isMain: true, filesRelativeToProject: true });
 		project.addToHeaderSearchPaths(group.path);
 		this.savePbxProj(project, projectData);
 	}

npm-shrinkwrap.json

@@ -83,7 +83,7 @@
     "uuid": "3.0.1",
     "winreg": "0.0.17",
     "ws": "5.1.0",
-    "xcode": "https://github.com/NativeScript/node-xcode/archive/NativeScript-1.5.2.tar.gz",
+    "xcode": "https://github.com/NativeScript/node-xcode/archive/kddimitrov/rebase-upstream.tar.gz",
     "xml2js": "0.4.19",
     "xmldom": "0.1.21",
     "yargs": "6.0.0",

package.json

@@ -697,17 +697,14 @@ describe("Source code support", () => {
 
 			sourceFileNames.map(file => path.basename(file)).forEach(basename => {
 				const ext = path.extname(basename);
-				const shouldBeAdded = ext !== ".donotadd";
+				const shouldBeAdded = ext !== ".donotadd" && !ext.startsWith(".h");
+				assert.notEqual(pbxFileReferenceValues.indexOf(basename), -1, `${basename} not added to PBXFileRefereces`);
+				const buildPhaseFile = buildPhaseFiles.find((fileObject: any) => fileObject.comment.startsWith(basename));
 				if (shouldBeAdded) {
-					assert.notEqual(pbxFileReferenceValues.indexOf(basename), -1, `${basename} not added to PBXFileRefereces`);
-
-					if (shouldBeAdded && !path.extname(basename).startsWith(".h")) {
-						const buildPhaseFile = buildPhaseFiles.find((fileObject: any) => fileObject.comment.startsWith(basename));
-						assert.isDefined(buildPhaseFile, `${basename} not added to PBXSourcesBuildPhase`);
-						assert.include(buildPhaseFile.comment, "in Sources", `${basename} must be added to Sources group`);
-					}
+					assert.isDefined(buildPhaseFile, `${basename} not added to PBXSourcesBuildPhase`);
+					assert.include(buildPhaseFile.comment, "in Sources", `${basename} must be added to Sources group`);
 				} else {
-					assert.equal(pbxFileReferenceValues.indexOf(basename), -1, `${basename} was added to PBXFileRefereces, but it shouldn't have been`);
+					assert.isUndefined(buildPhaseFile, `${basename} must not be added to Sources group`);
 				}
 			});
 		});
@@ -728,17 +725,14 @@ describe("Source code support", () => {
 
 			sourceFileNames.map(file => path.basename(file)).forEach(basename => {
 				const ext = path.extname(basename);
-				const shouldBeAdded = ext !== ".donotadd";
+				const shouldBeAdded = ext !== ".donotadd" && !ext.startsWith(".h");
+				const buildPhaseFile = buildPhaseFiles.find((fileObject: any) => fileObject.comment.startsWith(basename));
+				assert.notEqual(pbxFileReferenceValues.indexOf(basename), -1, `${basename} not added to PBXFileRefereces`);
 				if (shouldBeAdded) {
-					assert.notEqual(pbxFileReferenceValues.indexOf(basename), -1, `${basename} not added to PBXFileRefereces`);
-
-					if (shouldBeAdded && !path.extname(basename).startsWith(".h")) {
-						const buildPhaseFile = buildPhaseFiles.find((fileObject: any) => fileObject.comment.startsWith(basename));
-						assert.isDefined(buildPhaseFile, `${basename} not added to PBXSourcesBuildPhase`);
-						assert.include(buildPhaseFile.comment, "in Sources", `${basename} must be added to Sources group`);
-					}
+					assert.isDefined(buildPhaseFile, `${basename} not added to PBXSourcesBuildPhase`);
+					assert.include(buildPhaseFile.comment, "in Sources", `${basename} must be added to Sources group`);
 				} else {
-					assert.equal(pbxFileReferenceValues.indexOf(basename), -1, `${basename} was added to PBXFileRefereces, but it shouldn't have been`);
+					assert.isUndefined(buildPhaseFile, `${basename} must not be added to Sources group`);
 				}
 			});
 		});