Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7CBF41792C for ; Wed, 23 Sep 2015 19:58:13 +0000 (UTC) Received: (qmail 71341 invoked by uid 500); 23 Sep 2015 19:58:13 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 71151 invoked by uid 500); 23 Sep 2015 19:58:13 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 70590 invoked by uid 99); 23 Sep 2015 19:58:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2015 19:58:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A89B5E0537; Wed, 23 Sep 2015 19:58:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: commits@cordova.apache.org Date: Wed, 23 Sep 2015 19:58:16 -0000 Message-Id: In-Reply-To: <06f6c6c7d0c746a08d138630fdaa05ed@git.apache.org> References: <06f6c6c7d0c746a08d138630fdaa05ed@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/45] android commit: CB-9149 Fixes JSHint issue introduced by 899daa9 CB-9149 Fixes JSHint issue introduced by 899daa9 Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/b15d39d2 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/b15d39d2 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/b15d39d2 Branch: refs/heads/5.0.x Commit: b15d39d25f7a7737bceb7c6e7766c324037efd38 Parents: fcde2b5 Author: Vladimir Kotikov Authored: Mon Jul 20 13:00:17 2015 +0300 Committer: Joe Bowser Committed: Thu Aug 20 13:48:01 2015 -0700 ---------------------------------------------------------------------- bin/templates/cordova/lib/build.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b15d39d2/bin/templates/cordova/lib/build.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index 9835172..cd07a59 100644 --- a/bin/templates/cordova/lib/build.js +++ b/bin/templates/cordova/lib/build.js @@ -258,8 +258,7 @@ var builders = { } } - var name=extractRealProjectNameFromManifest(ROOT); - var subProjectsAsGradlePaths = subProjects.map(function(p) { return ':' + p.replace(/[/\\]/g, ':'); }); + var name = extractRealProjectNameFromManifest(ROOT); //Remove the proj.id/name- prefix from projects: https://issues.apache.org/jira/browse/CB-9149 var settingsGradlePaths = subProjects.map(function(p){ var realDir=p.replace(/[/\\]/g, ':'); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org