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 2016/09/22 23:22:13 UTC
[1/7] cordova-lib git commit: Adding error message to help debug
platformApi loading errors
Repository: cordova-lib
Updated Branches:
refs/heads/master f8b58c782 -> 63efd2174
Adding error message to help debug platformApi loading errors
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/99931eb0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/99931eb0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/99931eb0
Branch: refs/heads/master
Commit: 99931eb03cc440e5fb5d7721abb92aa4938fe30e
Parents: a25ddc2
Author: Anis Kadri <an...@apache.org>
Authored: Mon Aug 29 16:29:24 2016 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 14 16:49:10 2016 -0700
----------------------------------------------------------------------
cordova-lib/src/platforms/platforms.js | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/99931eb0/cordova-lib/src/platforms/platforms.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/platforms/platforms.js b/cordova-lib/src/platforms/platforms.js
index 725e2ba..9d25bfb 100644
--- a/cordova-lib/src/platforms/platforms.js
+++ b/cordova-lib/src/platforms/platforms.js
@@ -60,6 +60,8 @@ function getPlatformApi(platform, platformRootDir) {
events.emit('warn', ' Using this version of Cordova with older version of cordova-' + platform +
' is being deprecated. Consider upgrading to cordova-' + platform + '@' +
platforms[platform].apiCompatibleSince + ' or newer.');
+ } else {
+ events.emit('warn', 'Error loading cordova-'+platform);
}
PlatformApi = require('./PlatformApiPoly');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[6/7] cordova-lib git commit: Unifying quotes
Posted by st...@apache.org.
Unifying quotes
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/51355f71
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/51355f71
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/51355f71
Branch: refs/heads/master
Commit: 51355f71ca5ff54e727df13a5ab468c4988c0e2b
Parents: 6a6821f
Author: Anis Kadri <an...@apache.org>
Authored: Fri Sep 16 15:35:41 2016 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Sep 16 15:35:41 2016 -0700
----------------------------------------------------------------------
cordova-common/src/ConfigChanges/ConfigFile.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/51355f71/cordova-common/src/ConfigChanges/ConfigFile.js
----------------------------------------------------------------------
diff --git a/cordova-common/src/ConfigChanges/ConfigFile.js b/cordova-common/src/ConfigChanges/ConfigFile.js
index 5170581..0fe275d 100644
--- a/cordova-common/src/ConfigChanges/ConfigFile.js
+++ b/cordova-common/src/ConfigChanges/ConfigFile.js
@@ -194,7 +194,7 @@ function resolveConfigFilePath(project_dir, platform, file) {
}
// FIXME android studio
- if(platform === "android" && !fs.existsSync(filepath)) {
+ if(platform === 'android' && !fs.existsSync(filepath)) {
filepath = path.join(project_dir, 'app', 'src', 'main', 'res', 'xml', 'config.xml');
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[4/7] cordova-lib git commit: config.xml has a different location in
Android Studio
Posted by st...@apache.org.
config.xml has a different location in Android Studio
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/a25ddc26
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/a25ddc26
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/a25ddc26
Branch: refs/heads/master
Commit: a25ddc260bbbf2aef254fb6cf91436d6edfd3ea3
Parents: 062f15f
Author: Anis Kadri <an...@apache.org>
Authored: Mon Aug 29 16:28:55 2016 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 14 16:49:10 2016 -0700
----------------------------------------------------------------------
cordova-common/src/ConfigChanges/ConfigFile.js | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a25ddc26/cordova-common/src/ConfigChanges/ConfigFile.js
----------------------------------------------------------------------
diff --git a/cordova-common/src/ConfigChanges/ConfigFile.js b/cordova-common/src/ConfigChanges/ConfigFile.js
index 179d54d..5170581 100644
--- a/cordova-common/src/ConfigChanges/ConfigFile.js
+++ b/cordova-common/src/ConfigChanges/ConfigFile.js
@@ -193,6 +193,11 @@ function resolveConfigFilePath(project_dir, platform, file) {
return filepath;
}
+ // FIXME android studio
+ if(platform === "android" && !fs.existsSync(filepath)) {
+ filepath = path.join(project_dir, 'app', 'src', 'main', 'res', 'xml', 'config.xml');
+ }
+
// None of the special cases matched, returning project_dir/file.
return filepath;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[7/7] cordova-lib git commit: PR #490 adding some clarifying comments
Posted by st...@apache.org.
PR #490 adding some clarifying comments
This closes #490
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/63efd217
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/63efd217
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/63efd217
Branch: refs/heads/master
Commit: 63efd2174fe20b9c573b23a741257a6170dec3b6
Parents: 51355f7
Author: Anis Kadri <an...@apache.org>
Authored: Mon Sep 19 15:52:18 2016 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Thu Sep 22 16:12:35 2016 -0700
----------------------------------------------------------------------
cordova-common/src/ConfigChanges/ConfigFile.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/63efd217/cordova-common/src/ConfigChanges/ConfigFile.js
----------------------------------------------------------------------
diff --git a/cordova-common/src/ConfigChanges/ConfigFile.js b/cordova-common/src/ConfigChanges/ConfigFile.js
index 0fe275d..594d6e4 100644
--- a/cordova-common/src/ConfigChanges/ConfigFile.js
+++ b/cordova-common/src/ConfigChanges/ConfigFile.js
@@ -193,7 +193,8 @@ function resolveConfigFilePath(project_dir, platform, file) {
return filepath;
}
- // FIXME android studio
+ // XXX this checks for android studio projects
+ // only if none of the options above are satisfied does this get called
if(platform === 'android' && !fs.existsSync(filepath)) {
filepath = path.join(project_dir, 'app', 'src', 'main', 'res', 'xml', 'config.xml');
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/7] cordova-lib git commit: CB-8320: We look for a build.gradle to
make sure it's Android, not an AndroidManifest, because it moved
Posted by st...@apache.org.
CB-8320: We look for a build.gradle to make sure it's Android, not an AndroidManifest, because it moved
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/6c622f51
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/6c622f51
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/6c622f51
Branch: refs/heads/master
Commit: 6c622f51ace9a2a0bab73c5ec910e81f835199ba
Parents: f8b58c7
Author: Joe Bowser <bo...@apache.org>
Authored: Fri Feb 12 14:06:42 2016 -0800
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 14 16:49:10 2016 -0700
----------------------------------------------------------------------
cordova-lib/src/cordova/metadata/android_parser.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6c622f51/cordova-lib/src/cordova/metadata/android_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/android_parser.js b/cordova-lib/src/cordova/metadata/android_parser.js
index 2b3b211..7f3c114 100644
--- a/cordova-lib/src/cordova/metadata/android_parser.js
+++ b/cordova-lib/src/cordova/metadata/android_parser.js
@@ -31,7 +31,7 @@ var fs = require('fs'),
function android_parser(project) {
- if (!fs.existsSync(path.join(project, 'AndroidManifest.xml'))) {
+ if (!fs.existsSync(path.join(project, 'build.gradle'))) {
throw new CordovaError('The provided path "' + project + '" is not an Android project.');
}
@@ -39,6 +39,12 @@ function android_parser(project) {
Parser.call(this, 'android', project);
this.path = project;
+
+ //If we have a gradle file but not a manifest, this is an Android Studio project
+ if(!fs.existsSync(path.join(project, "AndroidManifest.xml"))) {
+ this.path = path.join(project, 'app', 'src', 'main');
+ }
+
this.strings = path.join(this.path, 'res', 'values', 'strings.xml');
this.manifest = path.join(this.path, 'AndroidManifest.xml');
this.android_config = path.join(this.path, 'res', 'xml', 'config.xml');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/7] cordova-lib git commit: CB-8320: Lint
Posted by st...@apache.org.
CB-8320: Lint
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/062f15f5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/062f15f5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/062f15f5
Branch: refs/heads/master
Commit: 062f15f52469dd438ee2831c12e28434589fc759
Parents: 6c622f5
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Jul 28 12:42:47 2016 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 14 16:49:10 2016 -0700
----------------------------------------------------------------------
cordova-lib/src/cordova/metadata/android_parser.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/062f15f5/cordova-lib/src/cordova/metadata/android_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/android_parser.js b/cordova-lib/src/cordova/metadata/android_parser.js
index 7f3c114..3fdd4d1 100644
--- a/cordova-lib/src/cordova/metadata/android_parser.js
+++ b/cordova-lib/src/cordova/metadata/android_parser.js
@@ -41,7 +41,7 @@ function android_parser(project) {
this.path = project;
//If we have a gradle file but not a manifest, this is an Android Studio project
- if(!fs.existsSync(path.join(project, "AndroidManifest.xml"))) {
+ if(!fs.existsSync(path.join(project, 'AndroidManifest.xml'))) {
this.path = path.join(project, 'app', 'src', 'main');
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[5/7] cordova-lib git commit: undoing android_parser changes
Posted by st...@apache.org.
undoing android_parser changes
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/6a6821ff
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/6a6821ff
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/6a6821ff
Branch: refs/heads/master
Commit: 6a6821ff645490aac5f616fdf468a528ac92464d
Parents: 99931eb
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 14 17:04:23 2016 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 14 17:04:23 2016 -0700
----------------------------------------------------------------------
cordova-lib/src/cordova/metadata/android_parser.js | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6a6821ff/cordova-lib/src/cordova/metadata/android_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/android_parser.js b/cordova-lib/src/cordova/metadata/android_parser.js
index 3fdd4d1..2b3b211 100644
--- a/cordova-lib/src/cordova/metadata/android_parser.js
+++ b/cordova-lib/src/cordova/metadata/android_parser.js
@@ -31,7 +31,7 @@ var fs = require('fs'),
function android_parser(project) {
- if (!fs.existsSync(path.join(project, 'build.gradle'))) {
+ if (!fs.existsSync(path.join(project, 'AndroidManifest.xml'))) {
throw new CordovaError('The provided path "' + project + '" is not an Android project.');
}
@@ -39,12 +39,6 @@ function android_parser(project) {
Parser.call(this, 'android', project);
this.path = project;
-
- //If we have a gradle file but not a manifest, this is an Android Studio project
- if(!fs.existsSync(path.join(project, 'AndroidManifest.xml'))) {
- this.path = path.join(project, 'app', 'src', 'main');
- }
-
this.strings = path.join(this.path, 'res', 'values', 'strings.xml');
this.manifest = path.join(this.path, 'AndroidManifest.xml');
this.android_config = path.join(this.path, 'res', 'xml', 'config.xml');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org