diff options
| author | Po Lu <luangruo@yahoo.com> | 2025-03-05 14:59:19 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2025-03-05 14:59:19 +0800 |
| commit | 121371a706491fde8c06d95b13c16703d53f6fa3 (patch) | |
| tree | b247df5c3b28750a509e72fe0cc7530b252bb054 /java | |
| parent | 8099dc6e3aeae5bfd8a4115deed88022500362e1 (diff) | |
Move java/incrementing-version-code to AndroidManifest.xml.in
* admin/admin.el (admin-android-version-code-regexp): New
variable.
(set-version): Modify AndroidManifest.xml.in instead.
* java/AndroidManifest.xml.in (Version-code): Define version
code.
* java/incrementing-version-code: Delete file.
Diffstat (limited to 'java')
| -rw-r--r-- | java/AndroidManifest.xml.in | 15 | ||||
| -rw-r--r-- | java/incrementing-version-code | 12 |
2 files changed, 15 insertions, 12 deletions
diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in index 6243c5e13ba..92b63925ef4 100644 --- a/java/AndroidManifest.xml.in +++ b/java/AndroidManifest.xml.in @@ -338,3 +338,18 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. --> android:label="GNU Emacs service"/> </application> </manifest> + +<!-- Auto-incrementing version code. + +This comment contains an Android version code +(https://developer.android.com/studio/publish/versioning#versioningsettings) +corresponding to the current Emacs version. The version code in +AndroidManifest.xml.in is hard-coded to a fixed value to facilitate +package downgrades. Some automated systems employed by Android package +repositories require an incrementing numeric version code to detect +upgrades, which is provided here and is altered by admin/admin.el. +Refer to e.g. https://forum.f-droid.org/t/emacs-packaging/30424/25. + +Version-code: 300050000 + +--> diff --git a/java/incrementing-version-code b/java/incrementing-version-code index fed5b627275..e69de29bb2d 100644 --- a/java/incrementing-version-code +++ b/java/incrementing-version-code @@ -1,12 +0,0 @@ -; This file contains an Android version code -; (https://developer.android.com/studio/publish/versioning#versioningsettings) -; corresponding to the current Emacs version. -; -; The version code in AndroidManifest.xml.in is hard-coded to a fixed -; value, to make package downgrades possible. Where an incrementing -; version code is required (for example, for automated F-Droid package -; builds (https://f-droid.org/packages/org.gnu.emacs/)), the version -; code in this file should be referred to and patched in to -; AndroidManifest.xml. - -300093000 |