You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ra...@apache.org on 2019/11/27 20:13:07 UTC
[cordova-common] branch master updated: chore: remove support for
ubuntu platform (#111)
This is an automated email from the ASF dual-hosted git repository.
raphinesse pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-common.git
The following commit(s) were added to refs/heads/master by this push:
new 2021a39 chore: remove support for ubuntu platform (#111)
2021a39 is described below
commit 2021a39a9eaf473424eafe20e0e126b587933359
Author: Raphael von der Grün <ra...@gmail.com>
AuthorDate: Wed Nov 27 21:12:58 2019 +0100
chore: remove support for ubuntu platform (#111)
---
spec/ConfigChanges/ConfigFile.spec.js | 5 -----
src/ConfigChanges/ConfigFile.js | 4 +---
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/spec/ConfigChanges/ConfigFile.spec.js b/spec/ConfigChanges/ConfigFile.spec.js
index a28c427..00d38c3 100644
--- a/spec/ConfigChanges/ConfigFile.spec.js
+++ b/spec/ConfigChanges/ConfigFile.spec.js
@@ -78,11 +78,6 @@ describe('ConfigFile tests', function () {
});
it('resolveConfigFilePath should return file path', function () {
- var configPath = path.join('project_dir', 'config.xml');
- expect(configFile.resolveConfigFilePath('project_dir', 'ubuntu', 'config.xml')).toBe(configPath);
- });
-
- it('resolveConfigFilePath should return file path', function () {
var file = path.join('res', 'xml');
var configPath = path.join('project_dir', 'app', 'src', 'main', file, 'xml');
expect(configFile.resolveConfigFilePath('project_dir', 'android', file)).toBe(configPath);
diff --git a/src/ConfigChanges/ConfigFile.js b/src/ConfigChanges/ConfigFile.js
index 626e410..83a0295 100644
--- a/src/ConfigChanges/ConfigFile.js
+++ b/src/ConfigChanges/ConfigFile.js
@@ -211,9 +211,7 @@ function resolveConfigFilePath (project_dir, platform, file) {
// be resolved to the real location of the file.
// TODO: Move this out of cordova-common into platforms
if (file === 'config.xml') {
- if (platform === 'ubuntu') {
- filepath = path.join(project_dir, 'config.xml');
- } else if (platform === 'ios' || platform === 'osx') {
+ if (platform === 'ios' || platform === 'osx') {
filepath = path.join(
project_dir,
module.exports.getIOSProjectname(project_dir),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org