You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by er...@apache.org on 2020/04/01 03:04:47 UTC
[cordova-android] branch master updated: fix: test failure with
shebang interpreter in rewired files (#939)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
The following commit(s) were added to refs/heads/master by this push:
new fb26050 fix: test failure with shebang interpreter in rewired files (#939)
fb26050 is described below
commit fb26050fab419254b9971917e1e5492874656c81
Author: エリス <er...@users.noreply.github.com>
AuthorDate: Wed Apr 1 12:04:35 2020 +0900
fix: test failure with shebang interpreter in rewired files (#939)
* breaking: remove shebang from create
* breaking: remove shebang from version
* breaking: remove shebang from logical files
---
bin/lib/create.js | 2 --
bin/templates/cordova/Api.js | 15 ++++++++++++++-
bin/templates/cordova/lib/build.js | 2 --
bin/templates/cordova/lib/check_reqs.js | 2 --
bin/templates/cordova/lib/device.js | 2 --
bin/templates/cordova/lib/emulator.js | 2 --
bin/templates/cordova/lib/log.js | 2 --
bin/templates/cordova/lib/retry.js | 2 --
bin/templates/cordova/lib/run.js | 2 --
bin/templates/cordova/version | 9 ++-------
10 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/bin/lib/create.js b/bin/lib/create.js
index 3f234f9..3f86947 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/bin/templates/cordova/Api.js b/bin/templates/cordova/Api.js
index e6402fe..3d80ddc 100644
--- a/bin/templates/cordova/Api.js
+++ b/bin/templates/cordova/Api.js
@@ -17,6 +17,15 @@
under the License.
*/
+/**
+ * @todo update coho to update this line.
+ * @todo use `package.json` instead but first
+ * figure out how this fit in with the platform-centered workflow structure.
+ * This workflow would not have the `package.json` file.
+ */
+// Coho updates this line
+const VERSION = '9.0.0-dev';
+
var path = require('path');
var AndroidProject = require('./lib/AndroidProject');
@@ -88,7 +97,7 @@ class Api {
result.locations = this.locations;
result.root = this.root;
result.name = this.platform;
- result.version = require('./version');
+ result.version = Api.version();
result.projectConfig = this._config;
return result;
@@ -365,6 +374,10 @@ class Api {
}
return result;
}
+
+ static version () {
+ return VERSION;
+ }
}
module.exports = Api;
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 15258f8..36aee6c 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/bin/templates/cordova/lib/check_reqs.js b/bin/templates/cordova/lib/check_reqs.js
index 519db89..e2305a7 100644
--- a/bin/templates/cordova/lib/check_reqs.js
+++ b/bin/templates/cordova/lib/check_reqs.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/bin/templates/cordova/lib/device.js b/bin/templates/cordova/lib/device.js
index f0ea6d4..3bb95c9 100644
--- a/bin/templates/cordova/lib/device.js
+++ b/bin/templates/cordova/lib/device.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/bin/templates/cordova/lib/emulator.js b/bin/templates/cordova/lib/emulator.js
index 81525ba..eeab9d6 100644
--- a/bin/templates/cordova/lib/emulator.js
+++ b/bin/templates/cordova/lib/emulator.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/bin/templates/cordova/lib/log.js b/bin/templates/cordova/lib/log.js
index db0ba41..4e08765 100644
--- a/bin/templates/cordova/lib/log.js
+++ b/bin/templates/cordova/lib/log.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/bin/templates/cordova/lib/retry.js b/bin/templates/cordova/lib/retry.js
index e619b3d..6ce8e81 100644
--- a/bin/templates/cordova/lib/retry.js
+++ b/bin/templates/cordova/lib/retry.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/bin/templates/cordova/lib/run.js b/bin/templates/cordova/lib/run.js
index 774dddd..892e9b0 100644
--- a/bin/templates/cordova/lib/run.js
+++ b/bin/templates/cordova/lib/run.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 51fb968..00f44bb 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -19,11 +19,6 @@
under the License.
*/
-// Coho updates this line:
-var VERSION = '9.0.0-dev';
+const Api = require('./Api');
-module.exports.version = VERSION;
-
-if (!module.parent) {
- console.log(VERSION);
-}
+console.log(Api.version());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org