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 2021/07/15 02:32:45 UTC
[cordova-coho] branch master updated: cleanup: remove updating
version from framework build.gradle (#280)
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-coho.git
The following commit(s) were added to refs/heads/master by this push:
new fd93ade cleanup: remove updating version from framework build.gradle (#280)
fd93ade is described below
commit fd93ade80c7d1446e0809baa4edd9efd6412df7d
Author: エリス <er...@users.noreply.github.com>
AuthorDate: Thu Jul 15 11:32:40 2021 +0900
cleanup: remove updating version from framework build.gradle (#280)
* cleanup: remove updating version from framework build.gradle
* chore: remove files from android version spec
---
spec/versionutil.spec.js | 4 +---
src/versionutil.js | 5 +----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/spec/versionutil.spec.js b/spec/versionutil.spec.js
index e4ec41f..ef63f78 100644
--- a/spec/versionutil.spec.js
+++ b/spec/versionutil.spec.js
@@ -93,9 +93,7 @@ describe('versionutil', function () {
setupPlatform('android');
yield versionutil.updateRepoVersion(androidRepo, testVersion);
expectTestVersioninFiles(
- 'bin/templates/cordova/version',
- 'framework/src/org/apache/cordova/CordovaWebView.java',
- 'framework/build.gradle'
+ 'framework/src/org/apache/cordova/CordovaWebView.java'
);
});
diff --git a/src/versionutil.js b/src/versionutil.js
index 6b565b3..2b62e09 100644
--- a/src/versionutil.js
+++ b/src/versionutil.js
@@ -116,11 +116,8 @@ exports.updateRepoVersion = function * updateRepoVersion (repo, version, opts) {
if (repo.id === 'android') {
shelljs.sed('-i', /CORDOVA_VERSION.*=.*;/, 'CORDOVA_VERSION = "' + version + '";', path.join('framework', 'src', 'org', 'apache', 'cordova', 'CordovaWebView.java'));
- // Set build.gradle version, vcsTag, and name
- shelljs.sed('-i', /version.*=.*/, "version = '" + version + "'", path.join('framework', 'build.gradle'));
- shelljs.sed('-i', /vcsTag.*=.*/, "vcsTag = '" + version + "'", path.join('framework', 'build.gradle'));
- shelljs.sed('-i', /version.{\n.*(name.*=.*)/, "version {\n name = '" + version + "'", path.join('framework', 'build.gradle'));
}
+
shelljs.config.fatal = false;
if (!(yield gitutil.pendingChangesExist())) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org