From d3257bb1a947d1068c74162bb841e31f55573843 Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Tue, 14 Oct 2014 13:01:41 +0300 Subject: [PATCH 1/4] Add .project file --- lib/services/android-project-service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts index 6750c3f8e4..5a27db3499 100644 --- a/lib/services/android-project-service.ts +++ b/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 From 7def4dbbcb7cb58e80c418267ef8804a114421e3 Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Tue, 14 Oct 2014 17:26:03 +0300 Subject: [PATCH 2/4] Bump version to 0.3.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c914e4bf7..6539a3d010 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nativescript", "preferGlobal": true, - "version": "0.3.0", + "version": "0.3.1", "author": "Telerik ", "description": "Command-line interface for building NativeScript projects", "bin": { From 10561512d19d3c0bc36d3772a6de499700af8748 Mon Sep 17 00:00:00 2001 From: Erjan Gavalji Date: Fri, 17 Oct 2014 09:41:52 +0300 Subject: [PATCH 3/4] Distinguish a release build from a regular build - release build must not have a debug extension --- Gruntfile.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index a6858a7a01..532be9e708 100644 --- a/Gruntfile.js +++ b/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 = versionParts[0]; + } else { + versionParts[1] = buildVersion; + packageJson.version = versionParts.join("-"); + } grunt.file.write("package.json", JSON.stringify(packageJson, null, " ")); }); From 2e7b52bd336fa193ac0994c08406d3f672bf4951 Mon Sep 17 00:00:00 2001 From: Erjan Gavalji Date: Fri, 17 Oct 2014 09:43:01 +0300 Subject: [PATCH 4/4] Bump package version to 0.3.2 --- Gruntfile.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 532be9e708..4e703a0b0b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -125,7 +125,7 @@ module.exports = function(grunt) { var packageJson = grunt.file.readJSON("package.json"); var versionParts = packageJson.version.split("-"); if (process.env["RELEASE_BUILD"]) { - packageJson = versionParts[0]; + packageJson.version = versionParts[0]; } else { versionParts[1] = buildVersion; packageJson.version = versionParts.join("-"); diff --git a/package.json b/package.json index 6539a3d010..77799de494 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nativescript", "preferGlobal": true, - "version": "0.3.1", + "version": "0.3.2", "author": "Telerik ", "description": "Command-line interface for building NativeScript projects", "bin": {