From 72b8dbcc1c30f771d3f1ff2de27ee5e029add624 Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Fri, 21 Aug 2015 10:47:08 +0300 Subject: [PATCH 1/6] Bump version to 1.2.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7272861d27..886abf1ad7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nativescript", "preferGlobal": true, - "version": "1.2.3", + "version": "1.2.4", "author": "Telerik ", "description": "Command-line interface for building NativeScript projects", "bin": { From 88cc5dee1ce6aa70634359a4ea22f0aead87b3db Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Thu, 20 Aug 2015 09:11:35 +0300 Subject: [PATCH 2/6] Execute android project update in addLibrary --- lib/services/android-project-service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts index 21aa7de351..5c1d7eab9a 100644 --- a/lib/services/android-project-service.ts +++ b/lib/services/android-project-service.ts @@ -248,6 +248,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService let libProjProp = path.join(libraryPath, "project.properties"); if (this.$fs.exists(libProjProp).wait()) { this.updateProjectReferences(this.platformData.projectRoot, targetLibPath).wait(); + this.runAndroidUpdate(targetLibPath, this.getTarget(this.platformData.projectRoot).wait()).wait(); } }).future()(); } From e443fc4d8d540291e2357d0895ebf174a8a81839 Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Thu, 20 Aug 2015 12:57:01 +0300 Subject: [PATCH 3/6] Respect dependency.directory if such is already calculated --- lib/services/plugins-service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts index c87af0d611..f51af50f5a 100644 --- a/lib/services/plugins-service.ts +++ b/lib/services/plugins-service.ts @@ -184,7 +184,7 @@ export class PluginsService implements IPluginsService { let pluginData: any = {}; pluginData.name = cacheData.name; pluginData.version = cacheData.version; - pluginData.fullPath = path.dirname(this.getPackageJsonFilePathForModule(cacheData.name)); + pluginData.fullPath = cacheData.directory || path.dirname(this.getPackageJsonFilePathForModule(cacheData.name)); pluginData.isPlugin = !!cacheData.nativescript; pluginData.pluginPlatformsFolderPath = (platform: string) => path.join(pluginData.fullPath, "platforms", platform); From 407b2c558deaf1d5d5f9253cc6606ce93492d128 Mon Sep 17 00:00:00 2001 From: Valentin Stoychev Date: Fri, 21 Aug 2015 14:15:21 +0300 Subject: [PATCH 4/6] Update README.md update relative links, to be absolute so that they will work on nmpjs.org --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 75b1dc4f3b..b7a2836186 100644 --- a/README.md +++ b/README.md @@ -505,7 +505,7 @@ tns doctor This command prints warnings about current configuration issues and provides basic information about how to resolve them. -If addressing the configuration issues does not resolve your problem, you can [report an issue](CONTRIBUTING.md#report-an-issue) or [post in the NativeScript page in Google Groups](https://groups.google.com/forum/#!forum/nativescript). +If addressing the configuration issues does not resolve your problem, you can [report an issue](https://github.com/NativeScript/nativescript-cli/CONTRIBUTING.md#report-an-issue) or [post in the NativeScript page in Google Groups](https://groups.google.com/forum/#!forum/nativescript). [Back to Top][1] @@ -526,11 +526,11 @@ Known Issues How to Contribute === -To learn how to log a bug that you just discovered, click [here](CONTRIBUTING.md#report-an-issue). +To learn how to log a bug that you just discovered, click [here](https://github.com/NativeScript/nativescript-cli/CONTRIBUTING.md#report-an-issue). -To learn how to suggest a new feature or improvement, click [here](CONTRIBUTING.md#request-a-feature). +To learn how to suggest a new feature or improvement, click [here](https://github.com/NativeScript/nativescript-cli/CONTRIBUTING.md#request-a-feature). -To learn how to contribute to the code base, click [here](CONTRIBUTING.md#contribute-to-the-code-base). +To learn how to contribute to the code base, click [here](https://github.com/NativeScript/nativescript-cli/CONTRIBUTING.md#contribute-to-the-code-base). [Back to Top][1] @@ -557,4 +557,4 @@ This software is licensed under the Apache 2.0 license, quoted Date: Fri, 21 Aug 2015 14:17:28 +0300 Subject: [PATCH 5/6] Update README.md fix contribute links. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b7a2836186..5b2cd5116b 100644 --- a/README.md +++ b/README.md @@ -505,7 +505,7 @@ tns doctor This command prints warnings about current configuration issues and provides basic information about how to resolve them. -If addressing the configuration issues does not resolve your problem, you can [report an issue](https://github.com/NativeScript/nativescript-cli/CONTRIBUTING.md#report-an-issue) or [post in the NativeScript page in Google Groups](https://groups.google.com/forum/#!forum/nativescript). +If addressing the configuration issues does not resolve your problem, you can [report an issue](https://github.com/NativeScript/nativescript-cli/blob/master/CONTRIBUTING.md#report-an-issue) or [post in the NativeScript page in Google Groups](https://groups.google.com/forum/#!forum/nativescript). [Back to Top][1] @@ -526,11 +526,11 @@ Known Issues How to Contribute === -To learn how to log a bug that you just discovered, click [here](https://github.com/NativeScript/nativescript-cli/CONTRIBUTING.md#report-an-issue). +To learn how to log a bug that you just discovered, click [here](https://github.com/NativeScript/nativescript-cli/blob/master/CONTRIBUTING.md#report-an-issue). -To learn how to suggest a new feature or improvement, click [here](https://github.com/NativeScript/nativescript-cli/CONTRIBUTING.md#request-a-feature). +To learn how to suggest a new feature or improvement, click [here](https://github.com/NativeScript/nativescript-cli/blob/master/CONTRIBUTING.md#request-a-feature). -To learn how to contribute to the code base, click [here](https://github.com/NativeScript/nativescript-cli/CONTRIBUTING.md#contribute-to-the-code-base). +To learn how to contribute to the code base, click [here](https://github.com/NativeScript/nativescript-cli/blob/master/CONTRIBUTING.md#contribute-to-the-code-base). [Back to Top][1] From 7655bff7eeafc16dc375a23ae0cf8d37874ab839 Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Fri, 21 Aug 2015 17:59:15 +0300 Subject: [PATCH 6/6] 1.2.4 Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76c1777689..d585382336 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ NativeScript CLI Changelog ================ +1.2.4 (2015, August 24) +== + +### Fixed + +* [Fixed #806](https://github.com/NativeScript/nativescript-cli/issues/806): `tns library add android` command does not execute android project update if target 17 is not installed. +* [Fixed #807](https://github.com/NativeScript/nativescript-cli/issues/807): Android native libs are not respected correctly if the plugin is added as depedency to another plugin. + 1.2.3 (2015, August 18) ==