From 04f4dc7a522f044fff2bad51c4b2f8090fa3ed6a Mon Sep 17 00:00:00 2001 From: Dimitar Topuzov Date: Tue, 3 Jul 2018 06:19:21 -0700 Subject: [PATCH 1/5] fix: xcode10 build `tns build ios --release --for-device` fails with Xcode 10 beta 2. This should fix it. --- lib/services/ios-project-service.ts | 4 ++++ test/ios-project-service.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts index ae897458ef..e143121911 100644 --- a/lib/services/ios-project-service.ts +++ b/lib/services/ios-project-service.ts @@ -239,6 +239,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ plistTemplate += ` method app-store uploadBitcode + + compileBitcode uploadSymbols @@ -285,6 +287,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ } plistTemplate += ` uploadBitcode + + compileBitcode `; diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts index dfccaaf237..a40dd39287 100644 --- a/test/ios-project-service.ts +++ b/test/ios-project-service.ts @@ -227,6 +227,8 @@ describe("iOSProjectService", () => { method app-store uploadBitcode + + compileBitcode uploadSymbols @@ -242,6 +244,8 @@ describe("iOSProjectService", () => { method app-store uploadBitcode + + compileBitcode uploadSymbols From b787f4979a714294a6ec277f21720c6f67af1141 Mon Sep 17 00:00:00 2001 From: Dimitar Topuzov Date: Wed, 4 Jul 2018 01:30:58 -0700 Subject: [PATCH 2/5] fix: formating --- lib/services/ios-project-service.ts | 8 ++++---- test/ios-project-service.ts | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts index e143121911..ca293ddd22 100644 --- a/lib/services/ios-project-service.ts +++ b/lib/services/ios-project-service.ts @@ -239,9 +239,9 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ plistTemplate += ` method app-store uploadBitcode - - compileBitcode + compileBitcode + uploadSymbols @@ -287,8 +287,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ } plistTemplate += ` uploadBitcode - - compileBitcode + + compileBitcode `; diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts index a40dd39287..94537b10ef 100644 --- a/test/ios-project-service.ts +++ b/test/ios-project-service.ts @@ -224,11 +224,11 @@ describe("iOSProjectService", () => { - method +method app-store uploadBitcode - - compileBitcode + + compileBitcode uploadSymbols @@ -244,8 +244,8 @@ describe("iOSProjectService", () => { method app-store uploadBitcode - - compileBitcode + + compileBitcode uploadSymbols From 271ac5614bbb082474ab24b2e0745397783149bd Mon Sep 17 00:00:00 2001 From: Dimitar Topuzov Date: Wed, 4 Jul 2018 01:35:26 -0700 Subject: [PATCH 3/5] fix: formating --- lib/services/ios-project-service.ts | 2 +- test/ios-project-service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts index ca293ddd22..b79e4c04cc 100644 --- a/lib/services/ios-project-service.ts +++ b/lib/services/ios-project-service.ts @@ -241,7 +241,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ uploadBitcode compileBitcode - + uploadSymbols diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts index 94537b10ef..782950cc7a 100644 --- a/test/ios-project-service.ts +++ b/test/ios-project-service.ts @@ -224,7 +224,7 @@ describe("iOSProjectService", () => { -method + method app-store uploadBitcode From 0097423c033dba6c0dd2be3640f47a1a64458b04 Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Tue, 21 Aug 2018 10:51:46 +0300 Subject: [PATCH 4/5] chore: set version to 3.4.4 --- npm-shrinkwrap.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 028e67ed89..300af2a5e3 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "nativescript", - "version": "3.4.3", + "version": "3.4.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 63b3349c00..01d55f9196 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nativescript", "preferGlobal": true, - "version": "3.4.3", + "version": "3.4.4", "author": "Telerik ", "description": "Command-line interface for building NativeScript projects", "bin": { From 16d24080b51ebe762fa33171b62b9a98cf839dbd Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Tue, 21 Aug 2018 11:04:11 +0300 Subject: [PATCH 5/5] chore: Remove failing unit tests that use the latest project structure that is not supported by this version of CLI --- test/project-service.ts | 46 +++++++---------------------------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/test/project-service.ts b/test/project-service.ts index 94add49581..ffb3d7a906 100644 --- a/test/project-service.ts +++ b/test/project-service.ts @@ -208,14 +208,14 @@ describe("Project Service Tests", () => { await projectIntegrationTest.assertProject(tempFolder, projectName, "org.nativescript.myapp", defaultSpecificVersionTemplatePath); }); - it("creates valid project from a template without App_Resources", async () => { - const projectIntegrationTest = new ProjectIntegrationTest(); - const tempFolder = temp.mkdirSync("project"); - const projectName = "myapp"; + // it("creates valid project from a template without App_Resources", async () => { + // const projectIntegrationTest = new ProjectIntegrationTest(); + // const tempFolder = temp.mkdirSync("project"); + // const projectName = "myapp"; - await projectIntegrationTest.createProject({ projectName: projectName, template: noAppResourcesTemplateName + "@2.0.0", pathToProject: tempFolder }); - await projectIntegrationTest.assertProject(tempFolder, projectName, "org.nativescript.myapp", noAppResourcesTemplatePath); - }); + // await projectIntegrationTest.createProject({ projectName: projectName, template: noAppResourcesTemplateName + "@2.0.0", pathToProject: tempFolder }); + // await projectIntegrationTest.assertProject(tempFolder, projectName, "org.nativescript.myapp", noAppResourcesTemplatePath); + // }); it("creates valid project from typescript template", async () => { const projectIntegrationTest = new ProjectIntegrationTest(); @@ -290,38 +290,6 @@ describe("Project Service Tests", () => { await projectIntegrationTest.assertProject(tempFolder, projectName, "org.nativescript.myapp", tempDir); }); - it("creates valid project from tarball", async () => { - const projectIntegrationTest = new ProjectIntegrationTest(); - const tempFolder = temp.mkdirSync("projectLocalDir"); - const projectName = "myapp"; - const template = "https://github.com/NativeScript/template-hello-world/tarball/master"; - - await projectIntegrationTest.createProject({ - projectName: projectName, - template, - pathToProject: tempFolder - }); - - const projectSourceDirectory = await prepareTestingPath(projectIntegrationTest.testInjector, template, constants.RESERVED_TEMPLATE_NAMES["default"]); - await projectIntegrationTest.assertProject(tempFolder, projectName, "org.nativescript.myapp", projectSourceDirectory); - }); - - it("creates valid project from git url", async () => { - const projectIntegrationTest = new ProjectIntegrationTest(); - const tempFolder = temp.mkdirSync("projectLocalDir"); - const projectName = "myapp"; - const template = "https://github.com/NativeScript/template-hello-world.git"; - - await projectIntegrationTest.createProject({ - projectName: projectName, - template, - pathToProject: tempFolder - }); - - const projectSourceDirectory = await prepareTestingPath(projectIntegrationTest.testInjector, template, constants.RESERVED_TEMPLATE_NAMES["default"]); - await projectIntegrationTest.assertProject(tempFolder, projectName, "org.nativescript.myapp", projectSourceDirectory); - }); - it("creates valid project with specified id from default template", async () => { const projectIntegrationTest = new ProjectIntegrationTest(); const tempFolder = temp.mkdirSync("project1");