Merge pull request #134 from NativeScript/fatme/merge-release

Merge release branch

Author: Fatme

Gruntfile.js

@@ -124,8 +124,12 @@ module.exports = function(grunt) {
 
 		var packageJson = grunt.file.readJSON("package.json");
 		var versionParts = packageJson.version.split("-");
-		versionParts[1] = buildVersion;
-		packageJson.version = versionParts.join("-");
+		if (process.env["RELEASE_BUILD"]) {
+			packageJson.version = versionParts[0];
+		} else {
+			versionParts[1] = buildVersion;
+			packageJson.version = versionParts.join("-");
+		}
 		grunt.file.write("package.json", JSON.stringify(packageJson, null, "  "));
 	});
 

lib/services/android-project-service.ts

@@ -52,7 +52,7 @@ class AndroidProjectService implements IPlatformProjectService {
 			var paths = "assets libs res".split(' ').map(p => path.join(frameworkDir, p));
 			shell.cp("-R", paths, projectRoot);
 
-			paths = "AndroidManifest.xml project.properties".split(' ').map(p => path.join(frameworkDir, p));
+			paths = ".project AndroidManifest.xml project.properties".split(' ').map(p => path.join(frameworkDir, p));
 			shell.cp("-f", paths, projectRoot);
 
 			// Create src folder

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "0.3.0",
+  "version": "0.3.2",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {