Skip to content

Commit

Permalink
Merge pull request #808 from NativeScript/fatme/release-1.2.4
Browse files Browse the repository at this point in the history
Release 1.2.4
  • Loading branch information
Fatme authored and Fatme committed Aug 21, 2015
2 parents ab782c3 + e443fc4 commit 03efa8a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions lib/services/android-project-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<void>()();
}
Expand Down
2 changes: 1 addition & 1 deletion lib/services/plugins-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nativescript",
"preferGlobal": true,
"version": "1.2.3",
"version": "1.2.4",
"author": "Telerik <support@telerik.com>",
"description": "Command-line interface for building NativeScript projects",
"bin": {
Expand Down

0 comments on commit 03efa8a

Please sign in to comment.