Skip to content

Merge release into master #4891

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.

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 63 commits into from
Jul 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
0f5f5ad
fix: start native watch on cloud run command and from sidekick when c…
Fatme Jul 15, 2019
deffafc
docs: --no-hmr added, --syncAllFiles and --bundle removed, added note…
KristianDD Jul 15, 2019
04584cd
docs: describe how different changes are synced
KristianDD Jul 15, 2019
b4b4f2d
fix: update nativescript-angular during app migration as we are updat…
DimitarTachev Jul 15, 2019
cec2906
Merge pull request #4849 from NativeScript/fatme/native-watch-cloud
Fatme Jul 16, 2019
1277156
Merge pull request #4852 from NativeScript/tachev/update-angular-on-m…
Jul 16, 2019
c2b1448
fix: support node <= 8.9.4 (lookbehind is supported only with the `ha…
DimitarTachev Jul 16, 2019
50ac37b
Merge pull request #4854 from NativeScript/tachev/support-node8-in-we…
Jul 16, 2019
811b406
docs: add package.json change effect to run, debug, test docs
KristianDD Jul 16, 2019
62616a4
Merge pull request #4850 from NativeScript/kddimitrov/update-document…
KristianDD Jul 16, 2019
94a4344
docs: update `tns migrate` docs based on the latest changes
DimitarTachev Jul 16, 2019
649c579
docs: describe the `--force` flag in the docs
DimitarTachev Jul 16, 2019
214311f
fix: respect correctly `hmr: false` from command's dashed options
Fatme Jul 15, 2019
4ea2cf4
Merge pull request #4855 from NativeScript/tachev/update-migrate-docs
rosen-vladimirov Jul 16, 2019
d10acd7
fix: don't override `--env.production` and `--env.verbose` when provi…
Fatme Jul 16, 2019
e0768b4
docs: update outdated docs
DimitarTachev Jul 16, 2019
2273aba
Merge pull request #4857 from NativeScript/fatme/keep-user-env
Fatme Jul 16, 2019
64495e9
Merge pull request #4858 from NativeScript/tachev/update-docs
KristianDD Jul 16, 2019
db2163c
docs: remove --sdk flag from documentation
KristianDD Jul 16, 2019
69782ea
fix: preview for app downloaded from playground fails
KristianDD Jul 16, 2019
4f9a2de
Merge pull request #4859 from NativeScript/kddimitrov/docs-remove-sdk…
KristianDD Jul 16, 2019
d66acfd
Merge pull request #4860 from NativeScript/kddimitrov/fix-preview-dow…
KristianDD Jul 16, 2019
f33fe1e
chore: update required deps for 6.0
rosen-vladimirov Jul 17, 2019
5e1d236
Merge pull request #4862 from NativeScript/vladimirov/update-deps-mig…
Fatme Jul 17, 2019
363bf0f
fix: stop livesync on initial sync when there is an error
Fatme Jul 17, 2019
d26948f
chore: update Changelog for 6.0 release
rosen-vladimirov Jul 17, 2019
d459cae
Merge pull request #4866 from NativeScript/vladimirov/changelog-600
rosen-vladimirov Jul 17, 2019
6149d32
fix: bump the version of `nativescript-unit-test-runner` from migrate
Fatme Jul 17, 2019
d2f7bc9
Merge pull request #4868 from NativeScript/fatme/bump-unit-test-runner
Fatme Jul 17, 2019
0fffc64
fix: add forgotten migrate dependencies for Vue and Angular apps
DimitarTachev Jul 17, 2019
fc33178
chore: set version to 6.0.1
rosen-vladimirov Jul 17, 2019
14fb58b
fix: don't hangs livesync process when there is an error on initial s…
Fatme Jul 17, 2019
fdb6b78
Merge pull request #4870 from NativeScript/vladimirov/set-version
rosen-vladimirov Jul 17, 2019
06f92ac
fix: fix the behavior when ddi is not installed on iOS device
Fatme Jul 17, 2019
c5dec21
docs: remove --platform-template from CLI's help
rosen-vladimirov Jul 17, 2019
ce61e4f
Merge pull request #4871 from NativeScript/fatme/stop-livesync
Fatme Jul 17, 2019
9fb869e
Merge pull request #4872 from NativeScript/fatme/fix-ddi-error
Fatme Jul 17, 2019
1f6beef
Merge pull request #4869 from NativeScript/tachev/update-migrate-deps
rosen-vladimirov Jul 17, 2019
a32e8f1
Merge pull request #4856 from NativeScript/fatme/fix-argv
Fatme Jul 17, 2019
d6d9a05
Merge pull request #4875 from NativeScript/vladimirov/fix-platform-te…
rosen-vladimirov Jul 17, 2019
172c7a7
fix: parse options correctly
Fatme Jul 18, 2019
ea7c814
Merge pull request #4880 from NativeScript/fatme/fix-options
Fatme Jul 18, 2019
9bb2a65
docs: update migrate help
rosen-vladimirov Jul 18, 2019
4688fc5
docs: update Changelog for 6.0.1
rosen-vladimirov Jul 18, 2019
121b065
Merge pull request #4881 from NativeScript/vladimirov/update-migrate-…
Fatme Jul 18, 2019
5085b78
fix: migrate and update exit with code 0 when everything is up-to-date
DimitarTachev Jul 19, 2019
2af7be5
chore: fix pr comments
Jul 19, 2019
fab4069
Merge pull request #4886 from NativeScript/tachev/fix-migrate-exit-code
Jul 19, 2019
62aecdd
fix(cloud, sidekick): don't stop livesync on iOS device without devel…
Fatme Jul 18, 2019
b7a32da
fix(run): remove prepareReadyEvent handler correctly on run
rosen-vladimirov Jul 19, 2019
713a817
fix(preview): remove prepareReadyEvent handler correctly on preview
rosen-vladimirov Jul 19, 2019
b7595b5
fix: remove webpackCompilationComplete handler correctly on prepare
rosen-vladimirov Jul 19, 2019
f0e79b3
fix: webpackCompilerService should not cache childProcesses forever
rosen-vladimirov Jul 19, 2019
7c83e3c
fix: stopPreview does not stop running webpack compilers
rosen-vladimirov Jul 19, 2019
a55591d
chore: fix run-controllers unit tests
rosen-vladimirov Jul 19, 2019
99676a4
chore: set version to 6.0.2
rosen-vladimirov Jul 19, 2019
a0b701a
Merge pull request #4888 from NativeScript/fatme/ddi
rosen-vladimirov Jul 19, 2019
c403047
fix(migrate): include forgotten Angular dependency from the code-shar…
DimitarTachev Jul 19, 2019
1df87b5
Merge pull request #4887 from NativeScript/tachev/add-missing-migrate…
Jul 22, 2019
d25168a
docs: changelog for 6.0.2
Fatme Jul 22, 2019
15fdf19
Merge pull request #4890 from NativeScript/fatme/changelog-6.0.2
Fatme Jul 22, 2019
fd96a73
Merge branch 'release' into tachev/release-into-master
DimitarTachev Jul 22, 2019
ab71a5b
chore: bump version
DimitarTachev Jul 22, 2019
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
78 changes: 78 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,84 @@
NativeScript CLI Changelog
================

6.0.2 (2019, July 22)
==
* [Fixed #4885](https://github.com/NativeScript/nativescript-cli/issues/4885): `migrate` and `update` commands are failing where everything is up-to-date
* [Fixed #4887](https://github.com/NativeScript/nativescript-cli/pull/4887): Include forgotten Angular dependency from the code-sharing apps
* [Fixed #4888](https://github.com/NativeScript/nativescript-cli/pull/4888): Sidekick: multiple errors in Sidekick

6.0.1 (2019, July 18)
==
* [Fixed #4814](https://github.com/NativeScript/nativescript-cli/issues/4814): Missing `yargs-parser` dependency
* [Fixed #4846](https://github.com/NativeScript/nativescript-cli/issues/4846): Xcode running on devices crashes with error `Unable to create file *.hot-update.json`
* [Fixed #4871](https://github.com/NativeScript/nativescript-cli/pull/4871): Issues when stopping the LiveSync process
* [Fixed #4872](https://github.com/NativeScript/nativescript-cli/pull/4872): Sidekick: debug operation fails on iOS when Developer Disk Image is not installed on device
* [Fixed #4873](https://github.com/NativeScript/nativescript-cli/issues/4873): `tns migrate` should update `nativescript-vue-template-compiler`
* [Fixed #4874](https://github.com/NativeScript/nativescript-cli/issues/4874): After `tns migrate` preview/build/run commands fail with `ERROR in The Angular Compiler requires TypeScript >=3.1.1 and <3.3.0 but 3.4.5 was found instead.`
* [Fixed #4876](https://github.com/NativeScript/nativescript-cli/issues/4876):`tns migrate` does not update @ngtools/webpack
* [Fixed #4878](https://github.com/NativeScript/nativescript-cli/issues/4878): `tns migrate` does not update @angular/animations
* [Fixed #4879](https://github.com/NativeScript/nativescript-cli/issues/4879): `--platform-template` option is still shown in CLI's help

6.0.0 (2019, July 17)
==

### Breaking changes

* Applications can be build only with bundle workflow - in previous versions there were two ways to build your application - `bundle` and `legacy` workflow. With this release CLI allows building your app only in case you are using the bundle workflow. More information is available [in this blopost](https://www.nativescript.org/blog/the-future-of-building-nativescript-apps)
* With older CLI versions you were able to run `tns debug android` and continue debugging after the command exits. In this release, when CLI exits, it clears all used resources, so you will not be able to continue the debug session. More information is available in [this issue](https://github.com/NativeScript/nativescript-cli/issues/4219) for more information.
* `--syncAllFiles` option is not supported anymore - this option was added to force CLI to watch all files in `node_modules`. In 6.0 this is the default and only behavior - webpack watches all required files and CLI watches the `platforms` directories and `package.json` files of the plugins added as dependencies of the application.
* Drop support for Xcode versions below 10 - new features for iOS require the latest Xcode versions, so we decided to require at least Xcode 10 for building the applications
* Drop support for Node.js below 8 - Node.js 8 does not support [these version anymore](https://github.com/nodejs/Release) and so does our CLI. In case you are using such Node.js version, CLI will not allow you to execute any command, so you should upgrade to latest LTS version.
* `--platformTemplate` option has been deleted. More information can be found in [this issue](https://github.com/NativeScript/nativescript-cli/issues/4867).
* `tns init` command has been deleted
* `tns clean app` command has been deleted
* Improved plugin development workflow may require changes in your daily work when creating plugins. More information can be found in [this issue](https://github.com/NativeScript/nativescript-cli/issues/4865)
* When you pass `--release`, CLI will switch webpack in production mode. More information can be found in [this issue](https://github.com/NativeScript/nativescript-cli/issues/4497)
* CLI now forces sourceMap generation by default when building in debug mode. You can disable them by passing `--env.sourceMap false`. souceMaps are disabled by default in release builds, you can enable them by passing `--env.sourceMap`.

### New
* [Implemented #2368](https://github.com/NativeScript/nativescript-cli/issues/2368): Compiling in other path (dist), no in same path (src/app)
* [Implemented #2417](https://github.com/NativeScript/nativescript-cli/issues/2417): Show TypeScript line numbers in stack traces
* [Implemented #2776](https://github.com/NativeScript/nativescript-cli/issues/2776): Add ability to ignore files from final package when build in release
* [Implemented #3378](https://github.com/NativeScript/nativescript-cli/issues/3378): Running app with locally installed plugin should transpile the plugin's TypeScript files
* [Implemented #4497](https://github.com/NativeScript/nativescript-cli/issues/4497): Ability to detect within webpack if app is being built for release
* [Implemented #4604](https://github.com/NativeScript/nativescript-cli/issues/4604): Logs and errors from devices always point to bundle/vendor files
* [Implemented #4646](https://github.com/NativeScript/nativescript-cli/issues/4646): Introduce command (`tns migrate`) to migrate old project to 6.0.0 requirements
* [Implemented #4648](https://github.com/NativeScript/nativescript-cli/issues/4648): Drop support for Node.js < 8
* [Implemented #4649](https://github.com/NativeScript/nativescript-cli/issues/4649): Deprecate support for Node.js < 10
* [Implemented #4650](https://github.com/NativeScript/nativescript-cli/issues/4650): Add official support for Node.js 12
* [Implemented #4651](https://github.com/NativeScript/nativescript-cli/issues/4651): Add drawer navigation prompt when vue flavor is selected on `tns create`
* [Implemented #4667](https://github.com/NativeScript/nativescript-cli/issues/4667): Support yarn hoisted packages in a workspace context
* [Implemented #4692](https://github.com/NativeScript/nativescript-cli/issues/4692): CLI should watch package.json files in the application
* [Implemented #4731](https://github.com/NativeScript/nativescript-cli/issues/4731): Drop support for Xcode < 10
* [Implemented #4863](https://github.com/NativeScript/nativescript-cli/issues/4863): Delete `tns init` command
* [Implemented #4863](https://github.com/NativeScript/nativescript-cli/issues/4863): Delete `tns clean app` command
* [Implemented #4865](https://github.com/NativeScript/nativescript-cli/issues/4865): Improve plugin development workflow
* [Implemented #4867](https://github.com/NativeScript/nativescript-cli/issues/4867): Delete `--platformTemplate` option

### Fixed
* [Fixed #2739](https://github.com/NativeScript/nativescript-cli/issues/2739): Unit test runner do not work in --watch mode
* [Fixed #2963](https://github.com/NativeScript/nativescript-cli/issues/2963): Confusing messages on preparing plugin
* [Fixed #3028](https://github.com/NativeScript/nativescript-cli/issues/3028): Local dependency brakes build
* [Fixed #3146](https://github.com/NativeScript/nativescript-cli/issues/3146): `tns run ios` shows "No reachable hosts" after running unit tests
* [Fixed #3351](https://github.com/NativeScript/nativescript-cli/issues/3351): If you delete the whole css data or the css file itself the changes are not going to be applied to the app
* [Fixed #3546](https://github.com/NativeScript/nativescript-cli/issues/3546): Your project have installed babel-traverse version null but Android platform requires version ^6.4.5
* [Fixed #3568](https://github.com/NativeScript/nativescript-cli/issues/3568): EXPORT FAILED fse.node has conflicting provisioning settings
* [Fixed #3630](https://github.com/NativeScript/nativescript-cli/issues/3630): cp: copyFileSync: could not write to dest file (code=EPERM)
* [Fixed #3767](https://github.com/NativeScript/nativescript-cli/issues/3767): Exception when delete a file from `<plugin>/platforms/android`
* [Fixed #3849](https://github.com/NativeScript/nativescript-cli/issues/3849): The livesync check if a file has modifications doesn't work as expected
* [Fixed #4219](https://github.com/NativeScript/nativescript-cli/issues/4219): Android debugging is leaking the debug session
* [Fixed #4239](https://github.com/NativeScript/nativescript-cli/issues/4239): Copy `App_Resources` directly to `platforms/.../res` (Android) or `platforms/.../Resources` (iOS) instead of copying them with Webpack
* [Fixed #4264 ](https://github.com/NativeScript/nativescript-cli/issues/4264 ): When using `--syncAllFiles` on Android frequently crashes with error
* [Fixed #4480](https://github.com/NativeScript/nativescript-cli/issues/4480): [TypeScript & Vue project] When using `--bundle` changes made to a platform specific file in `node_modules` does not start a new build process
* [Fixed #4500](https://github.com/NativeScript/nativescript-cli/issues/4500): Changes to `.js` files located in `node_modules` causes the `livesync` to take upto 30 sec
* [Fixed #4513](https://github.com/NativeScript/nativescript-cli/issues/4513): Error when building for Android and using `bcryptjs`
* [Fixed #4607](https://github.com/NativeScript/nativescript-cli/issues/4607): Image replacement is not respected during tns run with hmr
* [Fixed #4647](https://github.com/NativeScript/nativescript-cli/issues/4647): CLI's checkForChanges method should not check all `node_modules`
* [Fixed #4658](https://github.com/NativeScript/nativescript-cli/issues/4658): [iOS] tns preview is including tns-core-modules in vendor.js
* [Fixed #4770](https://github.com/NativeScript/nativescript-cli/issues/4770): Incorrect execution of hooks where there is unresolved injected dependency


5.4.2 (2019, June 19)
==

Expand Down
18 changes: 17 additions & 1 deletion docs/man_pages/general/migrate.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The following folders will be removed: **"hooks"**, **"platforms"** and **"node_
The **"nativescript-dev-sass"** and **"nativescript-dev-typescript"** dependencies will be replaced with **"node-sass"** and **"typescript"** respectively.
The **"nativescript-dev-less"** dependency will be removed, but to enable LESS CSS support the user should follow the steps in this<% if(isConsole) { %> feature request: https://github.com/NativeScript/nativescript-dev-webpack/issues/967.<% } %><% if(isHtml) { %> [feature request](https://github.com/NativeScript/nativescript-dev-webpack/issues/967).<% } %>

The following dependencies will be updated if needed:
The following dependencies will be updated if needed:
* tns-core-modules
* tns-core-modules-widgets
* tns-platform-declarations
Expand All @@ -37,6 +37,22 @@ The following dependencies will be updated if needed:
* kinvey-nativescript-sdk
* nativescript-plugin-firebase
* nativescript-vue
* nativescript-vue-template-compiler
* nativescript-angular
* @angular/animiations
* @angular/platform-browser-dynamic
* @angular/common
* @angular/compiler
* @angular/compiler-cli
* @angular/core
* @angular/forms
* @angular/http
* @angular/platform-browser
* @angular/router
* @ngtools/webpack
* @angular-devkit/build-angular
* rxjs
* zone.js
* nativescript-unit-test-runner
* karma-webpack
* karma-jasmine
Expand Down
1 change: 0 additions & 1 deletion docs/man_pages/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ Command | Description
---|---
[create](project/creation/create.html) | Creates a new project for native development with NativeScript.
[preview](project/testing/preview.html) | Generates a QR code that can be scanned by the NativeScript PlayGround app.
[init](project/creation/init.html) | Initializes an existing project for native development with NativeScript.
[platform add `<Platform>`](project/configuration/platform-add.html) | Configures the current project to target the selected platform.
[platform list](project/configuration/platform.html) | Lists all platforms that the project currently targets.
[platform remove `<Platform>`](project/configuration/platform-remove.html) | Removes the selected platform from the platforms that the project currently targets. This operation deletes all platform-specific files and subdirectories from your project.
Expand Down
2 changes: 1 addition & 1 deletion docs/man_pages/lib-management/plugin-add.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ position: 1
### Description

<% if(isConsole) { %>Installs the specified plugin and any packages that it depends on.<% } %>
<% if(isHtml) { %>Installs the specified plugin and its dependencies in the local `node_modules` folder, adds it to the `dependencies` section in `package.json`, and prepares the plugin for all installed platforms. If you have not configured any platforms for the project, the NativeScript CLI will prepare the plugin when you add a platform. For more information about working with plugins, see [NativeScript Plugins](https://github.com/NativeScript/nativescript-cli/blob/master/PLUGINS.md).<% } %>
<% if(isHtml) { %>Installs the specified plugin and its dependencies in the local `node_modules` folder, adds it to the `dependencies` section in `package.json`, and prepares the plugin for all installed platforms. If you have not configured any platforms for the project, the NativeScript CLI will prepare the plugin when you add a platform.<% } %>

### Commands

Expand Down
5 changes: 4 additions & 1 deletion docs/man_pages/lib-management/plugin-create.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ position: 1
Creates a new project for NativeScript plugin development. The project uses the [NativeScript Plugin Seed](https://github.com/NativeScript/nativescript-plugin-seed) as a base and contains the following directories:

* `src` - source code of the plugin
* `demo` - simple NativeScript application used to test and show plugin features
* `publish` - shell scripts used to build and pack the plugin source code and publish it in [NPM](https://www.npmjs.com/)

The command will also propose you to setup demo applications and if you accept them, it will create the following additional directories:
* `demo` - simple NativeScript application used to test and show plugin features
* `demo-angular` - simple Angular application used to test and show plugin features

The project is setup for easy commit in Github, which is why the command will ask you for your Github username.
<% if(isHtml) { %>Before starting to code your first plugin, you can visit the NativeScript documentation page for [building plugins](https://docs.nativescript.org/plugins/building-plugins#step-2-set-up-a-development-workflow) or the [plugin seed repository](https://github.com/NativeScript/nativescript-plugin-seed/blob/master/README.md).<% } %>

Expand Down
2 changes: 1 addition & 1 deletion docs/man_pages/lib-management/plugin-remove.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ position: 4
### Description

<% if(isConsole) { %>Uninstalls a plugin by its name.<% } %>
<% if(isHtml) { %>Removes the specified plugin and its dependencies from the local `node_modules` folder and the `dependencies` section in `package.json`. This operation does not remove the plugin from the installed platforms and you need to run `$ tns prepare` to finish uninstalling the plugin. For more information about working with plugins, see [NativeScript Plugins](https://github.com/NativeScript/nativescript-cli/blob/master/PLUGINS.md).<% } %>
<% if(isHtml) { %>Removes the specified plugin and its dependencies from the local `node_modules` folder and the `dependencies` section in `package.json`. This operation does not remove the plugin from the installed platforms and you need to run `$ tns prepare` to finish uninstalling the plugin.<% } %>

### Commands

Expand Down
2 changes: 1 addition & 1 deletion docs/man_pages/lib-management/plugin-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ position: 7
### Description

<% if(isConsole) { %>Uninstalls and installs the specified plugin(s) and any packages that it depends on.<% } %>
<% if(isHtml) { %>Uninstalls and installs the specified plugin(s) and its dependencies in the local `node_modules` folder, adds it to the `dependencies` section in `package.json`, and prepares the plugin(s) for all installed platforms. If you have not configured any platforms for the project, the NativeScript CLI will prepare the plugin(s) when you add a platform. For more information about working with plugins, see [NativeScript Plugins](https://github.com/NativeScript/nativescript-cli/blob/master/PLUGINS.md).<% } %>
<% if(isHtml) { %>Uninstalls and installs the specified plugin(s) and its dependencies in the local `node_modules` folder, adds it to the `dependencies` section in `package.json`, and prepares the plugin(s) for all installed platforms. If you have not configured any platforms for the project, the NativeScript CLI will prepare the plugin(s) when you add a platform.<% } %>

### Commands

Expand Down
13 changes: 5 additions & 8 deletions docs/man_pages/project/configuration/platform-add.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,14 @@ Configures the current project to target the selected platform. <% if(isHtml) {

Usage | Synopsis
------|-------
Android latest runtime | `$ tns platform add android [--framework-path <File Path>] [--symlink] [--sdk <API Level>] [--platform-template <Platform Template>]`
Android selected runtime | `$ tns platform add android[@<Version>] [--framework-path <File Path>] [--symlink] [--sdk <API Level>] [--platform-template <Platform Template>]`
<% if (isMacOS) { %>iOS latest runtime | `$ tns platform add ios [--framework-path <File Path>] [--symlink]`
iOS selected runtime | `$ tns platform add ios[@<Version>] [--framework-path <File Path>] [--symlink] [--platform-template <Platform Template>]`<% } %>
Android latest runtime | `$ tns platform add android [--framework-path <File Path>]`
Android selected runtime | `$ tns platform add android[@<Version>] [--framework-path <File Path>] `
<% if (isMacOS) { %>iOS latest runtime | `$ tns platform add ios [--framework-path <File Path>]`
iOS selected runtime | `$ tns platform add ios[@<Version>] [--framework-path <File Path>] `<% } %>

### Options

* `--framework-path` - Sets the path to a NativeScript runtime for the specified platform that you want to use instead of the default runtime. If `--symlink` is specified, `<File Path>` is the complete path to a valid npm package or a directory that contains a NativeScript runtime for the selected platform and must point to directory in which the runtime is already extracted. If `--symlink` is not specified, `<File Path>` must point to a valid npm package.
* `--symlink` - Creates a symlink to a NativeScript runtime for the specified platform that you want to use instead of the default runtime. If `--frameworkPath` is specified, creates a symlink to the specified directory. If `--frameworkPath` is not specified, creates a symlink to platform runtime installed with your current version of NativeScript.
* `--sdk` - Sets the target Android SDK for the project. `<API Level>` is a valid Android API level. For example: 17, 19, MNC.<% if(isHtml) { %> For a complete list of the Android API levels and their corresponding Android versions, click [here](http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#platform).<% } %>
* `--platform-template` - Sets the platform template that will be used for the native application. `<Platform Template>` is a valid npm package, path to directory, .tgz or GitHub URL that contains a native Android or iOS template.
* `--framework-path` - Sets the path to a NativeScript runtime for the specified platform that you want to use instead of the default runtime. `<File Path>` must point to a valid npm package.

### Arguments

Expand Down
Loading