You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2017/01/04 01:22:16 UTC
[1/4] android commit: CB-12169: Check for build directory before
running a clean
Repository: cordova-android
Updated Branches:
refs/heads/6.1.x e85661378 -> a51fc4b25
CB-12169: Check for build directory before running a clean
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/c2ddd2da
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/c2ddd2da
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/c2ddd2da
Branch: refs/heads/6.1.x
Commit: c2ddd2da7f28741a5dd09d2b291254dddf46a637
Parents: e856613
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Nov 21 14:41:14 2016 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Jan 3 17:20:26 2017 -0800
----------------------------------------------------------------------
bin/templates/cordova/Api.js | 8 ++++++--
bin/templates/cordova/lib/AndroidProject.js | 9 +++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/c2ddd2da/bin/templates/cordova/Api.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/Api.js b/bin/templates/cordova/Api.js
index 92f9565..8e4711c 100644
--- a/bin/templates/cordova/Api.js
+++ b/bin/templates/cordova/Api.js
@@ -72,6 +72,7 @@ function Api(platform, platformRootDir, events) {
defaultConfigXml: path.join(self.root, 'cordova/defaults.xml'),
strings: path.join(self.root, 'res/values/strings.xml'),
manifest: path.join(self.root, 'AndroidManifest.xml'),
+ build: path.join(self.root, 'build'),
// NOTE: Due to platformApi spec we need to return relative paths here
cordovaJs: 'bin/templates/project/assets/www/cordova.js',
cordovaJsSrc: 'cordova-js-src'
@@ -241,11 +242,12 @@ Api.prototype.addPlugin = function (plugin, installOptions) {
// Do some basic argument parsing
var opts = {};
- // Skip cleaning prepared files when not invoking via cordova CLI.
+ // Skip cleaning prepared files when not invoking via cordova CLI.
opts.noPrepare = true;
- if(!(AndroidStudio.isAndroidStudioProject(self.root)))
+ if(!AndroidStudio.isAndroidStudioProject(self.root) && !project.isClean()) {
return self.clean(opts);
+ }
})
.then(function () {
return PluginManager.get(self.platform, self.locations, project)
@@ -396,6 +398,8 @@ Api.prototype.clean = function(cleanOptions) {
});
};
+
+
/**
* Performs a requirements check for current platform. Each platform defines its
* own set of requirements, which should be resolved before platform can be
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/c2ddd2da/bin/templates/cordova/lib/AndroidProject.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/AndroidProject.js b/bin/templates/cordova/lib/AndroidProject.js
index 1fc3bdf..c55ee6c 100644
--- a/bin/templates/cordova/lib/AndroidProject.js
+++ b/bin/templates/cordova/lib/AndroidProject.js
@@ -197,5 +197,14 @@ AndroidProject.prototype.getUninstaller = function (type) {
return pluginHandlers.getUninstaller(type);
};
+/*
+ * This checks if an Android project is clean or has old build artifacts
+ */
+
+AndroidProject.prototype.isClean = function() {
+ var build_path = path.join(this.projectDir, "build");
+ //If the build directory doesn't exist, it's clean
+ return !(fs.existsSync(build_path));
+};
module.exports = AndroidProject;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/4] android commit: Adding isClean to the spec,
this really should have failed a few commits ago
Posted by st...@apache.org.
Adding isClean to the spec, this really should have failed a few commits ago
This closes #349
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/071ddbf6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/071ddbf6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/071ddbf6
Branch: refs/heads/6.1.x
Commit: 071ddbf6eb5898ef7d46ce6eb3b02a7cd8cbd1ff
Parents: a87eb72
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Nov 28 14:12:25 2016 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Jan 3 17:21:24 2017 -0800
----------------------------------------------------------------------
spec/unit/Api.spec.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/071ddbf6/spec/unit/Api.spec.js
----------------------------------------------------------------------
diff --git a/spec/unit/Api.spec.js b/spec/unit/Api.spec.js
index ab9479e..2f29c0e 100644
--- a/spec/unit/Api.spec.js
+++ b/spec/unit/Api.spec.js
@@ -42,7 +42,7 @@ describe('addPlugin method', function () {
pluginManager.addPlugin.andReturn(Q());
spyOn(common.PluginManager, 'get').andReturn(pluginManager);
- var projectSpy = jasmine.createSpyObj('AndroidProject', ['getPackageName', 'write']);
+ var projectSpy = jasmine.createSpyObj('AndroidProject', ['getPackageName', 'write', 'isClean']);
spyOn(AndroidProject, 'getProjectFile').andReturn(projectSpy);
oldClean = Api.__get__('Api.prototype.clean');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[4/4] android commit: CB-12159 Android: Keystore password prompt
won't show up
Posted by st...@apache.org.
CB-12159 Android: Keystore password prompt won't show up
This closes #351
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a51fc4b2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a51fc4b2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a51fc4b2
Branch: refs/heads/6.1.x
Commit: a51fc4b25e1b00c36fe759c640cf466c1dd13cfe
Parents: 071ddbf
Author: daserge <v-...@microsoft.com>
Authored: Mon Dec 5 18:21:28 2016 +0300
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Jan 3 17:21:39 2017 -0800
----------------------------------------------------------------------
bin/templates/project/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a51fc4b2/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index f1430aa..5146c99 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -264,7 +264,7 @@ def promptForReleaseKeyPassword() {
gradle.taskGraph.whenReady { taskGraph ->
taskGraph.getAllTasks().each() { task ->
- if (task.name == 'validateReleaseSigning') {
+ if (task.name == 'validateReleaseSigning' || task.name == 'validateSigningRelease') {
promptForReleaseKeyPassword()
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/4] android commit: Need to pass lint
Posted by st...@apache.org.
Need to pass lint
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a87eb726
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a87eb726
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a87eb726
Branch: refs/heads/6.1.x
Commit: a87eb7266f4099946508149d4d7a7246c318abde
Parents: c2ddd2d
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Nov 21 16:36:20 2016 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Jan 3 17:21:05 2017 -0800
----------------------------------------------------------------------
bin/templates/cordova/lib/AndroidProject.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a87eb726/bin/templates/cordova/lib/AndroidProject.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/AndroidProject.js b/bin/templates/cordova/lib/AndroidProject.js
index c55ee6c..fa1c612 100644
--- a/bin/templates/cordova/lib/AndroidProject.js
+++ b/bin/templates/cordova/lib/AndroidProject.js
@@ -202,7 +202,7 @@ AndroidProject.prototype.getUninstaller = function (type) {
*/
AndroidProject.prototype.isClean = function() {
- var build_path = path.join(this.projectDir, "build");
+ var build_path = path.join(this.projectDir, 'build');
//If the build directory doesn't exist, it's clean
return !(fs.existsSync(build_path));
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org