Metadata YAMLification

2019-09-29 19:29:08 +00:00 · 2019-09-29 19:29:08 +00:00 · 55e0c713c0
parent c6537a2f47
commit 55e0c713c0
24 changed files with 1864 additions and 1420 deletions
--- a/metadata/org.hlwd.bible.txt
+++ b/metadata/org.hlwd.bible.txt
@ -1,156 +0,0 @@
-Categories:Reading
-License:GPL-3.0-only
-Author Name:hotlittlewhitedog
-Web Site:https://gitlab.com/hotlittlewhitedog/BibleMultiTheLight/blob/HEAD/README.md
-Source Code:https://gitlab.com/hotlittlewhitedog/BibleMultiTheLight/tree/HEAD
-Issue Tracker:https://gitlab.com/hotlittlewhitedog/BibleMultiTheLight/issues
-Changelog:https://gitlab.com/hotlittlewhitedog/BibleMultiTheLight/blob/HEAD/CHANGELOG
-
-Auto Name:The Light
-Summary:Bible multi languages, free, offline, no advertising
-Description:
-Bible multi languages, free, offline, no advertising, completely in English,
-French, Italian, Spanish, Portuguese.
-
-* King James Version, Segond, Diodati, Valera, Almeida.
-* Easy to use with quick search and share, plans of reading, articles.
-* Also works on Android TV.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/hotlittlewhitedog/BibleMultiTheLight.git
-
-Build:2.8,20171010
-    commit=0a8efec9fc6a57e13924aac289aefd8da2f23f99
-    subdir=app
-    gradle=yes
-
-Build:2.9,20171212
-    commit=3f23d351ecc3281ccfe744a0372391e43cc6d65e
-    subdir=app
-    gradle=yes
-
-Build:2.10,20180107
-    commit=a38c666f2ec6742ef976dcdfa14652a41dcbc75c
-    subdir=app
-    gradle=yes
-
-Build:2.11,20180114
-    commit=6e8e8206011800e2c4094ec42355d99514e2ed8f
-    subdir=app
-    gradle=yes
-
-Build:2.12,20180203
-    commit=0535f0df117bf338484d5925e13f5dd672eb26f5
-    subdir=app
-    gradle=yes
-
-Build:2.13,20180304
-    commit=v2.13
-    subdir=app
-    gradle=yes
-
-Build:3.0,20180422
-    commit=v3.0
-    subdir=app
-    gradle=yes
-
-Build:3.1,20180501
-    commit=v3.1
-    subdir=app
-    gradle=yes
-
-Build:3.2,20180505
-    commit=v3.2
-    subdir=app
-    gradle=yes
-
-Build:3.3,20180610
-    commit=v3.3
-    subdir=app
-    gradle=yes
-
-Build:3.4,20181014
-    commit=v3.4
-    subdir=app
-    gradle=yes
-
-Build:3.5,20181110
-    commit=v3.5
-    subdir=app
-    gradle=yes
-
-Build:3.6,20181118
-    commit=v3.6
-    subdir=app
-    gradle=yes
-
-Build:3.7,20181125
-    commit=v3.7
-    subdir=app
-    gradle=yes
-
-Build:3.8,20181216
-    commit=v3.8
-    subdir=app
-    gradle=yes
-
-Build:3.9,20190127
-    commit=v3.9
-    subdir=app
-    gradle=yes
-
-Build:3.10,20190511
-    commit=v3.10
-    subdir=app
-    gradle=yes
-
-Build:3.11,20190616
-    commit=v3.11
-    subdir=app
-    gradle=yes
-
-Build:3.12,20190623
-    commit=v3.12
-    subdir=app
-    gradle=yes
-
-Build:3.13,20190707
-    commit=v3.13
-    subdir=app
-    gradle=yes
-
-Build:3.14,20190717
-    commit=v3.14
-    subdir=app
-    gradle=yes
-
-Build:3.15,20190724
-    commit=v3.15
-    subdir=app
-    gradle=yes
-
-Build:3.16,20190815
-    commit=v3.16
-    subdir=app
-    gradle=yes
-
-Build:3.18,20190825
-    commit=v3.18
-    subdir=app
-    gradle=yes
-
-Build:3.19,20190908
-    commit=v3.19
-    subdir=app
-    gradle=yes
-
-Build:3.20,20190918
-    commit=v3.20
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:3.20
-Current Version Code:20190918
--- a/metadata/org.hlwd.bible.yml
+++ b/metadata/org.hlwd.bible.yml
@ -0,0 +1,209 @@
+Categories:
+  - Reading
+License: GPL-3.0-only
+AuthorName: hotlittlewhitedog
+WebSite: https://gitlab.com/hotlittlewhitedog/BibleMultiTheLight/blob/HEAD/README.md
+SourceCode: https://gitlab.com/hotlittlewhitedog/BibleMultiTheLight
+IssueTracker: https://gitlab.com/hotlittlewhitedog/BibleMultiTheLight/issues
+Changelog: https://gitlab.com/hotlittlewhitedog/BibleMultiTheLight/blob/HEAD/CHANGELOG
+
+AutoName: The Light
+Summary: Bible multi languages, free, offline, no advertising
+Description: |-
+    Bible multi languages, free, offline, no advertising, completely in English,
+    French, Italian, Spanish, Portuguese.
+
+    * King James Version, Segond, Diodati, Valera, Almeida.
+    * Easy to use with quick search and share, plans of reading, articles.
+    * Also works on Android TV.
+
+RepoType: git
+Repo: https://gitlab.com/hotlittlewhitedog/BibleMultiTheLight.git
+
+Builds:
+  - versionName: '2.8'
+    versionCode: 20171010
+    commit: 0a8efec9fc6a57e13924aac289aefd8da2f23f99
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.9'
+    versionCode: 20171212
+    commit: 3f23d351ecc3281ccfe744a0372391e43cc6d65e
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.10'
+    versionCode: 20180107
+    commit: a38c666f2ec6742ef976dcdfa14652a41dcbc75c
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.11'
+    versionCode: 20180114
+    commit: 6e8e8206011800e2c4094ec42355d99514e2ed8f
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.12'
+    versionCode: 20180203
+    commit: 0535f0df117bf338484d5925e13f5dd672eb26f5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.13'
+    versionCode: 20180304
+    commit: v2.13
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.0'
+    versionCode: 20180422
+    commit: v3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.1'
+    versionCode: 20180501
+    commit: v3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.2'
+    versionCode: 20180505
+    commit: v3.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.3'
+    versionCode: 20180610
+    commit: v3.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.4'
+    versionCode: 20181014
+    commit: v3.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.5'
+    versionCode: 20181110
+    commit: v3.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.6'
+    versionCode: 20181118
+    commit: v3.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.7'
+    versionCode: 20181125
+    commit: v3.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.8'
+    versionCode: 20181216
+    commit: v3.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.9'
+    versionCode: 20190127
+    commit: v3.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.10'
+    versionCode: 20190511
+    commit: v3.10
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.11'
+    versionCode: 20190616
+    commit: v3.11
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.12'
+    versionCode: 20190623
+    commit: v3.12
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.13'
+    versionCode: 20190707
+    commit: v3.13
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.14'
+    versionCode: 20190717
+    commit: v3.14
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.15'
+    versionCode: 20190724
+    commit: v3.15
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.16'
+    versionCode: 20190815
+    commit: v3.16
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.18'
+    versionCode: 20190825
+    commit: v3.18
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.19'
+    versionCode: 20190908
+    commit: v3.19
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.20'
+    versionCode: 20190918
+    commit: v3.20
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '3.20'
+CurrentVersionCode: 20190918
--- a/metadata/org.holylobster.nuntius.txt
+++ b/metadata/org.holylobster.nuntius.txt
@ -1,43 +0,0 @@
-Categories:System
-License:GPL-2.0-or-later
-Web Site:https://github.com/holylobster/nuntius-android/wiki
-Source Code:https://github.com/holylobster/nuntius-android
-Issue Tracker:https://github.com/holylobster/nuntius-android/issues
-Changelog:https://raw.githubusercontent.com/holylobster/nuntius-android/HEAD/NEWS
-
-Auto Name:Nuntius
-Summary:Push notifications to a desktop PC
-Description:
-Nuntius delivers notifications from your phone or tablet to your computer over
-Bluetooth. To use Nuntius you will need to install a companion tool on your
-computer and pair your phone via Bluetooth. See the README for additional
-information.
-.
-
-Repo Type:git
-Repo:https://github.com/holylobster/nuntius-android
-
-Build:1.0,1
-    commit=471e87d23ee4c898d5535c99923debecf54a32a5
-    subdir=app
-    gradle=yes
-
-Build:1.0.1,2
-    commit=000fd01a57e5027fd0eeff4c88aaa5edeac5db06
-    subdir=app
-    gradle=yes
-
-Build:1.0.2,3
-    commit=v1.0.2
-    subdir=app
-    gradle=yes
-
-Build:1.1,4
-    commit=v1.1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.1
-Current Version Code:4
--- a/metadata/org.holylobster.nuntius.yml
+++ b/metadata/org.holylobster.nuntius.yml
@ -0,0 +1,52 @@
+Categories:
+  - System
+License: GPL-2.0-or-later
+WebSite: https://github.com/holylobster/nuntius-android/wiki
+SourceCode: https://github.com/holylobster/nuntius-android
+IssueTracker: https://github.com/holylobster/nuntius-android/issues
+Changelog: https://raw.githubusercontent.com/holylobster/nuntius-android/HEAD/NEWS
+
+AutoName: Nuntius
+Summary: Push notifications to a desktop PC
+Description: |-
+    Nuntius delivers notifications from your phone or tablet to your computer over
+    Bluetooth. To use Nuntius you will need to install a companion tool on your
+    computer and pair your phone via Bluetooth. See the README for additional
+    information.
+
+RepoType: git
+Repo: https://github.com/holylobster/nuntius-android
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 471e87d23ee4c898d5535c99923debecf54a32a5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.1
+    versionCode: 2
+    commit: 000fd01a57e5027fd0eeff4c88aaa5edeac5db06
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.2
+    versionCode: 3
+    commit: v1.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 4
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.1'
+CurrentVersionCode: 4
--- a/metadata/org.icasdri.mather.txt
+++ b/metadata/org.icasdri.mather.txt
@ -1,47 +0,0 @@
-Categories:Science & Education
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/icasdri/Mather
-Issue Tracker:https://github.com/icasdri/Mather/issues
-Changelog:https://github.com/icasdri/Mather/releases
-
-Auto Name:Mather
-Summary:A powerful expression-based calculator, unit converter, and computation engine
-Description:
-Mather is a powerful, simple-to-use, no BS expression-based computation engine.
-In addition to basic calculator arithmetic, it supports all of the following.
-Powered by Math.js.
-
-* Variables
-* User-defined functions
-* Easily-accessible math constants, e.g. 'pi'
-* Complex math expression evaluation
-* Trigonometric functions
-* Unit conversions (and more general unit arithmetic)
-* Complex numbers
-* Matrices
-* and more
-.
-
-Repo Type:git
-Repo:https://github.com/icasdri/Mather
-
-Build:0.2.3,203
-    commit=0.2.3
-    subdir=app
-    gradle=yes
-
-Build:0.2.4,204
-    commit=0.2.4
-    subdir=app
-    gradle=yes
-
-Build:0.3.0,300
-    commit=0.3.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.3.0
-Current Version Code:300
--- a/metadata/org.icasdri.mather.yml
+++ b/metadata/org.icasdri.mather.yml
@ -0,0 +1,53 @@
+Categories:
+  - Science & Education
+License: GPL-3.0-or-later
+SourceCode: https://github.com/icasdri/Mather
+IssueTracker: https://github.com/icasdri/Mather/issues
+Changelog: https://github.com/icasdri/Mather/releases
+
+AutoName: Mather
+Summary: A powerful expression-based calculator, unit converter, and computation engine
+Description: |-
+    Mather is a powerful, simple-to-use, no BS expression-based computation engine.
+    In addition to basic calculator arithmetic, it supports all of the following.
+    Powered by Math.js.
+
+    * Variables
+    * User-defined functions
+    * Easily-accessible math constants, e.g. 'pi'
+    * Complex math expression evaluation
+    * Trigonometric functions
+    * Unit conversions (and more general unit arithmetic)
+    * Complex numbers
+    * Matrices
+    * and more
+
+RepoType: git
+Repo: https://github.com/icasdri/Mather
+
+Builds:
+  - versionName: 0.2.3
+    versionCode: 203
+    commit: 0.2.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.4
+    versionCode: 204
+    commit: 0.2.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.3.0
+    versionCode: 300
+    commit: 0.3.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 0.3.0
+CurrentVersionCode: 300
--- a/metadata/org.indywidualni.fblite.txt
+++ b/metadata/org.indywidualni.fblite.txt
@ -1,260 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Internet
-License:GPL-2.0-or-later
-Web Site:
-Source Code:https://github.com/indywidualny/FaceSlim
-Issue Tracker:https://github.com/indywidualny/FaceSlim/issues
-Changelog:https://github.com/indywidualny/FaceSlim/releases
-Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=koras%2eevil%40gmail%2ecom&lc=GB&item_name=Krzysztof%20Grabowski&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
-Bitcoin:1JUaZytkub2CP5jhRYQDDY6pibqrUUSp2y
-
-Auto Name:Face Slim
-Summary:Connect to Facebook
-Description:
-Unofficial app built around the mobile Facebook site.
-
-''Face Slim'' is an unofficial Facebook application for Android devices that
-resembles the Facebook Mobile Web Application before Facebook started removing
-features. FaceSlim is free of spyware, unlike what is built into the official
-Facebook and Facebook Messenger applications.
-.
-
-Repo Type:git
-Repo:https://github.com/indywidualny/FaceSlim
-
-Build:1.3.2,1
-    commit=v1.3.2
-    subdir=app
-    gradle=yes
-
-Build:1.4.0,2
-    commit=v1.4.0
-    subdir=app
-    gradle=yes
-
-Build:1.4.1,3
-    commit=v1.4.1
-    subdir=app
-    gradle=yes
-
-Build:1.5.0,4
-    commit=v1.5.0
-    subdir=app
-    gradle=yes
-
-Build:1.5.2,6
-    commit=v1.5.2
-    subdir=app
-    gradle=yes
-
-Build:1.6.0,7
-    disable=play-services
-    commit=v1.6.0
-    subdir=app
-    gradle=yes
-
-Build:1.6.1,8
-    commit=v1.6.1
-    subdir=app
-    gradle=yes
-
-Build:1.6.2,9
-    commit=v1.6.2
-    subdir=app
-    gradle=yes
-
-Build:1.7.0,10
-    commit=v1.7.0
-    subdir=app
-    gradle=yes
-
-Build:1.7.1,11
-    disable=request by upstream
-    commit=v1.7.1
-    subdir=app
-    gradle=yes
-
-Build:1.7.2,12
-    commit=v1.7.2
-    subdir=app
-    gradle=yes
-
-Build:1.7.3,13
-    commit=v1.7.3
-    subdir=app
-    gradle=yes
-
-Build:1.7.4,14
-    commit=v1.7.4
-    subdir=app
-    gradle=yes
-
-Build:1.7.5,15
-    commit=v1.7.5
-    subdir=app
-    gradle=yes
-
-Build:1.7.6,16
-    commit=v1.7.6
-    subdir=app
-    gradle=yes
-
-Build:1.8.0,17
-    commit=v1.8.0
-    subdir=app
-    gradle=yes
-
-Build:1.8.1,18
-    commit=v1.8.1
-    subdir=app
-    gradle=yes
-
-Build:1.8.2,19
-    commit=v1.8.2
-    subdir=app
-    gradle=yes
-
-Build:1.8.3,20
-    commit=v1.8.3
-    subdir=app
-    gradle=yes
-
-Build:1.8.4,21
-    commit=v1.8.4
-    subdir=app
-    gradle=yes
-
-Build:1.9.1,23
-    commit=v1.9.1
-    subdir=app
-    gradle=yes
-
-Build:2.0.0,24
-    commit=v2.0.0
-    subdir=app
-    gradle=yes
-
-Build:2.1.0,25
-    commit=v2.1.0
-    subdir=app
-    gradle=yes
-
-Build:2.2.0,26
-    commit=v2.2.0
-    subdir=app
-    gradle=yes
-
-Build:2.3.0,27
-    commit=v2.3.0
-    subdir=app
-    gradle=yes
-
-Build:2.3.1,28
-    commit=v2.3.1
-    subdir=app
-    gradle=yes
-
-Build:2.4.0,30
-    commit=v2.4.0
-    subdir=app
-    gradle=yes
-
-Build:2.4.1,31
-    commit=v2.4.1
-    subdir=app
-    gradle=yes
-
-Build:2.4.2,32
-    commit=v2.4.2
-    subdir=app
-    gradle=yes
-
-Build:2.5.0,33
-    commit=v2.5.0
-    subdir=app
-    gradle=yes
-
-Build:2.5.1,34
-    commit=v2.5.1
-    subdir=app
-    gradle=yes
-
-Build:2.5.2,35
-    commit=v2.5.2
-    subdir=app
-    gradle=yes
-
-Build:2.6.0,40
-    commit=v2.6.0
-    subdir=app
-    gradle=yes
-
-Build:2.7.0,41
-    commit=v2.7.0
-    subdir=app
-    gradle=yes
-
-Build:2.8.0,42
-    commit=v2.8.0
-    subdir=app
-    gradle=yes
-
-Build:2.9.0,43
-    commit=v2.9.0
-    subdir=app
-    gradle=yes
-
-Build:3.0.0,44
-    commit=v3.0.0
-    subdir=app
-    gradle=yes
-
-Build:3.0.1,45
-    commit=v3.0.1
-    subdir=app
-    gradle=yes
-
-Build:3.0.2,46
-    commit=v3.0.2
-    subdir=app
-    gradle=yes
-
-Build:3.0.3,48
-    commit=v3.0.3
-    subdir=app
-    gradle=yes
-
-Build:3.1.0,49
-    commit=v3.1.0
-    subdir=app
-    gradle=yes
-
-Build:3.2.0,50
-    commit=v3.2.0
-    subdir=app
-    gradle=yes
-
-Build:3.2.1,51
-    commit=v3.2.1
-    subdir=app
-    gradle=yes
-
-Build:3.3.0,52
-    commit=v3.3.0
-    subdir=app
-    gradle=yes
-
-Build:3.4.0,53
-    commit=v3.4.0
-    subdir=app
-    gradle=yes
-
-Build:3.4.1,54
-    commit=v3.4.1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:3.4.1
-Current Version Code:54
--- a/metadata/org.indywidualni.fblite.yml
+++ b/metadata/org.indywidualni.fblite.yml
@ -0,0 +1,354 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Internet
+License: GPL-2.0-or-later
+SourceCode: https://github.com/indywidualny/FaceSlim
+IssueTracker: https://github.com/indywidualny/FaceSlim/issues
+Translation: https://www.transifex.com/faceslim/faceslim/
+Changelog: https://github.com/indywidualny/FaceSlim/releases
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=koras%2eevil%40gmail%2ecom&lc=GB&item_name=Krzysztof%20Grabowski&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
+Bitcoin: 1JUaZytkub2CP5jhRYQDDY6pibqrUUSp2y
+
+AutoName: Face Slim
+Summary: Connect to Facebook
+Description: |-
+    Unofficial app built around the mobile Facebook site.
+
+    ''Face Slim'' is an unofficial Facebook application for Android devices that
+    resembles the Facebook Mobile Web Application before Facebook started removing
+    features. FaceSlim is free of spyware, unlike what is built into the official
+    Facebook and Facebook Messenger applications.
+
+RepoType: git
+Repo: https://github.com/indywidualny/FaceSlim
+
+Builds:
+  - versionName: 1.3.2
+    versionCode: 1
+    commit: v1.3.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.0
+    versionCode: 2
+    commit: v1.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.1
+    versionCode: 3
+    commit: v1.4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.0
+    versionCode: 4
+    commit: v1.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.2
+    versionCode: 6
+    commit: v1.5.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.0
+    versionCode: 7
+    disable: play-services
+    commit: v1.6.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.1
+    versionCode: 8
+    commit: v1.6.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.2
+    versionCode: 9
+    commit: v1.6.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.0
+    versionCode: 10
+    commit: v1.7.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.1
+    versionCode: 11
+    disable: request by upstream
+    commit: v1.7.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.2
+    versionCode: 12
+    commit: v1.7.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.3
+    versionCode: 13
+    commit: v1.7.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.4
+    versionCode: 14
+    commit: v1.7.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.5
+    versionCode: 15
+    commit: v1.7.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.6
+    versionCode: 16
+    commit: v1.7.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.8.0
+    versionCode: 17
+    commit: v1.8.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.8.1
+    versionCode: 18
+    commit: v1.8.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.8.2
+    versionCode: 19
+    commit: v1.8.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.8.3
+    versionCode: 20
+    commit: v1.8.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.8.4
+    versionCode: 21
+    commit: v1.8.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.1
+    versionCode: 23
+    commit: v1.9.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.0
+    versionCode: 24
+    commit: v2.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.0
+    versionCode: 25
+    commit: v2.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.0
+    versionCode: 26
+    commit: v2.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.0
+    versionCode: 27
+    commit: v2.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.1
+    versionCode: 28
+    commit: v2.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.0
+    versionCode: 30
+    commit: v2.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.1
+    versionCode: 31
+    commit: v2.4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.2
+    versionCode: 32
+    commit: v2.4.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.5.0
+    versionCode: 33
+    commit: v2.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.5.1
+    versionCode: 34
+    commit: v2.5.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.5.2
+    versionCode: 35
+    commit: v2.5.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.6.0
+    versionCode: 40
+    commit: v2.6.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.0
+    versionCode: 41
+    commit: v2.7.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.8.0
+    versionCode: 42
+    commit: v2.8.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.9.0
+    versionCode: 43
+    commit: v2.9.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.0
+    versionCode: 44
+    commit: v3.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.1
+    versionCode: 45
+    commit: v3.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.2
+    versionCode: 46
+    commit: v3.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.3
+    versionCode: 48
+    commit: v3.0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.0
+    versionCode: 49
+    commit: v3.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.0
+    versionCode: 50
+    commit: v3.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.1
+    versionCode: 51
+    commit: v3.2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.3.0
+    versionCode: 52
+    commit: v3.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.4.0
+    versionCode: 53
+    commit: v3.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.4.1
+    versionCode: 54
+    commit: v3.4.1
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 3.4.1
+CurrentVersionCode: 54
--- a/metadata/org.isoron.uhabits.txt
+++ b/metadata/org.isoron.uhabits.txt
@ -1,176 +0,0 @@
-Categories:Sports & Health
-License:GPL-3.0-only
-Web Site:https://github.com/iSoron/uhabits/wiki
-Source Code:https://github.com/iSoron/uhabits
-Issue Tracker:https://github.com/iSoron/uhabits/issues
-Changelog:https://github.com/iSoron/uhabits/blob/HEAD/CHANGELOG.md
-
-Name:Loop Habit Tracker
-Auto Name:Habits
-Summary:Track your habits and long-term goals
-Description:
-Loop is a simple app that helps you create and maintain good habits, allowing
-you to achieve your long-term goals. Detailed graphs and statistics show you how
-your habits improved over time.
-
-Features
-
-* Simple, beautiful and modern interface: Loop has a minimalistic interface that is easy to use and follows the material design guidelines.
-* Habit score: In addition to showing your current streak, Loop has an advanced algorithm for calculating the strength of your habits. Every repetition makes your habit stronger, and every missed day makes it weaker. A few missed days after a long streak, however, will not completely destroy your entire progress.
-* Detailed graphs and statistics: Clearly see how your habits improved over time with beautiful and detailed graphs. Scroll back to see the complete history of your habits.
-* Flexible schedules: Supports both daily habits and habits with more complex schedules, such as 3 times every week; one time every other week; or every other day.
-* Reminders: Create an individual reminder for each habit, at a chosen hour of the day. Easily check, dismiss or snooze your habit directly from the notification, without opening the app.
-
-[https://github.com/iSoron/uhabits/blob/HEAD/README.md#screenshots Screenshots]
-.
-
-Repo Type:git
-Repo:https://github.com/iSoron/uhabits/
-
-Build:1.2.0,9
-    commit=v1.2.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-    srclibs=ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
-    rm=app/libs/*.jar
-    prebuild=cp -fR $$ActiveAndroid$$/src/com src/main/java
-
-Build:1.3.0,10
-    commit=v1.3.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-    srclibs=ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
-    rm=app/libs/*.jar
-    prebuild=cp -fR $$ActiveAndroid$$/src/com src/main/java
-
-Build:1.3.1,11
-    commit=v1.3.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-    srclibs=ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
-    rm=app/libs/*.jar
-    prebuild=cp -fR $$ActiveAndroid$$/src/com src/main/java
-
-Build:1.3.2,12
-    commit=v1.3.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-    srclibs=ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
-    rm=app/libs/*.jar
-    prebuild=cp -fR $$ActiveAndroid$$/src/com src/main/java
-
-Build:1.3.3,13
-    commit=v1.3.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-    srclibs=ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
-    rm=app/libs/*.jar
-    prebuild=cp -fR $$ActiveAndroid$$/src/com src/main/java
-
-Build:1.4.0,14
-    commit=v1.4.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-    srclibs=ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
-    rm=app/libs/*.jar
-    prebuild=cp -fR $$ActiveAndroid$$/src/com src/main/java
-
-Build:1.4.1,15
-    commit=v1.4.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-    srclibs=ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
-    rm=app/libs/*.jar
-    prebuild=cp -fR $$ActiveAndroid$$/src/com src/main/java
-
-Build:1.5.1,17
-    commit=v1.5.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.5.2,18
-    commit=v1.5.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.5.3,19
-    commit=v1.5.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.5.4,20
-    commit=v1.5.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.5.6,22
-    commit=v1.5.6
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.6.2,25
-    commit=v1.6.2
-    subdir=app
-    gradle=yes
-
-Build:1.7.0,27
-    commit=v1.7.0
-    subdir=app
-    gradle=yes
-
-Build:1.7.1,28
-    commit=v1.7.1
-    subdir=app
-    gradle=yes
-
-Build:1.7.2,29
-    commit=v1.7.2
-    subdir=app
-    gradle=yes
-
-Build:1.7.4,31
-    commit=v1.7.4
-    subdir=app
-    gradle=yes
-
-Build:1.7.5,32
-    commit=v1.7.5
-    subdir=app
-    gradle=yes
-
-Build:1.7.6,33
-    commit=v1.7.6
-    subdir=app
-    gradle=yes
-
-Build:1.7.8,35
-    commit=v1.7.8
-    subdir=app
-    gradle=yes
-
-Build:1.7.9,36
-    commit=v1.7.9
-    subdir=app
-    gradle=yes
-
-Build:1.7.11,38
-    commit=v1.7.11
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.7.11
-Current Version Code:38
--- a/metadata/org.isoron.uhabits.yml
+++ b/metadata/org.isoron.uhabits.yml
@ -0,0 +1,236 @@
+Categories:
+  - Sports & Health
+License: GPL-3.0-only
+WebSite: https://github.com/iSoron/uhabits/wiki
+SourceCode: https://github.com/iSoron/uhabits
+IssueTracker: https://github.com/iSoron/uhabits/issues
+Translation: http://translate.loophabits.org/
+Changelog: https://github.com/iSoron/uhabits/blob/HEAD/CHANGELOG.md
+
+Name: Loop Habit Tracker
+AutoName: Habits
+Summary: Track your habits and long-term goals
+Description: |-
+    Loop is a simple app that helps you create and maintain good habits, allowing
+    you to achieve your long-term goals. Detailed graphs and statistics show you how
+    your habits improved over time.
+
+    Features
+
+    * Simple, beautiful and modern interface: Loop has a minimalistic interface that is easy to use and follows the material design guidelines.
+    * Habit score: In addition to showing your current streak, Loop has an advanced algorithm for calculating the strength of your habits. Every repetition makes your habit stronger, and every missed day makes it weaker. A few missed days after a long streak, however, will not completely destroy your entire progress.
+    * Detailed graphs and statistics: Clearly see how your habits improved over time with beautiful and detailed graphs. Scroll back to see the complete history of your habits.
+    * Flexible schedules: Supports both daily habits and habits with more complex schedules, such as 3 times every week; one time every other week; or every other day.
+    * Reminders: Create an individual reminder for each habit, at a chosen hour of the day. Easily check, dismiss or snooze your habit directly from the notification, without opening the app.
+
+    [https://github.com/iSoron/uhabits/blob/HEAD/README.md#screenshots Screenshots]
+
+RepoType: git
+Repo: https://github.com/iSoron/uhabits/
+
+Builds:
+  - versionName: 1.2.0
+    versionCode: 9
+    commit: v1.2.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    srclibs:
+      - ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
+    rm:
+      - app/libs/*.jar
+    prebuild: cp -fR $$ActiveAndroid$$/src/com src/main/java
+
+  - versionName: 1.3.0
+    versionCode: 10
+    commit: v1.3.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    srclibs:
+      - ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
+    rm:
+      - app/libs/*.jar
+    prebuild: cp -fR $$ActiveAndroid$$/src/com src/main/java
+
+  - versionName: 1.3.1
+    versionCode: 11
+    commit: v1.3.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    srclibs:
+      - ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
+    rm:
+      - app/libs/*.jar
+    prebuild: cp -fR $$ActiveAndroid$$/src/com src/main/java
+
+  - versionName: 1.3.2
+    versionCode: 12
+    commit: v1.3.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    srclibs:
+      - ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
+    rm:
+      - app/libs/*.jar
+    prebuild: cp -fR $$ActiveAndroid$$/src/com src/main/java
+
+  - versionName: 1.3.3
+    versionCode: 13
+    commit: v1.3.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    srclibs:
+      - ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
+    rm:
+      - app/libs/*.jar
+    prebuild: cp -fR $$ActiveAndroid$$/src/com src/main/java
+
+  - versionName: 1.4.0
+    versionCode: 14
+    commit: v1.4.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    srclibs:
+      - ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
+    rm:
+      - app/libs/*.jar
+    prebuild: cp -fR $$ActiveAndroid$$/src/com src/main/java
+
+  - versionName: 1.4.1
+    versionCode: 15
+    commit: v1.4.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    srclibs:
+      - ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
+    rm:
+      - app/libs/*.jar
+    prebuild: cp -fR $$ActiveAndroid$$/src/com src/main/java
+
+  - versionName: 1.5.1
+    versionCode: 17
+    commit: v1.5.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.5.2
+    versionCode: 18
+    commit: v1.5.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.5.3
+    versionCode: 19
+    commit: v1.5.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.5.4
+    versionCode: 20
+    commit: v1.5.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.5.6
+    versionCode: 22
+    commit: v1.5.6
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.6.2
+    versionCode: 25
+    commit: v1.6.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.0
+    versionCode: 27
+    commit: v1.7.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.1
+    versionCode: 28
+    commit: v1.7.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.2
+    versionCode: 29
+    commit: v1.7.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.4
+    versionCode: 31
+    commit: v1.7.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.5
+    versionCode: 32
+    commit: v1.7.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.6
+    versionCode: 33
+    commit: v1.7.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.8
+    versionCode: 35
+    commit: v1.7.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.9
+    versionCode: 36
+    commit: v1.7.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.11
+    versionCode: 38
+    commit: v1.7.11
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.7.11
+CurrentVersionCode: 38
--- a/metadata/org.itishka.pointim.txt
+++ b/metadata/org.itishka.pointim.txt
@ -1,85 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Internet
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/Tishka17/Point.im-Android
-Issue Tracker:https://github.com/Tishka17/Point.im-Android/issues
-Changelog:https://github.com/Tishka17/Point.im-Android/releases
-
-Auto Name:Point.im
-Summary:Point.im client
-Description:
-Unoficial android client for microblogging service [https://point.im/ Point.IM].
-.
-
-Repo Type:git
-Repo:https://github.com/Tishka17/Point.im-Android
-
-Build:2.9,23
-    commit=2.9
-    subdir=app
-    init=sed -i '/sonatype/d' build.gradle
-    gradle=yes
-    prebuild=echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
-
-Build:2.10,24
-    commit=2.10
-    subdir=app
-    init=sed -i '/sonatype/d' build.gradle
-    gradle=yes
-    prebuild=echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
-
-Build:2.11,25
-    commit=2.11
-    subdir=app
-    init=sed -i '/sonatype/d' build.gradle
-    gradle=yes
-    prebuild=echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
-
-Build:2.12,26
-    commit=2.12
-    subdir=app
-    init=sed -i '/sonatype/d' build.gradle
-    gradle=yes
-    prebuild=echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
-
-Build:2.13,27
-    disable=lint error
-    commit=2.13
-    subdir=app
-    init=sed -i '/sonatype/d' build.gradle
-    gradle=yes
-    prebuild=echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
-
-Build:2.14,28
-    commit=2.14
-    subdir=app
-    init=sed -i '/sonatype/d' build.gradle
-    gradle=yes
-    prebuild=echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
-
-Build:2.15,29
-    commit=2.15
-    subdir=app
-    init=sed -i '/sonatype/d' build.gradle
-    gradle=yes
-    prebuild=echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
-
-Build:2.16,30
-    commit=2.16
-    subdir=app
-    init=sed -i '/sonatype/d' build.gradle
-    gradle=yes
-    prebuild=echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
-
-Build:2.18,32
-    commit=2.18
-    subdir=app
-    init=sed -i '/sonatype/d' build.gradle
-    gradle=yes
-    prebuild=echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.18
-Current Version Code:32
--- a/metadata/org.itishka.pointim.yml
+++ b/metadata/org.itishka.pointim.yml
@ -0,0 +1,104 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Internet
+License: GPL-3.0-only
+SourceCode: https://github.com/Tishka17/Point.im-Android
+IssueTracker: https://github.com/Tishka17/Point.im-Android/issues
+Changelog: https://github.com/Tishka17/Point.im-Android/releases
+
+AutoName: Point.im
+Summary: Point.im client
+Description: Unoficial android client for microblogging service [https://point.im/
+    Point.IM].
+
+RepoType: git
+Repo: https://github.com/Tishka17/Point.im-Android
+
+Builds:
+  - versionName: '2.9'
+    versionCode: 23
+    commit: '2.9'
+    subdir: app
+    init: sed -i '/sonatype/d' build.gradle
+    gradle:
+      - yes
+    prebuild: echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
+
+  - versionName: '2.10'
+    versionCode: 24
+    commit: '2.10'
+    subdir: app
+    init: sed -i '/sonatype/d' build.gradle
+    gradle:
+      - yes
+    prebuild: echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
+
+  - versionName: '2.11'
+    versionCode: 25
+    commit: '2.11'
+    subdir: app
+    init: sed -i '/sonatype/d' build.gradle
+    gradle:
+      - yes
+    prebuild: echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
+
+  - versionName: '2.12'
+    versionCode: 26
+    commit: '2.12'
+    subdir: app
+    init: sed -i '/sonatype/d' build.gradle
+    gradle:
+      - yes
+    prebuild: echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
+
+  - versionName: '2.13'
+    versionCode: 27
+    disable: lint error
+    commit: '2.13'
+    subdir: app
+    init: sed -i '/sonatype/d' build.gradle
+    gradle:
+      - yes
+    prebuild: echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
+
+  - versionName: '2.14'
+    versionCode: 28
+    commit: '2.14'
+    subdir: app
+    init: sed -i '/sonatype/d' build.gradle
+    gradle:
+      - yes
+    prebuild: echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
+
+  - versionName: '2.15'
+    versionCode: 29
+    commit: '2.15'
+    subdir: app
+    init: sed -i '/sonatype/d' build.gradle
+    gradle:
+      - yes
+    prebuild: echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
+
+  - versionName: '2.16'
+    versionCode: 30
+    commit: '2.16'
+    subdir: app
+    init: sed -i '/sonatype/d' build.gradle
+    gradle:
+      - yes
+    prebuild: echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
+
+  - versionName: '2.18'
+    versionCode: 32
+    commit: '2.18'
+    subdir: app
+    init: sed -i '/sonatype/d' build.gradle
+    gradle:
+      - yes
+    prebuild: echo -e 'imgurId="1f48b577414e505"\nimgurSecret=""' >> ../local.properties
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '2.18'
+CurrentVersionCode: 32
--- a/metadata/org.jak_linux.dns66.txt
+++ b/metadata/org.jak_linux.dns66.txt
@ -1,137 +0,0 @@
-Categories:Internet
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/julian-klode/dns66
-Issue Tracker:https://github.com/julian-klode/dns66/issues
-Changelog:https://github.com/julian-klode/dns66/releases
-
-Auto Name:DNS66
-Summary:Block ads/hosts via DNS
-Description:
-DNS66 allows blocking host names via DNS. This can be used for ad blocking. It
-also allows other DNS servers to be added, for more privacy.
-
-Compared to AdBlock Plus, this works without proxy stuff; and it also does not
-require root, like AdAway does: DNS66 establishes a VPN interface, and redirects
-DNS server traffic to it. The VPN interface filters the traffic, only allowing
-queries for hosts that are not blacklisted.
-
-A host (list) can be configured as allow, deny, or ignore. A later entry in the
-list overrides a previous entry.
-
-Custom DNS Servers can be configured as well, using the same UI, but no
-differentiation is made between ignored and denied servers.
-.
-
-Repo Type:git
-Repo:https://github.com/julian-klode/dns66
-
-Build:0.1.0,1
-    commit=v0.1.0
-    subdir=app
-    gradle=yes
-
-Build:0.1.1,2
-    commit=v0.1.1
-    subdir=app
-    gradle=yes
-
-Build:0.1.2,3
-    commit=v0.1.2
-    subdir=app
-    gradle=yes
-
-Build:0.1.3,4
-    commit=v0.1.3
-    subdir=app
-    gradle=yes
-
-Build:0.2.0,5
-    commit=v0.2.0
-    subdir=app
-    gradle=yes
-
-Build:0.2.1,6
-    commit=v0.2.1
-    subdir=app
-    gradle=yes
-
-Build:0.2.2,7
-    commit=v0.2.2
-    subdir=app
-    gradle=yes
-
-Build:0.3.0,8
-    commit=v0.3.0
-    subdir=app
-    gradle=yes
-
-Build:0.3.1,9
-    commit=v0.3.1
-    subdir=app
-    gradle=yes
-
-Build:0.4.0,10
-    commit=v0.4.0
-    subdir=app
-    gradle=yes
-
-Build:0.4.1,11
-    commit=v0.4.1
-    subdir=app
-    gradle=yes
-
-Build:0.5.0,12
-    commit=v0.5.0
-    subdir=app
-    gradle=yes
-
-Build:0.5.1,13
-    commit=v0.5.1
-    subdir=app
-    gradle=yes
-
-Build:0.5.2,14
-    commit=v0.5.2
-    subdir=app
-    gradle=yes
-
-Build:0.5.3,15
-    commit=v0.5.3
-    subdir=app
-    gradle=yes
-
-Build:0.5.4,16
-    commit=v0.5.4
-    subdir=app
-    gradle=yes
-
-Build:0.5.5,17
-    commit=v0.5.5
-    subdir=app
-    gradle=yes
-
-Build:0.5.7,19
-    commit=v0.5.7
-    subdir=app
-    gradle=yes
-
-Build:0.5.8,20
-    commit=v0.5.8
-    subdir=app
-    gradle=yes
-
-Build:0.6.0,21
-    commit=v0.6.0
-    subdir=app
-    gradle=yes
-
-Build:0.6.1,22
-    commit=v0.6.1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.6.1
-Current Version Code:22
--- a/metadata/org.jak_linux.dns66.yml
+++ b/metadata/org.jak_linux.dns66.yml
@ -0,0 +1,180 @@
+Categories:
+  - Internet
+License: GPL-3.0-only
+WebSite: https://jak-linux.org/projects/dns66/
+SourceCode: https://github.com/julian-klode/dns66
+IssueTracker: https://github.com/julian-klode/dns66/issues
+Changelog: https://github.com/julian-klode/dns66/releases
+
+AutoName: DNS66
+Summary: Block ads/hosts via DNS
+Description: |-
+    DNS66 allows blocking host names via DNS. This can be used for ad blocking. It
+    also allows other DNS servers to be added, for more privacy.
+
+    Compared to AdBlock Plus, this works without proxy stuff; and it also does not
+    require root, like AdAway does: DNS66 establishes a VPN interface, and redirects
+    DNS server traffic to it. The VPN interface filters the traffic, only allowing
+    queries for hosts that are not blacklisted.
+
+    A host (list) can be configured as allow, deny, or ignore. A later entry in the
+    list overrides a previous entry.
+
+    Custom DNS Servers can be configured as well, using the same UI, but no
+    differentiation is made between ignored and denied servers.
+
+RepoType: git
+Repo: https://github.com/julian-klode/dns66
+
+Builds:
+  - versionName: 0.1.0
+    versionCode: 1
+    commit: v0.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.1
+    versionCode: 2
+    commit: v0.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.2
+    versionCode: 3
+    commit: v0.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.3
+    versionCode: 4
+    commit: v0.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.0
+    versionCode: 5
+    commit: v0.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.1
+    versionCode: 6
+    commit: v0.2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.2
+    versionCode: 7
+    commit: v0.2.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.3.0
+    versionCode: 8
+    commit: v0.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.3.1
+    versionCode: 9
+    commit: v0.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.4.0
+    versionCode: 10
+    commit: v0.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.4.1
+    versionCode: 11
+    commit: v0.4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.0
+    versionCode: 12
+    commit: v0.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.1
+    versionCode: 13
+    commit: v0.5.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.2
+    versionCode: 14
+    commit: v0.5.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.3
+    versionCode: 15
+    commit: v0.5.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.4
+    versionCode: 16
+    commit: v0.5.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.5
+    versionCode: 17
+    commit: v0.5.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.7
+    versionCode: 19
+    commit: v0.5.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.8
+    versionCode: 20
+    commit: v0.5.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.6.0
+    versionCode: 21
+    commit: v0.6.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.6.1
+    versionCode: 22
+    commit: v0.6.1
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.6.1
+CurrentVersionCode: 22
--- a/metadata/org.jamienicol.episodes.txt
+++ b/metadata/org.jamienicol.episodes.txt
@ -1,75 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/jamienicol/episodes
-Issue Tracker:https://github.com/jamienicol/episodes/issues
-Bitcoin:149XkMSs84ZyzNMqiQeJLt5DbPru16amwA
-
-Auto Name:Episodes
-Summary:Track TV shows you have seen
-Description:
-Keep track of which episodes you've watched of your favourite TV shows. The data
-is sourced from [http://thetvdb.com TheTVDB.com], the content of which is
-licensed under CC-BY-NC.
-
-'''Note:''' This app is no longer maintained.
-.
-
-Repo Type:git
-Repo:https://github.com/jamienicol/episodes
-
-Build:0.2,2
-    commit=v0.2
-
-Build:0.3,3
-    commit=v0.3
-
-Build:0.4,4
-    commit=v0.4
-
-Build:0.5,5
-    commit=v0.5
-
-Build:0.6,6
-    commit=v0.6
-
-Build:0.7,7
-    commit=v0.7
-    srclibs=ImageLoader@v1.9.3
-    rm=libs/*
-    extlibs=android/android-support-v4.jar
-    prebuild=cp libs/android-support-v4.jar appcompat/libs/android-support-v4.jar && \
-        pushd $$ImageLoader$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$ImageLoader$$/target/universal-image-loader-1.9.3.jar libs/
-
-Build:0.8,8
-    commit=v0.8
-    subdir=app
-    gradle=yes
-
-Build:0.9,9
-    commit=v0.9
-    subdir=app
-    gradle=yes
-
-Build:0.10,10
-    commit=v0.10
-    subdir=app
-    gradle=yes
-
-Build:0.11,11
-    commit=v0.11
-    subdir=app
-    gradle=fdroid
-
-Build:0.12,12
-    commit=v0.12
-    subdir=app
-    gradle=fdroid
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.12
-Current Version Code:12
--- a/metadata/org.jamienicol.episodes.yml
+++ b/metadata/org.jamienicol.episodes.yml
@ -0,0 +1,95 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-or-later
+SourceCode: https://github.com/jamienicol/episodes
+IssueTracker: https://github.com/jamienicol/episodes/issues
+Bitcoin: 149XkMSs84ZyzNMqiQeJLt5DbPru16amwA
+
+AutoName: Episodes
+Summary: Track TV shows you have seen
+Description: |-
+    Keep track of which episodes you've watched of your favourite TV shows. The data
+    is sourced from [http://thetvdb.com TheTVDB.com], the content of which is
+    licensed under CC-BY-NC.
+
+    '''Note:''' This app is no longer maintained.
+
+RepoType: git
+Repo: https://github.com/jamienicol/episodes
+
+Builds:
+  - versionName: '0.2'
+    versionCode: 2
+    commit: v0.2
+
+  - versionName: '0.3'
+    versionCode: 3
+    commit: v0.3
+
+  - versionName: '0.4'
+    versionCode: 4
+    commit: v0.4
+
+  - versionName: '0.5'
+    versionCode: 5
+    commit: v0.5
+
+  - versionName: '0.6'
+    versionCode: 6
+    commit: v0.6
+
+  - versionName: '0.7'
+    versionCode: 7
+    commit: v0.7
+    srclibs:
+      - ImageLoader@v1.9.3
+    rm:
+      - libs/*
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - cp libs/android-support-v4.jar appcompat/libs/android-support-v4.jar
+      - pushd $$ImageLoader$$
+      - $$MVN3$$ package
+      - popd
+      - cp $$ImageLoader$$/target/universal-image-loader-1.9.3.jar libs/
+
+  - versionName: '0.8'
+    versionCode: 8
+    commit: v0.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.9'
+    versionCode: 9
+    commit: v0.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.10'
+    versionCode: 10
+    commit: v0.10
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.11'
+    versionCode: 11
+    commit: v0.11
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: '0.12'
+    versionCode: 12
+    commit: v0.12
+    subdir: app
+    gradle:
+      - fdroid
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '0.12'
+CurrentVersionCode: 12
--- a/metadata/org.janb.shoppinglist.txt
+++ b/metadata/org.janb.shoppinglist.txt
@ -1,45 +0,0 @@
-Categories:Writing
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/GroundApps/ShoppingList
-Issue Tracker:https://github.com/GroundApps/ShoppingList/issues
-
-Auto Name:ShoppingList
-Summary:Simple centralized shoppinglist
-Description:
-Helps to keep a shoppinglist synchronized among multiple people. Please remember
-to keep the backend updated.
-
-Features:
-
-* Basic cached version in case of connection loss
-* Tap to mark to delete
-* Longtap to edit item
-* Quick add for favorites
-* Material Design
-* The PHP & MySql backend is available [https://github.com/GroundApps/ShoppingList_Backend here]
-.
-
-Repo Type:git
-Repo:https://github.com/GroundApps/ShoppingList
-
-Build:1.0,1
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=v1.1
-    subdir=app
-    gradle=yes
-
-Build:1.3,4
-    commit=v1.3
-    subdir=app
-    gradle=yes
-    prebuild=rm -fR ../build
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.3
-Current Version Code:4
--- a/metadata/org.janb.shoppinglist.yml
+++ b/metadata/org.janb.shoppinglist.yml
@ -0,0 +1,51 @@
+Categories:
+  - Writing
+License: Apache-2.0
+SourceCode: https://github.com/GroundApps/ShoppingList
+IssueTracker: https://github.com/GroundApps/ShoppingList/issues
+
+AutoName: ShoppingList
+Summary: Simple centralized shoppinglist
+Description: |-
+    Helps to keep a shoppinglist synchronized among multiple people. Please remember
+    to keep the backend updated.
+
+    Features:
+
+    * Basic cached version in case of connection loss
+    * Tap to mark to delete
+    * Longtap to edit item
+    * Quick add for favorites
+    * Material Design
+    * The PHP & MySql backend is available [https://github.com/GroundApps/ShoppingList_Backend here]
+
+RepoType: git
+Repo: https://github.com/GroundApps/ShoppingList
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 4
+    commit: v1.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: rm -fR ../build
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.3'
+CurrentVersionCode: 4
--- a/metadata/org.katsarov.heatcalc.txt
+++ b/metadata/org.katsarov.heatcalc.txt
@ -1,27 +0,0 @@
-Categories:Science & Education
-License:GPL-3.0-or-later
-Web Site:https://gitlab.com/a-katsarov/heatsink-calc/
-Source Code:https://gitlab.com/a-katsarov/heatsink-calc/tree/HEAD
-Issue Tracker:https://gitlab.com/a-katsarov/heatsink-calc/issues
-
-Auto Name:HeatCalc
-Summary:Heatsink calculator
-Description:
-Calculates the required heat sink for an electronic device.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/a-katsarov/heatsink-calc-android.git
-
-Build:1.1.1,10101
-    commit=v1.1.1
-    scanignore=cordova/node_modules
-
-Build:1.1.2,10102
-    commit=v1.1.2
-    scanignore=cordova/node_modules
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.1.2
-Current Version Code:10102
--- a/metadata/org.katsarov.heatcalc.yml
+++ b/metadata/org.katsarov.heatcalc.yml
@ -0,0 +1,31 @@
+Categories:
+  - Science & Education
+License: GPL-3.0-or-later
+WebSite: https://gitlab.com/a-katsarov/heatsink-calc/
+SourceCode: https://gitlab.com/a-katsarov/heatsink-calc/tree/HEAD
+IssueTracker: https://gitlab.com/a-katsarov/heatsink-calc/issues
+
+AutoName: HeatCalc
+Summary: Heatsink calculator
+Description: Calculates the required heat sink for an electronic device.
+
+RepoType: git
+Repo: https://gitlab.com/a-katsarov/heatsink-calc-android.git
+
+Builds:
+  - versionName: 1.1.1
+    versionCode: 10101
+    commit: v1.1.1
+    scanignore:
+      - cordova/node_modules
+
+  - versionName: 1.1.2
+    versionCode: 10102
+    commit: v1.1.2
+    scanignore:
+      - cordova/node_modules
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.1.2
+CurrentVersionCode: 10102
--- a/metadata/org.kde.kdeconnect_tp.txt
+++ b/metadata/org.kde.kdeconnect_tp.txt
@ -1,312 +0,0 @@
-Categories:System
-License:GPL-2.0-only
-Web Site:https://community.kde.org/KDE_Connect
-Source Code:https://invent.kde.org/kde/kdeconnect-android
-Issue Tracker:https://bugs.kde.org
-
-Auto Name:KDE Connect
-Summary:KDE Integration
-Description:
-KDE Connect provides a set of features to integrate your workflow across
-devices:
-
-* Shared clipboard: copy and paste between your devices.
-* Share files and URLs to your computer from any app.
-* Get notifications for incoming calls and SMS messages on your PC.
-* Virtual touchpad: Use your phone screen as your computer's touchpad.
-* Notifications sync: Read your Android notifications from the desktop.
-* Multimedia remote control: Use your phone as a remote for Linux media players.
-* WiFi connection: no USB wire or bluetooth needed.
-* End-to-end TLS encryption: your information is safe.
-
-Please note you will need to install KDE Connect on your computer for this app
-to work, and keep the desktop version up-to-date with the Android version for
-the latest features to work.
-
-This app is part of an open source project and it exists thanks to all the
-people who contributed to it. Visit the website to grab the source code.
-.
-
-Repo Type:git
-Repo:https://anongit.kde.org/kdeconnect-android
-
-Build:0.3.0,5
-    commit=v0.3
-    subdir=KdeConnect
-    gradle=yes
-
-Build:0.4,9
-    commit=v0.4
-    gradle=yes
-
-Build:0.4.1,10
-    commit=v0.4.1
-    gradle=yes
-
-Build:0.4.2,11
-    commit=v0.4.2
-    gradle=yes
-
-Build:0.5,12
-    commit=v0.5
-    gradle=yes
-
-Build:0.6,14
-    commit=v0.6
-    gradle=yes
-
-Build:0.6.3,18
-    commit=v0.6.3
-    gradle=yes
-
-Build:0.6.4,20
-    commit=v0.6.4
-    gradle=yes
-
-Build:0.7,70
-    commit=v0.7
-    gradle=yes
-
-Build:0.7.1,711
-    commit=v0.7.1
-    gradle=yes
-
-Build:0.7.2,720
-    commit=v0.7.2
-    gradle=yes
-
-Build:0.7.3,730
-    commit=v0.7.3
-    gradle=yes
-
-Build:0.7.3.1,731
-    commit=v0.7.3.1
-    gradle=yes
-
-Build:0.7.3.2,732
-    commit=v0.7.3.2
-    gradle=yes
-
-Build:0.7.3.3,733
-    commit=v0.7.3.3
-    gradle=yes
-
-Build:0.7.3.4,734
-    disable=no tag
-    commit=v0.7.3.4
-    gradle=yes
-
-Build:0.7.3.6,736
-    commit=v0.7.3.6
-    gradle=yes
-
-Build:0.8,800
-    commit=v0.8
-    gradle=yes
-
-Build:0.8d,804
-    commit=v0.8d
-    gradle=yes
-
-Build:0.8e,805
-    commit=v0.8e
-    gradle=yes
-
-Build:0.8g,807
-    commit=v0.8g
-    gradle=yes
-
-Build:0.8h,808
-    commit=v0.8h
-    gradle=yes
-
-Build:0.9.1,906
-    commit=v0.9
-    gradle=yes
-
-Build:0.9c,907
-    commit=v0.9b
-    gradle=yes
-
-Build:0.9d,908
-    commit=v0.9d
-    gradle=yes
-
-Build:0.9e,909
-    commit=v0.9e
-    gradle=yes
-
-Build:0.9g,910
-    commit=v0.9g
-    gradle=yes
-
-Build:1.0,1000
-    commit=v1.0
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.0.2,1020
-    commit=v1.0.2
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.1,1102
-    commit=v1.1
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.2,1200
-    commit=v1.2
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.3.2,1320
-    commit=v1.3
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.4,1400
-    commit=v1.4
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.4.4,1440
-    commit=v1.4.4
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.5,1500
-    commit=v1.5
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.6,1600
-    commit=v1.6
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.6.1,1610
-    commit=v1.6.1
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.6.3,1630
-    commit=v1.6.3
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.6.5,1650
-    commit=v1.6.5
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.6.6,1660
-    commit=v1.6.6
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.7.1,1710
-    disable=Cannot resolve external dependency com.android.tools.build:gradle:3.0.1 because no repositories are defined
-    commit=v1.7.1
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.7.2,1720
-    commit=v1.7.2
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.8.0,1800
-    commit=v1.8
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.8.1,1811
-    commit=v1.8.1
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.8.2,1820
-    commit=v1.8.2
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.8.4,1840
-    commit=v1.8.4
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.8.4,1841
-    commit=v1.8.4.1
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.10,11006
-    commit=v1.10
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.10.1,11010
-    commit=v1.10.1
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.11,11100
-    commit=v1.11
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.12,11200
-    commit=v1.12
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.12.5,11250
-    commit=v1.12.5
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.12.6,11260
-    commit=v1.12.6
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.12.7,11270
-    commit=v1.12.7
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.12.8,11280
-    commit=v1.12.8
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.12.9,11291
-    commit=v1.12.9.1
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.12.9,11292
-    commit=v1.12.9.2
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.12.93,11293
-    commit=v1.12.93
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.13,11300
-    commit=v1.13
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Build:1.13.1,11310
-    commit=v1.13.1
-    gradle=yes
-    prebuild=sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.13.1
-Current Version Code:11310
--- a/metadata/org.kde.kdeconnect_tp.yml
+++ b/metadata/org.kde.kdeconnect_tp.yml
@ -0,0 +1,434 @@
+Categories:
+  - System
+License: GPL-2.0-only
+WebSite: https://community.kde.org/KDE_Connect
+SourceCode: https://invent.kde.org/kde/kdeconnect-android
+IssueTracker: https://bugs.kde.org
+
+AutoName: KDE Connect
+Summary: KDE Integration
+Description: |-
+    KDE Connect provides a set of features to integrate your workflow across
+    devices:
+
+    * Shared clipboard: copy and paste between your devices.
+    * Share files and URLs to your computer from any app.
+    * Get notifications for incoming calls and SMS messages on your PC.
+    * Virtual touchpad: Use your phone screen as your computer's touchpad.
+    * Notifications sync: Read your Android notifications from the desktop.
+    * Multimedia remote control: Use your phone as a remote for Linux media players.
+    * WiFi connection: no USB wire or bluetooth needed.
+    * End-to-end TLS encryption: your information is safe.
+
+    Please note you will need to install KDE Connect on your computer for this app
+    to work, and keep the desktop version up-to-date with the Android version for
+    the latest features to work.
+
+    This app is part of an open source project and it exists thanks to all the
+    people who contributed to it. Visit the website to grab the source code.
+
+RepoType: git
+Repo: https://anongit.kde.org/kdeconnect-android
+
+Builds:
+  - versionName: 0.3.0
+    versionCode: 5
+    commit: v0.3
+    subdir: KdeConnect
+    gradle:
+      - yes
+
+  - versionName: '0.4'
+    versionCode: 9
+    commit: v0.4
+    gradle:
+      - yes
+
+  - versionName: 0.4.1
+    versionCode: 10
+    commit: v0.4.1
+    gradle:
+      - yes
+
+  - versionName: 0.4.2
+    versionCode: 11
+    commit: v0.4.2
+    gradle:
+      - yes
+
+  - versionName: '0.5'
+    versionCode: 12
+    commit: v0.5
+    gradle:
+      - yes
+
+  - versionName: '0.6'
+    versionCode: 14
+    commit: v0.6
+    gradle:
+      - yes
+
+  - versionName: 0.6.3
+    versionCode: 18
+    commit: v0.6.3
+    gradle:
+      - yes
+
+  - versionName: 0.6.4
+    versionCode: 20
+    commit: v0.6.4
+    gradle:
+      - yes
+
+  - versionName: '0.7'
+    versionCode: 70
+    commit: v0.7
+    gradle:
+      - yes
+
+  - versionName: 0.7.1
+    versionCode: 711
+    commit: v0.7.1
+    gradle:
+      - yes
+
+  - versionName: 0.7.2
+    versionCode: 720
+    commit: v0.7.2
+    gradle:
+      - yes
+
+  - versionName: 0.7.3
+    versionCode: 730
+    commit: v0.7.3
+    gradle:
+      - yes
+
+  - versionName: 0.7.3.1
+    versionCode: 731
+    commit: v0.7.3.1
+    gradle:
+      - yes
+
+  - versionName: 0.7.3.2
+    versionCode: 732
+    commit: v0.7.3.2
+    gradle:
+      - yes
+
+  - versionName: 0.7.3.3
+    versionCode: 733
+    commit: v0.7.3.3
+    gradle:
+      - yes
+
+  - versionName: 0.7.3.4
+    versionCode: 734
+    disable: no tag
+    commit: v0.7.3.4
+    gradle:
+      - yes
+
+  - versionName: 0.7.3.6
+    versionCode: 736
+    commit: v0.7.3.6
+    gradle:
+      - yes
+
+  - versionName: '0.8'
+    versionCode: 800
+    commit: v0.8
+    gradle:
+      - yes
+
+  - versionName: 0.8d
+    versionCode: 804
+    commit: v0.8d
+    gradle:
+      - yes
+
+  - versionName: 0.8e
+    versionCode: 805
+    commit: v0.8e
+    gradle:
+      - yes
+
+  - versionName: 0.8g
+    versionCode: 807
+    commit: v0.8g
+    gradle:
+      - yes
+
+  - versionName: 0.8h
+    versionCode: 808
+    commit: v0.8h
+    gradle:
+      - yes
+
+  - versionName: 0.9.1
+    versionCode: 906
+    commit: v0.9
+    gradle:
+      - yes
+
+  - versionName: 0.9c
+    versionCode: 907
+    commit: v0.9b
+    gradle:
+      - yes
+
+  - versionName: 0.9d
+    versionCode: 908
+    commit: v0.9d
+    gradle:
+      - yes
+
+  - versionName: 0.9e
+    versionCode: 909
+    commit: v0.9e
+    gradle:
+      - yes
+
+  - versionName: 0.9g
+    versionCode: 910
+    commit: v0.9g
+    gradle:
+      - yes
+
+  - versionName: '1.0'
+    versionCode: 1000
+    commit: v1.0
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.0.2
+    versionCode: 1020
+    commit: v1.0.2
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: '1.1'
+    versionCode: 1102
+    commit: v1.1
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: '1.2'
+    versionCode: 1200
+    commit: v1.2
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.3.2
+    versionCode: 1320
+    commit: v1.3
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: '1.4'
+    versionCode: 1400
+    commit: v1.4
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.4.4
+    versionCode: 1440
+    commit: v1.4.4
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: '1.5'
+    versionCode: 1500
+    commit: v1.5
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: '1.6'
+    versionCode: 1600
+    commit: v1.6
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.6.1
+    versionCode: 1610
+    commit: v1.6.1
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.6.3
+    versionCode: 1630
+    commit: v1.6.3
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.6.5
+    versionCode: 1650
+    commit: v1.6.5
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.6.6
+    versionCode: 1660
+    commit: v1.6.6
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.7.1
+    versionCode: 1710
+    disable: Cannot resolve external dependency com.android.tools.build:gradle:3.0.1
+        because no repositories are defined
+    commit: v1.7.1
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.7.2
+    versionCode: 1720
+    commit: v1.7.2
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.8.0
+    versionCode: 1800
+    commit: v1.8
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.8.1
+    versionCode: 1811
+    commit: v1.8.1
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.8.2
+    versionCode: 1820
+    commit: v1.8.2
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.8.4
+    versionCode: 1840
+    commit: v1.8.4
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.8.4
+    versionCode: 1841
+    commit: v1.8.4.1
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: '1.10'
+    versionCode: 11006
+    commit: v1.10
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.10.1
+    versionCode: 11010
+    commit: v1.10.1
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: '1.11'
+    versionCode: 11100
+    commit: v1.11
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: '1.12'
+    versionCode: 11200
+    commit: v1.12
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.12.5
+    versionCode: 11250
+    commit: v1.12.5
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.12.6
+    versionCode: 11260
+    commit: v1.12.6
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.12.7
+    versionCode: 11270
+    commit: v1.12.7
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.12.8
+    versionCode: 11280
+    commit: v1.12.8
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.12.9
+    versionCode: 11291
+    commit: v1.12.9.1
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.12.9
+    versionCode: 11292
+    commit: v1.12.9.2
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.12.93
+    versionCode: 11293
+    commit: v1.12.93
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: '1.13'
+    versionCode: 11300
+    commit: v1.13
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+  - versionName: 1.13.1
+    versionCode: 11310
+    commit: v1.13.1
+    gradle:
+      - yes
+    prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.13.1
+CurrentVersionCode: 11310
--- a/metadata/org.kde.necessitas.ministro.txt
+++ b/metadata/org.kde.necessitas.ministro.txt
@ -1,57 +0,0 @@
-Categories:Development
-License:GPL-3.0-or-later
-Web Site:http://community.kde.org/Necessitas
-Source Code:https://cgit.kde.org/ministro.git/
-Issue Tracker:
-
-Auto Name:Ministro
-Summary:Needed by apps written in Qt
-Description:
-You do not need to install this unless another app requests it. That may direct
-you towards Google Play, but you can install this instead. There are currently
-no such apps in this repo because they require a different SDK to build. For
-testing purposes, there is a Breakout-style game apk available via
-[http://f-droid.org/forums/topic/xbreakout this] thread.
-
-Ministro is a system wide Qt shared libraries installer/provider service. It
-acts as a bridge between your apps and Qt libraries.
-
-The connection API protocol used by applications to connect and query the
-service is released under BSD license, it mean that any application (no matter
-if that application is free or not) can connect and query its services.
-
-Also, be aware, this service will install/provide the free versions of Qt
-libraries, licensed under LGPL v2.1/ GPL v3.
-.
-
-Repo Type:git
-Repo:https://anongit.kde.org/ministro.git
-
-Build:6.0,6
-    commit=n0.3
-    subdir=Ministro
-    target=android-15
-    buildjni=yes
-
-Build:7.0,7
-    commit=7.0
-    subdir=Ministro
-    target=android-15
-    buildjni=yes
-
-Build:10.0,13
-    commit=10.0
-    subdir=Ministro
-    target=android-15
-    buildjni=yes
-
-Build:10.4,14
-    commit=10.4
-    subdir=Ministro
-    target=android-15
-    buildjni=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:10.4
-Current Version Code:14
--- a/metadata/org.kde.necessitas.ministro.yml
+++ b/metadata/org.kde.necessitas.ministro.yml
@ -0,0 +1,65 @@
+Categories:
+  - Development
+License: GPL-3.0-or-later
+WebSite: http://community.kde.org/Necessitas
+SourceCode: https://cgit.kde.org/ministro.git/
+
+AutoName: Ministro
+Summary: Needed by apps written in Qt
+Description: |-
+    You do not need to install this unless another app requests it. That may direct
+    you towards Google Play, but you can install this instead. There are currently
+    no such apps in this repo because they require a different SDK to build. For
+    testing purposes, there is a Breakout-style game apk available via
+    [http://f-droid.org/forums/topic/xbreakout this] thread.
+
+    Ministro is a system wide Qt shared libraries installer/provider service. It
+    acts as a bridge between your apps and Qt libraries.
+
+    The connection API protocol used by applications to connect and query the
+    service is released under BSD license, it mean that any application (no matter
+    if that application is free or not) can connect and query its services.
+
+    Also, be aware, this service will install/provide the free versions of Qt
+    libraries, licensed under LGPL v2.1/ GPL v3.
+
+RepoType: git
+Repo: https://anongit.kde.org/ministro.git
+
+Builds:
+  - versionName: '6.0'
+    versionCode: 6
+    commit: n0.3
+    subdir: Ministro
+    target: android-15
+    buildjni:
+      - yes
+
+  - versionName: '7.0'
+    versionCode: 7
+    commit: '7.0'
+    subdir: Ministro
+    target: android-15
+    buildjni:
+      - yes
+
+  - versionName: '10.0'
+    versionCode: 13
+    commit: '10.0'
+    subdir: Ministro
+    target: android-15
+    buildjni:
+      - yes
+
+  - versionName: '10.4'
+    versionCode: 14
+    commit: '10.4'
+    subdir: Ministro
+    target: android-15
+    buildjni:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '10.4'
+CurrentVersionCode: 14