diff --git a/metadata/com.app.missednotificationsreminder.txt b/metadata/com.app.missednotificationsreminder.txt
deleted file mode 100644
index 8d5fd604ea..0000000000
--- a/metadata/com.app.missednotificationsreminder.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-Categories:Connectivity
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/httpdispatch/MissedNotificationsReminder
-Issue Tracker:https://github.com/httpdispatch/MissedNotificationsReminder/issues
-
-Auto Name:MissedNotificationsReminder
-Summary:Periodical sound reminder for missed notifications
-Description:
-Unfortunately Android doesn't have default integrated functionality to notify
-the user periodically about missing calls/messages/other notifications via sound
-(only LED is blinking). This tool allows you to monitor notifications from any
-applications which are important for you and perform sound reminder
-periodically.
-
-Just launch app, allow it to receive notification events, select reminder
-interval and important applications. That's it. If there are any unhandled
-notifications from thet selected apps in the statusbar, app will notify you
-periodically with the notification sound you choose.
-
-The battery is used only if there are missed notifications which requires
-periodical reminder. App wakes phone to perform sound notification and then
-sleep again.
-.
-
-Repo Type:git
-Repo:https://github.com/httpdispatch/MissedNotificationsReminder.git
-
-Build:1.1.5,1401010500
- commit=cab55edf82430474db99e826d9e5f2858215b4fe
- subdir=app
- gradle=v14
-
-Build:1.1.11,1401011100
- commit=1.1.11
- subdir=app
- gradle=v14
-
-Build:1.1.5,1801010500
- commit=cab55edf82430474db99e826d9e5f2858215b4fe
- subdir=app
- gradle=v18
-
-Build:1.1.11,1801011100
- commit=1.1.11
- subdir=app
- gradle=v18
-
-Build:1.1.15,2010115014
- commit=1.1.15
- subdir=app
- gradle=v14
-
-Build:1.1.15,2010115018
- commit=1.1.15
- subdir=app
- gradle=v18
-
-Build:1.1.19,2010119014
- commit=1.1.19
- subdir=app
- gradle=v14
-
-Build:1.1.19,2010119018
- commit=1.1.19
- subdir=app
- gradle=v18
-
-Maintainer Notes:
-Build both flavors with each release.
-VC is generated at buildtime, cannot set UCM.
-.
-
-Archive Policy:4 versions
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.1.19
-Current Version Code:2010119018
diff --git a/metadata/com.app.missednotificationsreminder.yml b/metadata/com.app.missednotificationsreminder.yml
new file mode 100644
index 0000000000..f0b5ea8e79
--- /dev/null
+++ b/metadata/com.app.missednotificationsreminder.yml
@@ -0,0 +1,93 @@
+Categories:
+ - Connectivity
+License: Apache-2.0
+SourceCode: https://github.com/httpdispatch/MissedNotificationsReminder
+IssueTracker: https://github.com/httpdispatch/MissedNotificationsReminder/issues
+
+AutoName: MissedNotificationsReminder
+Summary: Periodical sound reminder for missed notifications
+Description: |-
+ Unfortunately Android doesn't have default integrated functionality to notify
+ the user periodically about missing calls/messages/other notifications via sound
+ (only LED is blinking). This tool allows you to monitor notifications from any
+ applications which are important for you and perform sound reminder
+ periodically.
+
+ Just launch app, allow it to receive notification events, select reminder
+ interval and important applications. That's it. If there are any unhandled
+ notifications from thet selected apps in the statusbar, app will notify you
+ periodically with the notification sound you choose.
+
+ The battery is used only if there are missed notifications which requires
+ periodical reminder. App wakes phone to perform sound notification and then
+ sleep again.
+
+RepoType: git
+Repo: https://github.com/httpdispatch/MissedNotificationsReminder.git
+
+Builds:
+ - versionName: 1.1.5
+ versionCode: 1401010500
+ commit: cab55edf82430474db99e826d9e5f2858215b4fe
+ subdir: app
+ gradle:
+ - v14
+
+ - versionName: 1.1.11
+ versionCode: 1401011100
+ commit: 1.1.11
+ subdir: app
+ gradle:
+ - v14
+
+ - versionName: 1.1.5
+ versionCode: 1801010500
+ commit: cab55edf82430474db99e826d9e5f2858215b4fe
+ subdir: app
+ gradle:
+ - v18
+
+ - versionName: 1.1.11
+ versionCode: 1801011100
+ commit: 1.1.11
+ subdir: app
+ gradle:
+ - v18
+
+ - versionName: 1.1.15
+ versionCode: 2010115014
+ commit: 1.1.15
+ subdir: app
+ gradle:
+ - v14
+
+ - versionName: 1.1.15
+ versionCode: 2010115018
+ commit: 1.1.15
+ subdir: app
+ gradle:
+ - v18
+
+ - versionName: 1.1.19
+ versionCode: 2010119014
+ commit: 1.1.19
+ subdir: app
+ gradle:
+ - v14
+
+ - versionName: 1.1.19
+ versionCode: 2010119018
+ commit: 1.1.19
+ subdir: app
+ gradle:
+ - v18
+
+MaintainerNotes: |-
+ Build both flavors with each release.
+ VC is generated at buildtime, cannot set UCM.
+
+ArchivePolicy: 4 versions
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 1.1.19
+CurrentVersionCode: 2010119018
diff --git a/metadata/com.app2go.sudokufree.txt b/metadata/com.app2go.sudokufree.txt
deleted file mode 100644
index 11a1800771..0000000000
--- a/metadata/com.app2go.sudokufree.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-AntiFeatures:UpstreamNonFree
-Categories:Games
-License:GPL-3.0-only
-Web Site:http://www.1gravity.com
-Source Code:https://code.google.com/p/sudoku-pro-android/source
-Issue Tracker:
-
-Auto Name:Sudoku Free
-Summary:Numerical puzzle game
-Description:
-In addition to standard sudoku puzzles it offers these variants:
-
-* X-Sudoku
-* Hyper-Sudoku
-* Percent-Sudoku
-* Color-Sudoku
-* Squiggly Sudoku (a.k.a. Jigsaw Sudoku)
-* ... and combinations thereof (e.g. Sudoku-X with jigsaw regions)
-
-The Google Admob library in the source code of this app has been replaced with a
-dummy library that does nothing.
-.
-
-Repo Type:git-svn
-Repo:https://sudoku-pro-android.googlecode.com/svn;trunk=trunk/Sudoku%20Free;tags=tags
-
-Build:1.1,3
- commit=13
- srclibs=MobAdMob@2d5736
- rm=libs/GoogleAdMobAdsSdk-6.2.1.jar
- prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$MobAdMob$$@' project.properties
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.1
-Current Version Code:3
diff --git a/metadata/com.app2go.sudokufree.yml b/metadata/com.app2go.sudokufree.yml
new file mode 100644
index 0000000000..7b56468a0b
--- /dev/null
+++ b/metadata/com.app2go.sudokufree.yml
@@ -0,0 +1,40 @@
+AntiFeatures:
+ - UpstreamNonFree
+Categories:
+ - Games
+License: GPL-3.0-only
+WebSite: http://www.1gravity.com
+SourceCode: https://code.google.com/p/sudoku-pro-android/source
+
+AutoName: Sudoku Free
+Summary: Numerical puzzle game
+Description: |-
+ In addition to standard sudoku puzzles it offers these variants:
+
+ * X-Sudoku
+ * Hyper-Sudoku
+ * Percent-Sudoku
+ * Color-Sudoku
+ * Squiggly Sudoku (a.k.a. Jigsaw Sudoku)
+ * ... and combinations thereof (e.g. Sudoku-X with jigsaw regions)
+
+ The Google Admob library in the source code of this app has been replaced with a
+ dummy library that does nothing.
+
+RepoType: git-svn
+Repo: https://sudoku-pro-android.googlecode.com/svn;trunk=trunk/Sudoku%20Free;tags=tags
+
+Builds:
+ - versionName: '1.1'
+ versionCode: 3
+ commit: '13'
+ srclibs:
+ - MobAdMob@2d5736
+ rm:
+ - libs/GoogleAdMobAdsSdk-6.2.1.jar
+ prebuild: sed -i 's@\(android.library.reference.1=\).*@\1$$MobAdMob$$@' project.properties
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '1.1'
+CurrentVersionCode: 3
diff --git a/metadata/com.appengine.paranoid_android.lost.txt b/metadata/com.appengine.paranoid_android.lost.txt
deleted file mode 100644
index 169ab022d0..0000000000
--- a/metadata/com.appengine.paranoid_android.lost.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Categories:Theming
-License:LGPL-3.0-only
-Web Site:
-Source Code:https://archive.softwareheritage.org/browse/origin/http://contactowner.googlecode.com/svn//directory/
-Issue Tracker:
-
-Auto Name:Contact Owner
-Summary:Contact info on lock screen
-Description:
-Contact Owner is displays your (or a friend's) contact information on the "lock
-screen" of your device, so that if you happen to lose it the finder will know
-how to contact you. Select yourself (or your friend) from your list of contacts,
-then select which information you want shown and (optionally) customize your
-message. Contact Owner is a "fire and forget" tool: once you set it up, your
-contact information will keep being displayed even after restarting your device,
-as long as the application is installed.
-.
-
-Build:2.2,12
- commit=44
- target=android-4
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:2.2
-Current Version Code:12
diff --git a/metadata/com.appengine.paranoid_android.lost.yml b/metadata/com.appengine.paranoid_android.lost.yml
new file mode 100644
index 0000000000..5576e2ae45
--- /dev/null
+++ b/metadata/com.appengine.paranoid_android.lost.yml
@@ -0,0 +1,26 @@
+Categories:
+ - Theming
+License: LGPL-3.0-only
+SourceCode: https://archive.softwareheritage.org/browse/origin/http://contactowner.googlecode.com/svn//directory/
+
+AutoName: Contact Owner
+Summary: Contact info on lock screen
+Description: |-
+ Contact Owner is displays your (or a friend's) contact information on the "lock
+ screen" of your device, so that if you happen to lose it the finder will know
+ how to contact you. Select yourself (or your friend) from your list of contacts,
+ then select which information you want shown and (optionally) customize your
+ message. Contact Owner is a "fire and forget" tool: once you set it up, your
+ contact information will keep being displayed even after restarting your device,
+ as long as the application is installed.
+
+Builds:
+ - versionName: '2.2'
+ versionCode: 12
+ commit: '44'
+ target: android-4
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '2.2'
+CurrentVersionCode: 12
diff --git a/metadata/com.appspot.usbhidterminal.txt b/metadata/com.appspot.usbhidterminal.txt
deleted file mode 100644
index c9e8f334c6..0000000000
--- a/metadata/com.appspot.usbhidterminal.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Categories:Connectivity
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/452/USBHIDTerminal
-Issue Tracker:https://github.com/452/USBHIDTerminal/issues
-
-Auto Name:USB HID Terminal
-Summary:Access USB HID devices
-Description:
-This can be used for transfer any commands or any data to your USB HID devices.
-It can receive and send bytes, hex, binary, text.
-.
-
-Repo Type:git
-Repo:https://github.com/452/USBHIDTerminal
-
-Build:1.1.1,12
- commit=7db83828d743a2d870307e1cf95e805304144c0e
- gradle=yes
-
-Maintainer Notes:
-PlayStore says Apache2: https://play.google.com/store/apps/details?id=com.appspot.usbhidterminal
-Upstream ticket: https://github.com/452/USBHIDTerminal/issues/9
-.
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest/master
-Current Version:1.1.1
-Current Version Code:12
diff --git a/metadata/com.appspot.usbhidterminal.yml b/metadata/com.appspot.usbhidterminal.yml
new file mode 100644
index 0000000000..ca60fccff8
--- /dev/null
+++ b/metadata/com.appspot.usbhidterminal.yml
@@ -0,0 +1,26 @@
+Categories:
+ - Connectivity
+License: Apache-2.0
+SourceCode: https://github.com/452/USBHIDTerminal
+IssueTracker: https://github.com/452/USBHIDTerminal/issues
+
+AutoName: USB HID Terminal
+Summary: Access USB HID devices
+Description: |-
+ This can be used for transfer any commands or any data to your USB HID devices.
+ It can receive and send bytes, hex, binary, text.
+
+RepoType: git
+Repo: https://github.com/452/USBHIDTerminal
+
+Builds:
+ - versionName: 1.1.1
+ versionCode: 12
+ commit: 7db83828d743a2d870307e1cf95e805304144c0e
+ gradle:
+ - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest/master
+CurrentVersion: 1.1.1
+CurrentVersionCode: 12
diff --git a/metadata/com.aptasystems.dicewarepasswordgenerator.txt b/metadata/com.aptasystems.dicewarepasswordgenerator.txt
deleted file mode 100644
index 27648d12ce..0000000000
--- a/metadata/com.aptasystems.dicewarepasswordgenerator.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Categories:Security
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/jeffisaak/diceware-pass-gen
-Issue Tracker:https://github.com/jeffisaak/diceware-pass-gen/issues
-Donate:https://www.jeffisaak.ca/donate
-Bitcoin:1PbHGv88KH6SXw6d66uSFTUzW2aeqxvQ7V
-
-Auto Name:Diceware Password Generator
-Summary:Generate diceware passwords
-Description:
-Generate diceware passwords using the Reinhold, EFF (long) or EFF (short)
-wordlists, using the pseudo-random number generator on your device, random.org,
-or actual dice as sources of random numbers.
-.
-
-Repo Type:git
-Repo:https://github.com/jeffisaak/diceware-pass-gen.git
-
-Build:1.7,8
- commit=v1.7
- subdir=app
- gradle=yes
- prebuild=echo 'allprojects { repositories { google() } }' >> ../build.gradle
-
-Build:1.8,9
- commit=v1.8
- subdir=app
- gradle=yes
- prebuild=echo 'allprojects { repositories { google() } }' >> ../build.gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.8
-Current Version Code:9
diff --git a/metadata/com.aptasystems.dicewarepasswordgenerator.yml b/metadata/com.aptasystems.dicewarepasswordgenerator.yml
new file mode 100644
index 0000000000..f3ead1d35b
--- /dev/null
+++ b/metadata/com.aptasystems.dicewarepasswordgenerator.yml
@@ -0,0 +1,39 @@
+Categories:
+ - Security
+License: GPL-3.0-only
+SourceCode: https://github.com/jeffisaak/diceware-pass-gen
+IssueTracker: https://github.com/jeffisaak/diceware-pass-gen/issues
+Donate: https://www.jeffisaak.ca/donate
+Bitcoin: 1PbHGv88KH6SXw6d66uSFTUzW2aeqxvQ7V
+
+AutoName: Diceware Password Generator
+Summary: Generate diceware passwords
+Description: |-
+ Generate diceware passwords using the Reinhold, EFF (long) or EFF (short)
+ wordlists, using the pseudo-random number generator on your device, random.org,
+ or actual dice as sources of random numbers.
+
+RepoType: git
+Repo: https://github.com/jeffisaak/diceware-pass-gen.git
+
+Builds:
+ - versionName: '1.7'
+ versionCode: 8
+ commit: v1.7
+ subdir: app
+ gradle:
+ - yes
+ prebuild: echo 'allprojects { repositories { google() } }' >> ../build.gradle
+
+ - versionName: '1.8'
+ versionCode: 9
+ commit: v1.8
+ subdir: app
+ gradle:
+ - yes
+ prebuild: echo 'allprojects { repositories { google() } }' >> ../build.gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.8'
+CurrentVersionCode: 9
diff --git a/metadata/com.aragaer.jtt.txt b/metadata/com.aragaer.jtt.txt
deleted file mode 100644
index 103df1dc77..0000000000
--- a/metadata/com.aragaer.jtt.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Categories:System
-License:MIT
-Web Site:https://aragaer.github.com/jtt_android
-Source Code:https://github.com/aragaer/jtt_android
-Issue Tracker:https://github.com/aragaer/jtt_android/issues
-
-Auto Name:Japanese Traditional Time
-Summary:Clock widget
-Description:
-A clock widget based on the traditional Japanese time
-[https://en.wikipedia.org/wiki/Japanese_clock#The_traditional_Japanese_time_system
-system].
-
-* Widget showing the current hour (named after an animal)
-* Mapping of traditional time to local time
-* (Eventually) Alarms based on traditional time
-
-The sunrise and sunset times for are calculated locally by the app for the
-current location; if the device doesn't know that you can enter a manual one.
-.
-
-Repo Type:git
-Repo:https://github.com/aragaer/jtt_android.git
-
-Build:1.4.4.2,24
- disable=doesn't build - hangs instead - usually caused by a submodule using git@
- commit=v1.4.4.2
- submodules=yes
-
-Build:1.4.4.5-pre,25
- disable=not published
-
-Build:1.5.2,29
- disable=still doesn't build - gradle issues now
- commit=v1.5.2
- gradle=yes
-
-Build:1.6,34
- commit=v1.6
- gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:1.6.1
-Current Version Code:35
diff --git a/metadata/com.aragaer.jtt.yml b/metadata/com.aragaer.jtt.yml
new file mode 100644
index 0000000000..e0e8b0ea94
--- /dev/null
+++ b/metadata/com.aragaer.jtt.yml
@@ -0,0 +1,52 @@
+Categories:
+ - System
+License: MIT
+WebSite: https://aragaer.github.com/jtt_android
+SourceCode: https://github.com/aragaer/jtt_android
+IssueTracker: https://github.com/aragaer/jtt_android/issues
+
+AutoName: Japanese Traditional Time
+Summary: Clock widget
+Description: |-
+ A clock widget based on the traditional Japanese time
+ [https://en.wikipedia.org/wiki/Japanese_clock#The_traditional_Japanese_time_system
+ system].
+
+ * Widget showing the current hour (named after an animal)
+ * Mapping of traditional time to local time
+ * (Eventually) Alarms based on traditional time
+
+ The sunrise and sunset times for are calculated locally by the app for the
+ current location; if the device doesn't know that you can enter a manual one.
+
+RepoType: git
+Repo: https://github.com/aragaer/jtt_android.git
+
+Builds:
+ - versionName: 1.4.4.2
+ versionCode: 24
+ disable: doesn't build - hangs instead - usually caused by a submodule using git@
+ commit: v1.4.4.2
+ submodules: true
+
+ - versionName: 1.4.4.5-pre
+ versionCode: 25
+ disable: not published
+
+ - versionName: 1.5.2
+ versionCode: 29
+ disable: still doesn't build - gradle issues now
+ commit: v1.5.2
+ gradle:
+ - yes
+
+ - versionName: '1.6'
+ versionCode: 34
+ commit: v1.6
+ gradle:
+ - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: 1.6.1
+CurrentVersionCode: 35
diff --git a/metadata/com.aripuca.tracker.txt b/metadata/com.aripuca.tracker.txt
deleted file mode 100644
index ce131d47a3..0000000000
--- a/metadata/com.aripuca.tracker.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-Disabled:Depends on non-functional maps API
-Categories:Navigation
-License:Apache-2.0
-Web Site:http://tracker.aripuca.com/blog/
-Source Code:https://code.google.com/p/aripuca-tracker/source
-Issue Tracker:
-
-Auto Name:Aripuca GPS Tracker
-Summary:GPS tracking
-Description:
-Record tracks, save waypoints, use compass, import/export data to many formats
-and much more!
-
-'''N.B.''' The app can now (since v1.3.0) be installed without needing Google
-Maps but attempting the view the track on the map would crash the app. The track
-still can't be viewed within the app because an API key for Google Maps is
-missing. You can still use another app that supports OpenStreetMap and gpx files
-to view it though, such as [[com.robert.maps]] or
-[[nl.sogeti.android.gpstracker]].
-.
-
-Repo Type:hg
-Repo:https://code.google.com/p/aripuca-tracker
-
-Build:1.2.3,18
- commit=da67eb2d1d6e
- target=Google Inc.:Google APIs:10
-
-Build:1.2.4,19
- commit=v. 1.2.4
- target=Google Inc.:Google APIs:10
-
-Build:1.3.0,20
- commit=v.1.3.0
- prebuild=sed -i 's///g' AndroidManifest.xml
- target=Google Inc.:Google APIs:16
-
-Build:1.3.2,22
- commit=v.1.3.2
- prebuild=sed -i 's/android:required=\"true\"/android:required=\"false\"/g' AndroidManifest.xml
- target=Google Inc.:Google APIs:16
-
-Build:1.3.4,24
- commit=v.1.3.4
- prebuild=sed -i 's/android:required=\"true\"/android:required=\"false\"/g' AndroidManifest.xml
- target=Google Inc.:Google APIs:16
-
-Build:1.3.6,26
- commit=v.1.3.6
- prebuild=sed -i 's/android:required=\"true\"/android:required=\"false\"/g' AndroidManifest.xml
- target=Google Inc.:Google APIs:17
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.3.7
-Current Version Code:27
diff --git a/metadata/com.aripuca.tracker.yml b/metadata/com.aripuca.tracker.yml
new file mode 100644
index 0000000000..61241bdb6a
--- /dev/null
+++ b/metadata/com.aripuca.tracker.yml
@@ -0,0 +1,63 @@
+Disabled: Depends on non-functional maps API
+Categories:
+ - Navigation
+License: Apache-2.0
+WebSite: http://tracker.aripuca.com/blog/
+SourceCode: https://code.google.com/p/aripuca-tracker/source
+
+AutoName: Aripuca GPS Tracker
+Summary: GPS tracking
+Description: |-
+ Record tracks, save waypoints, use compass, import/export data to many formats
+ and much more!
+
+ '''N.B.''' The app can now (since v1.3.0) be installed without needing Google
+ Maps but attempting the view the track on the map would crash the app. The track
+ still can't be viewed within the app because an API key for Google Maps is
+ missing. You can still use another app that supports OpenStreetMap and gpx files
+ to view it though, such as [[com.robert.maps]] or
+ [[nl.sogeti.android.gpstracker]].
+
+RepoType: hg
+Repo: https://code.google.com/p/aripuca-tracker
+
+Builds:
+ - versionName: 1.2.3
+ versionCode: 18
+ commit: da67eb2d1d6e
+ target: Google Inc.:Google APIs:10
+
+ - versionName: 1.2.4
+ versionCode: 19
+ commit: v. 1.2.4
+ target: Google Inc.:Google APIs:10
+
+ - versionName: 1.3.0
+ versionCode: 20
+ commit: v.1.3.0
+ prebuild: sed -i 's///g' AndroidManifest.xml
+ target: Google Inc.:Google APIs:16
+
+ - versionName: 1.3.2
+ versionCode: 22
+ commit: v.1.3.2
+ prebuild: sed -i 's/android:required=\"true\"/android:required=\"false\"/g' AndroidManifest.xml
+ target: Google Inc.:Google APIs:16
+
+ - versionName: 1.3.4
+ versionCode: 24
+ commit: v.1.3.4
+ prebuild: sed -i 's/android:required=\"true\"/android:required=\"false\"/g' AndroidManifest.xml
+ target: Google Inc.:Google APIs:16
+
+ - versionName: 1.3.6
+ versionCode: 26
+ commit: v.1.3.6
+ prebuild: sed -i 's/android:required=\"true\"/android:required=\"false\"/g' AndroidManifest.xml
+ target: Google Inc.:Google APIs:17
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: 1.3.7
+CurrentVersionCode: 27
diff --git a/metadata/com.ariwilson.seismowallpaper.txt b/metadata/com.ariwilson.seismowallpaper.txt
deleted file mode 100644
index e9daa5d932..0000000000
--- a/metadata/com.ariwilson.seismowallpaper.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Categories:Theming
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/evilrobot69/code
-Issue Tracker:https://github.com/evilrobot69/code/issues
-
-Auto Name:Seismo Wallpaper
-Summary:Live wallpaper
-Description:
-A live wallpaper that measures anything that vibrates, shakes or moves. Seismo
-Wallpaper uses your device’s accelerometer to measure movements on any axis
-with/without noise.
-.
-
-Repo Type:git
-Repo:https://github.com/evilrobot69/code
-
-Build:1.02,2
- commit=SeismoWallpaper_1.02
- subdir=SeismoWallpaper
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:1.01
-Current Version Code:2
diff --git a/metadata/com.ariwilson.seismowallpaper.yml b/metadata/com.ariwilson.seismowallpaper.yml
new file mode 100644
index 0000000000..e4f29e8da4
--- /dev/null
+++ b/metadata/com.ariwilson.seismowallpaper.yml
@@ -0,0 +1,26 @@
+Categories:
+ - Theming
+License: GPL-3.0-only
+SourceCode: https://github.com/evilrobot69/code
+IssueTracker: https://github.com/evilrobot69/code/issues
+
+AutoName: Seismo Wallpaper
+Summary: Live wallpaper
+Description: |-
+ A live wallpaper that measures anything that vibrates, shakes or moves. Seismo
+ Wallpaper uses your device’s accelerometer to measure movements on any axis
+ with/without noise.
+
+RepoType: git
+Repo: https://github.com/evilrobot69/code
+
+Builds:
+ - versionName: '1.02'
+ versionCode: 2
+ commit: SeismoWallpaper_1.02
+ subdir: SeismoWallpaper
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: '1.01'
+CurrentVersionCode: 2
diff --git a/metadata/com.arnaud.metronome.txt b/metadata/com.arnaud.metronome.txt
deleted file mode 100644
index d1893c41e8..0000000000
--- a/metadata/com.arnaud.metronome.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:
-Source Code:https://gitlab.com/funkygoby/metronome
-Issue Tracker:https://gitlab.com/funkygoby/metronome/issues
-Changelog:https://gitlab.com/funkygoby/metronome/blob/HEAD/CHANGELOG
-
-Auto Name:Metronome
-Summary:A light and reliable metronome
-Description:
-A reliable metronome for Android with large BPM capabilities, able to follow a
-user-defined structure, polyrhythms and random mute. With generated or native
-sounds.
-
-'''Features:'''
-
-* BPM ranging from ~ 0.2 to ~ 120000 (depends on phone)
-* management of non-integer (comma) measures
-* a regular click. If your phone can play an audio file without flinching then this metronome will be regular
-* possibility to write a complex structure (changes of metrics, equivalences, claves)
-* polyrhythms
-* random mute
-.
-
-Repo Type:git
-Repo:https://gitlab.com/funkygoby/metronome.git
-
-Build:1.0,1
- commit=1d7a71df9386c1eeefa1aa85b3c6f1c881800051
- scanignore=res/raw/*
-
-Build:1.0.1,2
- commit=ba9c516c3e84e7510b422cc2d6950fbda54abad1
- scanignore=res/raw/*
-
-Build:1.1.0,3
- commit=fdf1fd01ad1909e2a29a47d879a729032549da58
- scanignore=res/raw/*
-
-Build:1.1.2,5
- commit=4c855a71e647726df86e332ebda2179510141298
- scanignore=res/raw/*
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.1.3
-Current Version Code:6
diff --git a/metadata/com.arnaud.metronome.yml b/metadata/com.arnaud.metronome.yml
new file mode 100644
index 0000000000..ef48360697
--- /dev/null
+++ b/metadata/com.arnaud.metronome.yml
@@ -0,0 +1,55 @@
+Categories:
+ - Multimedia
+License: GPL-3.0-only
+SourceCode: https://gitlab.com/funkygoby/metronome
+IssueTracker: https://gitlab.com/funkygoby/metronome/issues
+Changelog: https://gitlab.com/funkygoby/metronome/blob/HEAD/CHANGELOG
+
+AutoName: Metronome
+Summary: A light and reliable metronome
+Description: |-
+ A reliable metronome for Android with large BPM capabilities, able to follow a
+ user-defined structure, polyrhythms and random mute. With generated or native
+ sounds.
+
+ '''Features:'''
+
+ * BPM ranging from ~ 0.2 to ~ 120000 (depends on phone)
+ * management of non-integer (comma) measures
+ * a regular click. If your phone can play an audio file without flinching then this metronome will be regular
+ * possibility to write a complex structure (changes of metrics, equivalences, claves)
+ * polyrhythms
+ * random mute
+
+RepoType: git
+Repo: https://gitlab.com/funkygoby/metronome.git
+
+Builds:
+ - versionName: '1.0'
+ versionCode: 1
+ commit: 1d7a71df9386c1eeefa1aa85b3c6f1c881800051
+ scanignore:
+ - res/raw/*
+
+ - versionName: 1.0.1
+ versionCode: 2
+ commit: ba9c516c3e84e7510b422cc2d6950fbda54abad1
+ scanignore:
+ - res/raw/*
+
+ - versionName: 1.1.0
+ versionCode: 3
+ commit: fdf1fd01ad1909e2a29a47d879a729032549da58
+ scanignore:
+ - res/raw/*
+
+ - versionName: 1.1.2
+ versionCode: 5
+ commit: 4c855a71e647726df86e332ebda2179510141298
+ scanignore:
+ - res/raw/*
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 1.1.3
+CurrentVersionCode: 6
diff --git a/metadata/com.artifex.mupdf.mini.txt b/metadata/com.artifex.mupdf.mini.txt
deleted file mode 100644
index b200577642..0000000000
--- a/metadata/com.artifex.mupdf.mini.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-AntiFeatures:KnownVuln
-Categories:Reading
-License:AGPL-3.0-or-later
-Web Site:https://mupdf.com
-Source Code:https://git.ghostscript.com/?p=mupdf-android-viewer-mini.git;a=summary
-Issue Tracker:https://bugs.ghostscript.com
-Changelog:https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=HEAD
-
-Auto Name:MuPDF mini
-Summary:Extra simple document viewer
-Description:
-Deprecated in favor of [[com.artifex.mupdf.viewer.app]].
-
-1.11 has multiple vulnerabilities:
-
-* https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-15587
-* https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14687
-* https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14686
-* https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14685
-
-The mini version of [[com.artifex.mupdfdemo]] is designed to be an extra simple
-document viewer with no frills.
-
-It supports the following file formats: PDF, XPS, CBZ, unprotected EPUB, and
-FB2.
-.
-
-Repo Type:git
-Repo:https://git.ghostscript.com/mupdf-android-viewer-mini.git
-
-Build:1.11,111
- commit=1.11
- submodules=yes
- output=bin/MuPDF mini-release-unsigned.apk
- forceversion=yes
- forcevercode=yes
- rm=libmupdf/thirdparty/curl/tests
- build=make release APP_ABI=armeabi-v7a
- ndk=r14b
-
-Build:1.11,112
- commit=1.11
- submodules=yes
- output=bin/MuPDF mini-release-unsigned.apk
- forceversion=yes
- forcevercode=yes
- rm=libmupdf/thirdparty/curl/tests
- build=make release APP_ABI=x86
- ndk=r14b
-
-Maintainer Notes:
-There's 1.12.0 tag in Git, but that's a different app with a different app ID.
-
-The version code "bears no resemblance to the version name", however it
-follows this pattern:
-* MINOR + "1" for armeabi-v7a
-* MINOR + "2" for x86
-E.g. MuPDF mini 1.11 for x86 has version code 112 ("11" + "2").
-
-Documents:
-* https://www.mupdf.com/docs/how-to-build-mupdf-for-android
-* https://mupdf.com/downloads/
-* https://twiki.ghostscript.com/do/view/MuPDF/AndroidReleases
-.
-
-Archive Policy:0 versions
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.11
-Current Version Code:112
diff --git a/metadata/com.artifex.mupdf.mini.yml b/metadata/com.artifex.mupdf.mini.yml
new file mode 100644
index 0000000000..3a4e3e3ff3
--- /dev/null
+++ b/metadata/com.artifex.mupdf.mini.yml
@@ -0,0 +1,75 @@
+AntiFeatures:
+ - KnownVuln
+Categories:
+ - Reading
+License: AGPL-3.0-or-later
+WebSite: https://mupdf.com
+SourceCode: https://git.ghostscript.com/?p=mupdf-android-viewer-mini.git;a=summary
+IssueTracker: https://bugs.ghostscript.com
+Changelog: https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=HEAD
+
+AutoName: MuPDF mini
+Summary: Extra simple document viewer
+Description: |-
+ Deprecated in favor of [[com.artifex.mupdf.viewer.app]].
+
+ 1.11 has multiple vulnerabilities:
+
+ * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-15587
+ * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14687
+ * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14686
+ * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14685
+
+ The mini version of [[com.artifex.mupdfdemo]] is designed to be an extra simple
+ document viewer with no frills.
+
+ It supports the following file formats: PDF, XPS, CBZ, unprotected EPUB, and
+ FB2.
+
+RepoType: git
+Repo: https://git.ghostscript.com/mupdf-android-viewer-mini.git
+
+Builds:
+ - versionName: '1.11'
+ versionCode: 111
+ commit: '1.11'
+ submodules: true
+ output: bin/MuPDF mini-release-unsigned.apk
+ forceversion: true
+ forcevercode: true
+ rm:
+ - libmupdf/thirdparty/curl/tests
+ build: make release APP_ABI=armeabi-v7a
+ ndk: r14b
+
+ - versionName: '1.11'
+ versionCode: 112
+ commit: '1.11'
+ submodules: true
+ output: bin/MuPDF mini-release-unsigned.apk
+ forceversion: true
+ forcevercode: true
+ rm:
+ - libmupdf/thirdparty/curl/tests
+ build: make release APP_ABI=x86
+ ndk: r14b
+
+MaintainerNotes: |-
+ There's 1.12.0 tag in Git, but that's a different app with a different app ID.
+
+ The version code "bears no resemblance to the version name", however it
+ follows this pattern:
+ * MINOR + "1" for armeabi-v7a
+ * MINOR + "2" for x86
+ E.g. MuPDF mini 1.11 for x86 has version code 112 ("11" + "2").
+
+ Documents:
+ * https://www.mupdf.com/docs/how-to-build-mupdf-for-android
+ * https://mupdf.com/downloads/
+ * https://twiki.ghostscript.com/do/view/MuPDF/AndroidReleases
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: '1.11'
+CurrentVersionCode: 112