Skip to content
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

Merge release in master #2809

Merged
merged 7 commits into from
May 12, 2017
Merged

Merge release in master #2809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dbb8210
Update Travis CI Scripts (#2799)
May 11, 2017
970f548
Remove .html from the files included in the fast-livesync to force fu…
yyosifov May 11, 2017
a82cfec
Update Travis CI Scripts (#2804)
May 11, 2017
e37a10b
Fix UserId passing to Analytics Service (#2806)
yyosifov May 11, 2017
3a1d40d
Release notes for 3.0.1 (#2807)
dtopuzov May 11, 2017
1d57f5f
Merge remote-tracking branch 'origin/release' into vladimirov/merge-r…
rosen-vladimirov May 12, 2017
5311af8
Update to latest common lib
rosen-vladimirov May 12, 2017
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
9 changes: 8 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ after_success:
- mkdir s3-publish
- cp nativescript*.tgz s3-publish/nativescript.tgz
before_deploy:
- node .travis/add-publishConfig.js next
- node .travis/add-publishConfig.js $TRAVIS_BRANCH
deploy:
- provider: s3
bucket: nativescript-ci
Expand All @@ -43,3 +43,10 @@ deploy:
branch: master
api_key:
secure: KzzsvF3eA3j4gRQa8tO//+XWNSR3XiX8Sa18o3PyKyG9/cBZ6PQ3Te74cNS1C3ZiLUOgs5dWA6/TmRVPci4XjvFaWo/B6e2fuVSl5H94Od99bkeBHJsbLSEkLN4ClV/YbGuyKgA5Q2yIFt6p2EJjL90RjbbIk7I4YuyG2Mo3j0Q=
- provider: npm
skip_cleanup: true
email: nativescript@telerik.com
on:
branch: release
api_key:
secure: KzzsvF3eA3j4gRQa8tO//+XWNSR3XiX8Sa18o3PyKyG9/cBZ6PQ3Te74cNS1C3ZiLUOgs5dWA6/TmRVPci4XjvFaWo/B6e2fuVSl5H94Od99bkeBHJsbLSEkLN4ClV/YbGuyKgA5Q2yIFt6p2EJjL90RjbbIk7I4YuyG2Mo3j0Q=
24 changes: 12 additions & 12 deletions .travis/add-publishConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
#!/usr/bin/env node

var fsModule = require('fs');
var fsModule = require("fs");

//Adds a publishConfig section to the package.json file
// Adds a publishConfig section to the package.json file
// and sets a tag to it

var path = './package.json';
var path = "./package.json";
var fileOptions = {encoding: "utf-8"};
var content = fsModule.readFileSync(path, fileOptions);

var tag = process.argv[2];
if (!tag) {
console.log('Please pass the tag name as an argument!');
process.exit(1);
}

var packageDef = JSON.parse(content);
if (!packageDef.publishConfig) {
packageDef.publishConfig = {};
}
packageDef.publishConfig.tag = tag;

var newContent = JSON.stringify(packageDef, null, ' ');
fsModule.writeFileSync(path, newContent, fileOptions);
var branch = process.argv[2];
if (!branch) {
console.log("Please pass the branch name as an argument!");
process.exit(1);
}
packageDef.publishConfig.tag = branch === "release" ? "rc" : "next";

var newContent = JSON.stringify(packageDef, null, " ");
fsModule.writeFileSync(path, newContent, fileOptions);
16 changes: 16 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
NativeScript CLI Changelog
================

3.0.1 (2017, May 11)
==

### Fixed

* [Fix #2780](https://github.com/NativeScript/nativescript-cli/issues/2780): CLI tool doesn't restart app if HTML/CSS file was modified
* [Fix #2732](https://github.com/NativeScript/nativescript-cli/issues/2732): Livesync crashes app every OTHER time on iOS with 3.0.0-rc.2
* [Fix #2764](https://github.com/NativeScript/nativescript-cli/issues/2764): Error when executing "tns run ios" with 3.0 on a project that is located in a directory path with "spaces"

2.5.5 (2017, May 11)
==

### Fixed

* [Fix #2782](https://github.com/NativeScript/nativescript-cli/issues/2782): [2.5.*] tns run always add latest platform

3.0.0 (2017, May 3)
==

Expand Down
2 changes: 1 addition & 1 deletion lib/common
Open in desktop
Submodule common updated 2 files
+1 −1 services/analytics-service-base.ts
+18 −3 services/typescript-service.ts
2 changes: 1 addition & 1 deletion lib/providers/livesync-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export class LiveSyncProvider implements ILiveSyncProvider {
private $childProcess: IChildProcess,
private $options: IOptions) { }

private static FAST_SYNC_FILE_EXTENSIONS = [".css", ".xml", ".html"];
private static FAST_SYNC_FILE_EXTENSIONS = [".css", ".xml"];

private deviceSpecificLiveSyncServicesCache: IDictionary<any> = {};
public get deviceSpecificLiveSyncServices(): IDictionary<any> {
Expand Down
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.0.0",
"version": "3.0.1",
"author": "Telerik <support@telerik.com>",
"description": "Command-line interface for building NativeScript projects",
"bin": {
Expand Down