Skip to content

feat: Add support for building projects with Xcode 10 #3830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 21, 2018
Merged

feat: Add support for building projects with Xcode 10 #3830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04f4dc7
fix: xcode10 build
dtopuzov Jul 3, 2018
b787f49
fix: formating
dtopuzov Jul 4, 2018
271ac56
fix: formating
dtopuzov Jul 4, 2018
0097423
chore: set version to 3.4.4
rosen-vladimirov Aug 21, 2018
16d2408
chore: Remove failing unit tests that use the latest project structur…
rosen-vladimirov Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/services/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
<string>app-store</string>
<key>uploadBitcode</key>
<false/>
<key>compileBitcode</key>
<false/>
<key>uploadSymbols</key>
<false/>
</dict>
Expand Down Expand Up @@ -286,6 +288,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
plistTemplate += `
<key>uploadBitcode</key>
<false/>
<key>compileBitcode</key>
<false/>
</dict>
</plist>`;

Expand Down
2 changes: 1 addition & 1 deletion npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nativescript",
"preferGlobal": true,
"version": "3.4.3",
"version": "3.4.4",
"author": "Telerik <[email protected]>",
"description": "Command-line interface for building NativeScript projects",
"bin": {
Expand Down
4 changes: 4 additions & 0 deletions test/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ describe("iOSProjectService", () => {
<string>app-store</string>
<key>uploadBitcode</key>
<false/>
<key>compileBitcode</key>
<false/>
<key>uploadSymbols</key>
<false/>
</dict>
Expand All @@ -243,6 +245,8 @@ describe("iOSProjectService", () => {
<string>app-store</string>
<key>uploadBitcode</key>
<false/>
<key>compileBitcode</key>
<false/>
<key>uploadSymbols</key>
<false/>
</dict>
Expand Down
46 changes: 7 additions & 39 deletions test/project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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");
Expand Down