Merge pull request #4449 from NativeScript/kddimitrov/update-xcode-dependencies

chore: update xcode dependencies

Author: KristianDD

lib/definitions/xcode.d.ts

@@ -1,4 +1,4 @@
-declare module "xcode" {
+declare module "nativescript-dev-xcode" {
     interface Options {
         [key: string]: any;
 

lib/node/xcode.ts

@@ -1,4 +1,4 @@
-import * as xcode from "xcode";
+import * as xcode from "nativescript-dev-xcode";
 
 declare global {
 	type IXcode = typeof xcode;

npm-shrinkwrap.json

@@ -56,14 +56,15 @@
     "minimatch": "3.0.2",
     "mkdirp": "0.5.1",
     "mute-stream": "0.0.5",
+    "nativescript-dev-xcode": "https://github.com/NativeScript/nativescript-dev-xcode/archive/master.tar.gz",
     "nativescript-doctor": "1.8.1",
     "nativescript-preview-sdk": "0.3.3",
     "open": "0.0.5",
     "ora": "2.0.0",
     "osenv": "0.1.3",
     "pacote": "8.1.6",
     "pako": "1.0.6",
-    "pbxproj-dom": "1.0.11",
+    "pbxproj-dom": "1.1.0",
     "plist": "1.1.0",
     "plist-merge-patch": "0.1.1",
     "proper-lockfile": "3.2.0",
@@ -83,7 +84,6 @@
     "uuid": "3.0.1",
     "winreg": "0.0.17",
     "ws": "5.1.0",
-    "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",
@@ -133,4 +133,4 @@
   "engines": {
     "node": ">=8.0.0 <12.0.0"
   }
-}
+}

package.json

@@ -697,7 +697,7 @@ describe("Source code support", () => {
 			return pbxProj;
 		};
 
-		it("adds source files as resources", async () => {
+		it("adds source files in Sources build phase", async () => {
 			const sourceFileNames = [
 				"src/Header.h", "src/ObjC.m",
 				"src/nested/Header.hpp", "src/nested/Source.cpp", "src/nested/ObjCpp.mm",
@@ -721,14 +721,15 @@ describe("Source code support", () => {
 
 			sourceFileNames.map(file => path.basename(file)).forEach(basename => {
 				const ext = path.extname(basename);
-				const shouldBeAdded = ext !== ".donotadd" && !ext.startsWith(".h");
+				const shouldBeAdded = ext !== ".donotadd";
 				assert.notEqual(pbxFileReferenceValues.indexOf(basename), -1, `${basename} not added to PBXFileRefereces`);
+
 				const buildPhaseFile = buildPhaseFiles.find((fileObject: any) => fileObject.comment.startsWith(basename));
-				if (shouldBeAdded) {
+				if (shouldBeAdded && !path.extname(basename).startsWith(".h")) {
 					assert.isDefined(buildPhaseFile, `${basename} not added to PBXSourcesBuildPhase`);
 					assert.include(buildPhaseFile.comment, "in Sources", `${basename} must be added to Sources group`);
 				} else {
-					assert.isUndefined(buildPhaseFile, `${basename} must not be added to Sources group`);
+					assert.isUndefined(buildPhaseFile, `${basename} is added to PBXSourcesBuildPhase, but it shouldn't have been.`);
 				}
 			});
 		});
@@ -749,14 +750,15 @@ describe("Source code support", () => {
 
 			sourceFileNames.map(file => path.basename(file)).forEach(basename => {
 				const ext = path.extname(basename);
-				const shouldBeAdded = ext !== ".donotadd" && !ext.startsWith(".h");
-				const buildPhaseFile = buildPhaseFiles.find((fileObject: any) => fileObject.comment.startsWith(basename));
+				const shouldBeAdded = ext !== ".donotadd";
 				assert.notEqual(pbxFileReferenceValues.indexOf(basename), -1, `${basename} not added to PBXFileRefereces`);
-				if (shouldBeAdded) {
+
+				const buildPhaseFile = buildPhaseFiles.find((fileObject: any) => fileObject.comment.startsWith(basename));
+				if (shouldBeAdded && !path.extname(basename).startsWith(".h")) {
 					assert.isDefined(buildPhaseFile, `${basename} not added to PBXSourcesBuildPhase`);
 					assert.include(buildPhaseFile.comment, "in Sources", `${basename} must be added to Sources group`);
 				} else {
-					assert.isUndefined(buildPhaseFile, `${basename} must not be added to Sources group`);
+					assert.isUndefined(buildPhaseFile, `${basename} was added to PBXSourcesBuildPhase, but it shouldn't have been`);
 				}
 			});
 		});