Merge branch 'txt2yaml' into 'master'

Metadata YAMLification See merge request fdroid/fdroiddata!5582
2019-09-30 07:31:43 +00:00 · 2019-09-30 07:31:43 +00:00 · 6df98dc07e
parent 8ce114e75f f9224193fc
commit 6df98dc07e
12 changed files with 837 additions and 608 deletions
--- a/metadata/org.openbmap.txt
+++ b/metadata/org.openbmap.txt
@ -1,145 +0,0 @@
-Categories:Connectivity
-License:AGPL-3.0-only
-Web Site:http://openbmap.org
-Source Code:https://github.com/openbmap/radiocells-scanner-android
-Issue Tracker:https://github.com/openbmap/radiocells-scanner-android/issues
-
-Auto Name:RadioBeacon
-Summary:Contribute to coverage maps
-Description:
-Map wireless networks and cell towers for the [http://openbmap.org openbmap.org]
-database.
-
-openBmap is a free and open wifi and cells database. The website offers a
-coverage maps of wifis and cells. Collected data can be downloaded from the
-website and used for many purposes, such as determining your own location
-without GPS or creating network coverage maps.
-
-Status: Testing
-.
-
-Repo Type:git
-Repo:https://github.com/openbmap/radiocells-scanner-android
-
-Build:1.0,1
-    disable=wrongly versioned (was fe1f5fe76b)
-    commit=unknown - see disabled
-
-Build:0.7.1,2
-    commit=858b0d926c14
-    subdir=android
-    init=rm -rf bin/ && \
-        sed -i '/proguard/d' project.properties
-    srclibs=Mapsforge@0f71a427bd50
-    build=$$MVN3$$ clean package -DskipTests -f $$Mapsforge$$/pom.xml && \
-        mv $$Mapsforge$$/mapsforge-map/target/mapsforge-map-0.3.1-SNAPSHOT-jar-with-dependencies.jar libs/
-
-Build:0.7.6,5
-    commit=v0.7.6
-    subdir=android
-    prebuild=sed -i '/proguard/d' project.properties
-
-Build:0.7.7,6
-    commit=v0.7.7
-    subdir=android
-    prebuild=sed -i '/proguard/d' project.properties
-
-Build:0.7.8,7
-    commit=v0.7.8
-    subdir=android
-    prebuild=sed -i '/proguard/d' project.properties
-
-Build:0.7.9,8
-    commit=v0.8.0
-    subdir=android
-    patch=openbmap-gradle.patch
-    gradle=yes
-    rm=android/libs/*jar
-
-Build:0.8.3,11
-    commit=v0.8.3
-    subdir=android
-    patch=openbmap-gradle.patch
-    gradle=yes
-    rm=android/libs/*jar
-    prebuild=sed -i -e 's/0.4.3/0.5.0-rc1/g' -e '/svg-android/d' build.gradle
-
-Build:0.8.4,12
-    commit=v0.8.4
-    subdir=android
-    patch=openbmap-gradle.patch
-    gradle=yes
-    rm=android/libs/*jar
-    prebuild=sed -i -e 's/0.4.3/0.5.0-rc1/g' -e '/svg-android/d' build.gradle
-
-Build:0.8.5,13
-    disable=res issues
-    commit=6065846cbfcb
-    subdir=android/app
-    gradle=yes
-    rm=android/app/libs/*.jar
-    prebuild=sed -i -e '/jar/d' -e 's/minSdkVersion 8/minSdkVersion 9/g' -e '/support-v4/acompile "com.caverock:androidsvg:1.2.1"\ncompile "org.apache.commons:commons-lang3:3.4"\ncompile "org.apache.httpcomponents:httpmime:4.2.3"\ncompile "com.jjoe64:graphview:3.1.3"\ncompile "org.mapsforge:mapsforge-core:0.5.1"\ncompile "org.mapsforge:mapsforge-map:0.5.1"\ncompile "org.mapsforge:mapsforge-map-reader:0.5.1"\ncompile "org.mapsforge:mapsforge-map-android:0.5.1"' build.gradle && \
-        rm ../local.properties
-
-Build:0.8.6,14
-    disable=res issues
-    commit=v0.8.6
-    subdir=android/app
-    gradle=yes
-    rm=android/app/libs/*.jar
-    prebuild=sed -i -e '/jar/d' -e 's/minSdkVersion 8/minSdkVersion 9/g' -e '/support-v4/acompile "com.caverock:androidsvg:1.2.1"\ncompile "org.apache.commons:commons-lang3:3.4"\ncompile "org.apache.httpcomponents:httpmime:4.2.3"\ncompile "com.jjoe64:graphview:3.1.3"\ncompile "org.mapsforge:mapsforge-core:0.5.1"\ncompile "org.mapsforge:mapsforge-map:0.5.1"\ncompile "org.mapsforge:mapsforge-map-reader:0.5.1"\ncompile "org.mapsforge:mapsforge-map-android:0.5.1"' build.gradle && \
-        rm ../local.properties
-
-Build:0.8.7,15
-    disable=res/R issues
-    commit=bf16f5d07f2f
-    subdir=android/app
-    gradle=yes
-    rm=android/app/libs/*.jar
-    prebuild=sed -i -e 's/minSdkVersion 8/minSdkVersion 9/g' build.gradle && \
-        rm ../local.properties
-
-Build:0.8.8,16
-    commit=v0.8.8
-    subdir=android/app
-    gradle=yes
-
-Build:0.8.9,17
-    disable=untrusted repo
-    commit=v0.8.9
-    subdir=android/app
-    gradle=yes
-
-Build:0.8.10,18
-    disable=java compilation fails
-    commit=v0.8.10
-    subdir=android/app
-    gradle=yes
-
-Build:0.8.11,19
-    disable=java compilation fails
-    commit=v0.8.11
-    subdir=android/app
-    gradle=yes
-
-Build:0.8.13,22
-    commit=v0.8.13
-    subdir=android/app
-    gradle=yes
-    prebuild=sed -i -e '/MissingTranslation/adisable "ExtraTranslation"\n' build.gradle
-
-Build:0.8.15,24
-    commit=v0.8.15
-    subdir=android/app
-    gradle=yes
-
-Build:0.8.18,27
-    commit=v0.8.18
-    subdir=android/app
-    gradle=yes
-    prebuild=sed -i -e '/MissingTranslation/adisable "ExtraTranslation"\n' build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.8.18
-Current Version Code:27
--- a/metadata/org.openbmap.unifiedNlp.txt
+++ b/metadata/org.openbmap.unifiedNlp.txt
@ -1,125 +0,0 @@
-Categories:Navigation
-License:AGPL-3.0-only
-Web Site:http://www.radiocells.org
-Source Code:https://github.com/openbmap/radiocells-nlp-android
-Issue Tracker:https://github.com/openbmap/radiocells-nlp-android/issues
-Changelog:https://github.com/openbmap/radiocells-nlp-android#history
-
-Name:Radiocells.org UnifiedNlp Backend
-Auto Name:org.openbmap.unifiedNlpProvider
-Summary:UnifiedNlp location provider (Radiocells.org)
-Description:
-[[com.google.android.gms]] wifi/cell geolocation backend that uses
-[https://radiocells.org Radiocells.org] database for geolocation.
-
-Location can be retrieved either online or completely offline if a local
-database is already present.
-
-[[org.openbmap]] can be used to gather wifi and cell information.
-.
-
-Repo Type:git
-Repo:https://github.com/openbmap/radiocells-nlp-android
-
-Build:0.1.0,2
-    commit=c984820080fafe7b703c1c8c87e8dc5c5ade6692
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.1.1,3
-    commit=v0.1.1
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.1.2,4
-    commit=v0.1.2
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.1.3,5
-    commit=v0.1.3
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.1.4,6
-    commit=v0.1.4
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.1.5,7
-    disable=broken
-    commit=v0.1.5
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.1.6,8
-    commit=v0.1.6
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.1.8,9
-    commit=v0.1.8
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.1.11,12
-    commit=v0.1.11
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.2.2,14
-    commit=v0.2.2
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.2.3,15
-    commit=v0.2.3
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.2.5,17
-    disable=old failing build
-    commit=v0.2.5
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.2.6,18
-    commit=v0.2.6
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.2.7,19
-    commit=v0.2.7
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.2.8,20
-    commit=v0.2.8
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Build:0.2.9,21
-    commit=v0.2.9
-    submodules=yes
-    gradle=yes
-    rm=libs/*
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.2.9
-Current Version Code:21
--- a/metadata/org.openbmap.unifiedNlp.yml
+++ b/metadata/org.openbmap.unifiedNlp.yml
@ -0,0 +1,174 @@
+Categories:
+  - Navigation
+License: AGPL-3.0-only
+WebSite: http://www.radiocells.org
+SourceCode: https://github.com/openbmap/radiocells-nlp-android
+IssueTracker: https://github.com/openbmap/radiocells-nlp-android/issues
+Changelog: https://github.com/openbmap/radiocells-nlp-android#history
+
+Name: Radiocells.org UnifiedNlp Backend
+AutoName: org.openbmap.unifiedNlpProvider
+Summary: UnifiedNlp location provider (Radiocells.org)
+Description: |-
+    [[com.google.android.gms]] wifi/cell geolocation backend that uses
+    [https://radiocells.org Radiocells.org] database for geolocation.
+
+    Location can be retrieved either online or completely offline if a local
+    database is already present.
+
+    [[org.openbmap]] can be used to gather wifi and cell information.
+
+RepoType: git
+Repo: https://github.com/openbmap/radiocells-nlp-android
+
+Builds:
+  - versionName: 0.1.0
+    versionCode: 2
+    commit: c984820080fafe7b703c1c8c87e8dc5c5ade6692
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.1.1
+    versionCode: 3
+    commit: v0.1.1
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.1.2
+    versionCode: 4
+    commit: v0.1.2
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.1.3
+    versionCode: 5
+    commit: v0.1.3
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.1.4
+    versionCode: 6
+    commit: v0.1.4
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.1.5
+    versionCode: 7
+    disable: broken
+    commit: v0.1.5
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.1.6
+    versionCode: 8
+    commit: v0.1.6
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.1.8
+    versionCode: 9
+    commit: v0.1.8
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.1.11
+    versionCode: 12
+    commit: v0.1.11
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.2.2
+    versionCode: 14
+    commit: v0.2.2
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.2.3
+    versionCode: 15
+    commit: v0.2.3
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.2.5
+    versionCode: 17
+    disable: old failing build
+    commit: v0.2.5
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.2.6
+    versionCode: 18
+    commit: v0.2.6
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.2.7
+    versionCode: 19
+    commit: v0.2.7
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.2.8
+    versionCode: 20
+    commit: v0.2.8
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+  - versionName: 0.2.9
+    versionCode: 21
+    commit: v0.2.9
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - libs/*
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.2.9
+CurrentVersionCode: 21
--- a/metadata/org.openbmap.yml
+++ b/metadata/org.openbmap.yml
@ -0,0 +1,203 @@
+Categories:
+  - Connectivity
+License: AGPL-3.0-only
+WebSite: http://openbmap.org
+SourceCode: https://github.com/openbmap/radiocells-scanner-android
+IssueTracker: https://github.com/openbmap/radiocells-scanner-android/issues
+
+AutoName: RadioBeacon
+Summary: Contribute to coverage maps
+Description: |-
+    Map wireless networks and cell towers for the [http://openbmap.org openbmap.org]
+    database.
+
+    openBmap is a free and open wifi and cells database. The website offers a
+    coverage maps of wifis and cells. Collected data can be downloaded from the
+    website and used for many purposes, such as determining your own location
+    without GPS or creating network coverage maps.
+
+    Status: Testing
+
+RepoType: git
+Repo: https://github.com/openbmap/radiocells-scanner-android
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    disable: wrongly versioned (was fe1f5fe76b)
+    commit: unknown - see disabled
+
+  - versionName: 0.7.1
+    versionCode: 2
+    commit: 858b0d926c14
+    subdir: android
+    init:
+      - rm -rf bin/
+      - sed -i '/proguard/d' project.properties
+    srclibs:
+      - Mapsforge@0f71a427bd50
+    build:
+      - $$MVN3$$ clean package -DskipTests -f $$Mapsforge$$/pom.xml
+      - mv $$Mapsforge$$/mapsforge-map/target/mapsforge-map-0.3.1-SNAPSHOT-jar-with-dependencies.jar
+        libs/
+
+  - versionName: 0.7.6
+    versionCode: 5
+    commit: v0.7.6
+    subdir: android
+    prebuild: sed -i '/proguard/d' project.properties
+
+  - versionName: 0.7.7
+    versionCode: 6
+    commit: v0.7.7
+    subdir: android
+    prebuild: sed -i '/proguard/d' project.properties
+
+  - versionName: 0.7.8
+    versionCode: 7
+    commit: v0.7.8
+    subdir: android
+    prebuild: sed -i '/proguard/d' project.properties
+
+  - versionName: 0.7.9
+    versionCode: 8
+    commit: v0.8.0
+    subdir: android
+    patch:
+      - openbmap-gradle.patch
+    gradle:
+      - yes
+    rm:
+      - android/libs/*jar
+
+  - versionName: 0.8.3
+    versionCode: 11
+    commit: v0.8.3
+    subdir: android
+    patch:
+      - openbmap-gradle.patch
+    gradle:
+      - yes
+    rm:
+      - android/libs/*jar
+    prebuild: sed -i -e 's/0.4.3/0.5.0-rc1/g' -e '/svg-android/d' build.gradle
+
+  - versionName: 0.8.4
+    versionCode: 12
+    commit: v0.8.4
+    subdir: android
+    patch:
+      - openbmap-gradle.patch
+    gradle:
+      - yes
+    rm:
+      - android/libs/*jar
+    prebuild: sed -i -e 's/0.4.3/0.5.0-rc1/g' -e '/svg-android/d' build.gradle
+
+  - versionName: 0.8.5
+    versionCode: 13
+    disable: res issues
+    commit: 6065846cbfcb
+    subdir: android/app
+    gradle:
+      - yes
+    rm:
+      - android/app/libs/*.jar
+    prebuild:
+      - sed -i -e '/jar/d' -e 's/minSdkVersion 8/minSdkVersion 9/g' -e '/support-v4/acompile
+        "com.caverock:androidsvg:1.2.1"\ncompile "org.apache.commons:commons-lang3:3.4"\ncompile
+        "org.apache.httpcomponents:httpmime:4.2.3"\ncompile "com.jjoe64:graphview:3.1.3"\ncompile
+        "org.mapsforge:mapsforge-core:0.5.1"\ncompile "org.mapsforge:mapsforge-map:0.5.1"\ncompile
+        "org.mapsforge:mapsforge-map-reader:0.5.1"\ncompile "org.mapsforge:mapsforge-map-android:0.5.1"'
+        build.gradle
+      - rm ../local.properties
+
+  - versionName: 0.8.6
+    versionCode: 14
+    disable: res issues
+    commit: v0.8.6
+    subdir: android/app
+    gradle:
+      - yes
+    rm:
+      - android/app/libs/*.jar
+    prebuild:
+      - sed -i -e '/jar/d' -e 's/minSdkVersion 8/minSdkVersion 9/g' -e '/support-v4/acompile
+        "com.caverock:androidsvg:1.2.1"\ncompile "org.apache.commons:commons-lang3:3.4"\ncompile
+        "org.apache.httpcomponents:httpmime:4.2.3"\ncompile "com.jjoe64:graphview:3.1.3"\ncompile
+        "org.mapsforge:mapsforge-core:0.5.1"\ncompile "org.mapsforge:mapsforge-map:0.5.1"\ncompile
+        "org.mapsforge:mapsforge-map-reader:0.5.1"\ncompile "org.mapsforge:mapsforge-map-android:0.5.1"'
+        build.gradle
+      - rm ../local.properties
+
+  - versionName: 0.8.7
+    versionCode: 15
+    disable: res/R issues
+    commit: bf16f5d07f2f
+    subdir: android/app
+    gradle:
+      - yes
+    rm:
+      - android/app/libs/*.jar
+    prebuild:
+      - sed -i -e 's/minSdkVersion 8/minSdkVersion 9/g' build.gradle
+      - rm ../local.properties
+
+  - versionName: 0.8.8
+    versionCode: 16
+    commit: v0.8.8
+    subdir: android/app
+    gradle:
+      - yes
+
+  - versionName: 0.8.9
+    versionCode: 17
+    disable: untrusted repo
+    commit: v0.8.9
+    subdir: android/app
+    gradle:
+      - yes
+
+  - versionName: 0.8.10
+    versionCode: 18
+    disable: java compilation fails
+    commit: v0.8.10
+    subdir: android/app
+    gradle:
+      - yes
+
+  - versionName: 0.8.11
+    versionCode: 19
+    disable: java compilation fails
+    commit: v0.8.11
+    subdir: android/app
+    gradle:
+      - yes
+
+  - versionName: 0.8.13
+    versionCode: 22
+    commit: v0.8.13
+    subdir: android/app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/MissingTranslation/adisable "ExtraTranslation"\n' build.gradle
+
+  - versionName: 0.8.15
+    versionCode: 24
+    commit: v0.8.15
+    subdir: android/app
+    gradle:
+      - yes
+
+  - versionName: 0.8.18
+    versionCode: 27
+    commit: v0.8.18
+    subdir: android/app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/MissingTranslation/adisable "ExtraTranslation"\n' build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 0.8.18
+CurrentVersionCode: 27
--- a/metadata/org.opengappsdownloader.txt
+++ b/metadata/org.opengappsdownloader.txt
@ -1,73 +0,0 @@
-AntiFeatures:NonFreeAdd
-Categories:Internet
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/daktak/opengapps_downloader
-Issue Tracker:https://github.com/daktak/opengapps_downloader/issues
-Changelog:https://github.com/daktak/opengapps_downloader/releases
-Bitcoin:16VEzu37BePgR3o9hAciZkGK2VCAQFE28r
-
-Auto Name:OpenGApps Downloader
-Summary:Download OpenGapps zip
-Description:
-App to auto download opengapps zip files from github. You can select your
-prefered variant through settings.
-.
-
-Repo Type:git
-Repo:https://github.com/daktak/opengapps_downloader
-
-Build:0.1,1
-    commit=v0.1
-    subdir=app
-    gradle=yes
-
-Build:0.2,3
-    commit=v0.2
-    subdir=app
-    gradle=yes
-
-Build:0.3,5
-    commit=v0.3
-    subdir=app
-    gradle=yes
-
-Build:0.4,6
-    commit=v0.4
-    subdir=app
-    gradle=yes
-
-Build:0.4.1,7
-    commit=v0.4.1
-    subdir=app
-    gradle=yes
-
-Build:0.4.2,8
-    commit=v0.4.2
-    subdir=app
-    gradle=yes
-
-Build:0.4.3,9
-    commit=v0.4.3
-    subdir=app
-    gradle=yes
-
-Build:0.4.4,10
-    commit=v0.4.4
-    subdir=app
-    gradle=yes
-
-Build:0.4.5,11
-    commit=v0.4.5
-    subdir=app
-    gradle=yes
-
-Build:0.4.6,12
-    commit=v0.4.6
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.4.6
-Current Version Code:12
--- a/metadata/org.opengappsdownloader.yml
+++ b/metadata/org.opengappsdownloader.yml
@ -0,0 +1,94 @@
+AntiFeatures:
+  - NonFreeAdd
+Categories:
+  - Internet
+License: GPL-3.0-only
+SourceCode: https://github.com/daktak/opengapps_downloader
+IssueTracker: https://github.com/daktak/opengapps_downloader/issues
+Changelog: https://github.com/daktak/opengapps_downloader/releases
+Bitcoin: 16VEzu37BePgR3o9hAciZkGK2VCAQFE28r
+
+AutoName: OpenGApps Downloader
+Summary: Download OpenGapps zip
+Description: |-
+    App to auto download opengapps zip files from github. You can select your
+    prefered variant through settings.
+
+RepoType: git
+Repo: https://github.com/daktak/opengapps_downloader
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 1
+    commit: v0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.2'
+    versionCode: 3
+    commit: v0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.3'
+    versionCode: 5
+    commit: v0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.4'
+    versionCode: 6
+    commit: v0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.4.1
+    versionCode: 7
+    commit: v0.4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.4.2
+    versionCode: 8
+    commit: v0.4.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.4.3
+    versionCode: 9
+    commit: v0.4.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.4.4
+    versionCode: 10
+    commit: v0.4.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.4.5
+    versionCode: 11
+    commit: v0.4.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.4.6
+    versionCode: 12
+    commit: v0.4.6
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.4.6
+CurrentVersionCode: 12
--- a/metadata/org.openhab.habdroid.txt
+++ b/metadata/org.openhab.habdroid.txt
@ -1,90 +0,0 @@
-Categories:Internet
-License:EPL-1.0
-Author Name:openHAB Foundation
-Author Email:apps@openhabfoundation.org
-Web Site:https://www.openhab.org/
-Source Code:https://github.com/openhab/openhab-android
-Issue Tracker:https://github.com/openhab/openhab-android/issues
-Translation:https://crowdin.com/project/openhab-android
-Changelog:https://github.com/openhab/openhab-android/releases
-Donate:https://www.paypal.me/openHABFoundation
-
-Auto Name:openHAB
-
-Repo Type:git
-Repo:https://github.com/openhab/openhab-android.git
-
-Build:2.0.27,30
-    commit=2.0.27-release-fdroid
-    subdir=mobile
-    gradle=foss
-    prebuild=sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle
-
-Build:2.0.31,34
-    commit=2.0.31-release-fdroid
-    subdir=mobile
-    gradle=foss,stable
-    prebuild=sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle
-
-Build:2.1.0,50
-    commit=2.1.0-release-fdroid
-    subdir=mobile
-    gradle=foss,stable
-    prebuild=sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle
-
-Build:2.2.0,59
-    commit=2.2.0-release-fdroid
-    subdir=mobile
-    gradle=foss,stable
-    prebuild=sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle
-
-Build:2.3.0,82
-    commit=2.3.0-release-fdroid
-    subdir=mobile
-    gradle=foss,stable
-    prebuild=sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle
-
-Build:2.4.0,91
-    commit=2.4.0-release-fdroid
-    subdir=mobile
-    gradle=foss,stable
-    prebuild=sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle
-
-Build:2.5.0,95
-    commit=2.5.0-release-fdroid
-    subdir=mobile
-    gradle=foss,stable
-    prebuild=sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle
-
-Build:2.6.0,114
-    commit=2.6.0-release-fdroid
-    subdir=mobile
-    gradle=foss,stable
-    prebuild=sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle
-
-Build:2.6.9,123
-    commit=2.6.9-release-fdroid
-    subdir=mobile
-    gradle=foss,stable
-    prebuild=sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle
-
-Build:2.7.0,140
-    commit=2.7.0-release-fdroid
-    subdir=mobile
-    gradle=foss,stable
-    prebuild=sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle
-
-Build:2.8.0,158
-    commit=2.8.0-release-fdroid
-    subdir=mobile
-    gradle=foss,stable
-    prebuild=sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle
-
-Maintainer Notes:
-Replace the fabric.io maven with mavencentral instead of deleting it to not trigger fdroid/fdroidserver#463.
-.
-
-Auto Update Mode:Version %v-release-fdroid
-Update Check Mode:Tags ^[0-9.]+-release-fdroid$
-Current Version:2.8.0
-Current Version Code:158
--- a/metadata/org.openhab.habdroid.yml
+++ b/metadata/org.openhab.habdroid.yml
@ -0,0 +1,134 @@
+Categories:
+  - Internet
+License: EPL-1.0
+AuthorName: openHAB Foundation
+AuthorEmail: apps@openhabfoundation.org
+WebSite: https://www.openhab.org/
+SourceCode: https://github.com/openhab/openhab-android
+IssueTracker: https://github.com/openhab/openhab-android/issues
+Translation: https://crowdin.com/project/openhab-android
+Changelog: https://github.com/openhab/openhab-android/releases
+Donate: https://www.paypal.me/openHABFoundation
+
+AutoName: openHAB
+
+RepoType: git
+Repo: https://github.com/openhab/openhab-android.git
+
+Builds:
+  - versionName: 2.0.27
+    versionCode: 30
+    commit: 2.0.27-release-fdroid
+    subdir: mobile
+    gradle:
+      - foss
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+        -e '/google-services/d' build.gradle
+
+  - versionName: 2.0.31
+    versionCode: 34
+    commit: 2.0.31-release-fdroid
+    subdir: mobile
+    gradle:
+      - foss
+      - stable
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+        -e '/google-services/d' build.gradle
+
+  - versionName: 2.1.0
+    versionCode: 50
+    commit: 2.1.0-release-fdroid
+    subdir: mobile
+    gradle:
+      - foss
+      - stable
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+        -e '/google-services/d' build.gradle
+
+  - versionName: 2.2.0
+    versionCode: 59
+    commit: 2.2.0-release-fdroid
+    subdir: mobile
+    gradle:
+      - foss
+      - stable
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+        -e '/google-services/d' build.gradle
+
+  - versionName: 2.3.0
+    versionCode: 82
+    commit: 2.3.0-release-fdroid
+    subdir: mobile
+    gradle:
+      - foss
+      - stable
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+        -e '/google-services/d' build.gradle
+
+  - versionName: 2.4.0
+    versionCode: 91
+    commit: 2.4.0-release-fdroid
+    subdir: mobile
+    gradle:
+      - foss
+      - stable
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+        -e '/google-services/d' build.gradle
+
+  - versionName: 2.5.0
+    versionCode: 95
+    commit: 2.5.0-release-fdroid
+    subdir: mobile
+    gradle:
+      - foss
+      - stable
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+        -e '/google-services/d' build.gradle
+
+  - versionName: 2.6.0
+    versionCode: 114
+    commit: 2.6.0-release-fdroid
+    subdir: mobile
+    gradle:
+      - foss
+      - stable
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+        -e '/google-services/d' build.gradle
+
+  - versionName: 2.6.9
+    versionCode: 123
+    commit: 2.6.9-release-fdroid
+    subdir: mobile
+    gradle:
+      - foss
+      - stable
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+        -e '/google-services/d' build.gradle
+
+  - versionName: 2.7.0
+    versionCode: 140
+    commit: 2.7.0-release-fdroid
+    subdir: mobile
+    gradle:
+      - foss
+      - stable
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+        -e '/google-services/d' build.gradle
+
+  - versionName: 2.8.0
+    versionCode: 158
+    commit: 2.8.0-release-fdroid
+    subdir: mobile
+    gradle:
+      - foss
+      - stable
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+        -e '/google-services/d' build.gradle
+
+MaintainerNotes: Replace the fabric.io maven with mavencentral instead of deleting
+    it to not trigger fdroid/fdroidserver#463.
+
+AutoUpdateMode: Version %v-release-fdroid
+UpdateCheckMode: Tags ^[0-9.]+-release-fdroid$
+CurrentVersion: 2.8.0
+CurrentVersionCode: 158
--- a/metadata/org.openintents.filemanager.txt
+++ b/metadata/org.openintents.filemanager.txt
@ -1,136 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:http://www.openintents.org/filemanager
-Source Code:https://github.com/openintents/filemanager
-Issue Tracker:https://github.com/openintents/filemanager/issues
-Donate:http://www.openintents.org/contribute
-Bitcoin:16MJeiftw9LRuvqoSH18v16kYTeNx7wJSZ
-
-Auto Name:OI File Manager
-Summary:File manager
-Description:
-The OpenIntents file manager allows you to browse your SD card, create
-directories, rename, move, and delete files. It also acts as an extension to
-other applications to display "Open" and "Save" dialogs.
-
-Note that this is included in older versions of Cyanogenmod as a system
-application, so you will not be able to upgrade it without first manually
-removing (as root) the existing version.
-
-'''Features:'''
-
-* Show list of files with thumbnails for images.
-* Move, copy, rename, and delete files.
-* Create and delete directories (folders).
-* Send files by email.
-* Acts as an extension to other applications, like GMail, to attach files.
-* Support for many file endings and mime types.
-* Supports PICK_FILE and PICK_DIRECTORY intents so that other applications can use OI File Manager.
-.
-
-Repo Type:git
-Repo:https://github.com/openintents/filemanager.git
-
-Build:1.2-rc1,18
-    commit=4106
-    subdir=FileManager
-    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
-        android update project -p $$OI$$/distribution/DistributionLibrary -t android-11
-    target=android-11
-    buildjni=yes
-
-Build:1.2,20
-    commit=4170
-    subdir=FileManager
-    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
-        android update project -p $$OI$$/distribution/DistributionLibrary -t android-11
-    target=android-11
-    buildjni=yes
-
-Build:1.3,21
-    commit=4358c17a
-    subdir=FileManager
-    srclibs=OI@4170
-    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
-        $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary -t android-11 && \
-        rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
-    target=android-14
-    buildjni=yes
-
-Build:2.0.2,26
-    commit=328b40775
-    subdir=FileManager
-    srclibs=OI@4170
-    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
-        $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary -t android-11 && \
-        rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
-    target=android-14
-    buildjni=yes
-
-Build:2.0.3-rc1,28
-    commit=2bdf550298
-    subdir=FileManager
-    srclibs=OI@4170
-    prebuild=sed -i 's@\(.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
-        $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary -t android-11 && \
-        rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
-    target=android-16
-    buildjni=yes
-
-Build:2.0.3,29
-    disable=not yet
-
-Build:2.0.7,34
-    disable=resource errors
-    commit=d37719d2d0ee094589adac8077a86635f2ae5078
-    subdir=FileManager
-    srclibs=OIgit@fd80455b5717561078f308b01522f655c98cd05e
-    prebuild=pushd $$OIgit$$/DistributionLibrary && \
-        gradle assembleRelease && \
-        popd && \
-        cp $$OIgit$$/DistributionLibrary/build/intermediates/bundles/release/classes.jar libs/oi-distribution.jar && \
-        echo "jar.libs.dir=libs" > project.properties && \
-        echo "target=android-19" >> project.properties && \
-        rm build.xml && \
-        $$SDK$$/tools/android update project -p . && \
-        rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
-    target=android-19
-    scanignore=FileManager/libs/
-    buildjni=yes
-
-Build:2.1.1,36
-    commit=2.1.1
-    subdir=FileManager
-    gradle=yes
-    rm=FileManager/libs
-
-Build:2.2.0,37
-    commit=2.2.0
-    subdir=FileManager
-    gradle=yes
-    rm=FileManager/libs,FileManagerTest
-
-Build:2.2.1,38
-    commit=2.2.1
-    subdir=FileManager
-    gradle=yes
-    rm=FileManager/libs,FileManagerTest
-
-Build:2.2.2,39
-    commit=2.2.2
-    subdir=FileManager
-    gradle=yes
-    rm=FileManager/libs,FileManagerTest
-    prebuild=sed -i -e '/applicationVariants.all/,+8d' build.gradle
-
-Build:2.2.3,40
-    commit=2.2.3
-    subdir=FileManager
-    gradle=yes
-    rm=FileManager/libs,FileManagerTest
-    prebuild=sed -i -e '/applicationVariants.all/,+8d' build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.2.3
-Current Version Code:40
--- a/metadata/org.openintents.filemanager.yml
+++ b/metadata/org.openintents.filemanager.yml
@ -0,0 +1,188 @@
+Categories:
+  - System
+License: Apache-2.0
+WebSite: http://www.openintents.org/filemanager
+SourceCode: https://github.com/openintents/filemanager
+IssueTracker: https://github.com/openintents/filemanager/issues
+Donate: http://www.openintents.org/contribute
+Bitcoin: 16MJeiftw9LRuvqoSH18v16kYTeNx7wJSZ
+
+AutoName: OI File Manager
+Summary: File manager
+Description: |-
+    The OpenIntents file manager allows you to browse your SD card, create
+    directories, rename, move, and delete files. It also acts as an extension to
+    other applications to display "Open" and "Save" dialogs.
+
+    Note that this is included in older versions of Cyanogenmod as a system
+    application, so you will not be able to upgrade it without first manually
+    removing (as root) the existing version.
+
+    '''Features:'''
+
+    * Show list of files with thumbnails for images.
+    * Move, copy, rename, and delete files.
+    * Create and delete directories (folders).
+    * Send files by email.
+    * Acts as an extension to other applications, like GMail, to attach files.
+    * Support for many file endings and mime types.
+    * Supports PICK_FILE and PICK_DIRECTORY intents so that other applications can use OI File Manager.
+
+RepoType: git
+Repo: https://github.com/openintents/filemanager.git
+
+Builds:
+  - versionName: 1.2-rc1
+    versionCode: 18
+    commit: '4106'
+    subdir: FileManager
+    prebuild:
+      - sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@'
+        project.properties
+      - android update project -p $$OI$$/distribution/DistributionLibrary -t android-11
+    target: android-11
+    buildjni:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 20
+    commit: '4170'
+    subdir: FileManager
+    prebuild:
+      - sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@'
+        project.properties
+      - android update project -p $$OI$$/distribution/DistributionLibrary -t android-11
+    target: android-11
+    buildjni:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 21
+    commit: 4358c17a
+    subdir: FileManager
+    srclibs:
+      - OI@4170
+    prebuild:
+      - sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@'
+        project.properties
+      - $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary
+        -t android-11
+      - rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
+    target: android-14
+    buildjni:
+      - yes
+
+  - versionName: 2.0.2
+    versionCode: 26
+    commit: 328b40775
+    subdir: FileManager
+    srclibs:
+      - OI@4170
+    prebuild:
+      - sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@'
+        project.properties
+      - $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary
+        -t android-11
+      - rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
+    target: android-14
+    buildjni:
+      - yes
+
+  - versionName: 2.0.3-rc1
+    versionCode: 28
+    commit: 2bdf550298
+    subdir: FileManager
+    srclibs:
+      - OI@4170
+    prebuild:
+      - sed -i 's@\(.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties
+      - $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary
+        -t android-11
+      - rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
+    target: android-16
+    buildjni:
+      - yes
+
+  - versionName: 2.0.3
+    versionCode: 29
+    disable: not yet
+
+  - versionName: 2.0.7
+    versionCode: 34
+    disable: resource errors
+    commit: d37719d2d0ee094589adac8077a86635f2ae5078
+    subdir: FileManager
+    srclibs:
+      - OIgit@fd80455b5717561078f308b01522f655c98cd05e
+    prebuild:
+      - pushd $$OIgit$$/DistributionLibrary
+      - gradle assembleRelease
+      - popd
+      - cp $$OIgit$$/DistributionLibrary/build/intermediates/bundles/release/classes.jar
+        libs/oi-distribution.jar
+      - echo "jar.libs.dir=libs" > project.properties
+      - echo "target=android-19" >> project.properties
+      - rm build.xml
+      - $$SDK$$/tools/android update project -p .
+      - rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
+    target: android-19
+    scanignore:
+      - FileManager/libs/
+    buildjni:
+      - yes
+
+  - versionName: 2.1.1
+    versionCode: 36
+    commit: 2.1.1
+    subdir: FileManager
+    gradle:
+      - yes
+    rm:
+      - FileManager/libs
+
+  - versionName: 2.2.0
+    versionCode: 37
+    commit: 2.2.0
+    subdir: FileManager
+    gradle:
+      - yes
+    rm:
+      - FileManager/libs
+      - FileManagerTest
+
+  - versionName: 2.2.1
+    versionCode: 38
+    commit: 2.2.1
+    subdir: FileManager
+    gradle:
+      - yes
+    rm:
+      - FileManager/libs
+      - FileManagerTest
+
+  - versionName: 2.2.2
+    versionCode: 39
+    commit: 2.2.2
+    subdir: FileManager
+    gradle:
+      - yes
+    rm:
+      - FileManager/libs
+      - FileManagerTest
+    prebuild: sed -i -e '/applicationVariants.all/,+8d' build.gradle
+
+  - versionName: 2.2.3
+    versionCode: 40
+    commit: 2.2.3
+    subdir: FileManager
+    gradle:
+      - yes
+    rm:
+      - FileManager/libs
+      - FileManagerTest
+    prebuild: sed -i -e '/applicationVariants.all/,+8d' build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 2.2.3
+CurrentVersionCode: 40
--- a/metadata/org.openintents.flashlight.txt
+++ b/metadata/org.openintents.flashlight.txt
@ -1,39 +0,0 @@
-Categories:System
-License:Apache-2.0
-Author Name:OpenIntents
-Author Email:support@openintents.org
-Web Site:http://www.openintents.org/flashlight/
-Source Code:https://github.com/openintents/flashlight
-Issue Tracker:https://github.com/openintents/flashlight/issues
-Donate:http://openintents.org/contribute
-Bitcoin:16MJeiftw9LRuvqoSH18v16kYTeNx7wJSZ
-
-Auto Name:OI Flashlight
-Summary:Helps you find your way in the dark
-Description:
-OI Flashlight is a simple and effective application that helps you find a way in
-the dark. OI Flashlight locks the display backlight on, clearly illuminating the
-surrounding area.
-
-For devices with a camera flash, OI Flashlight can also use the flash as a
-bright torch to brighten the room. The color of the backlight is completely
-customizable with OI Color Picker.
-.
-
-Repo Type:git
-Repo:https://github.com/openintents/flashlight
-
-Build:1.2.1,10013
-    commit=1.2.1
-    subdir=Flashlight
-    gradle=yes
-
-Build:1.2.3,10015
-    commit=1.2.3
-    subdir=Flashlight
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.2.3
-Current Version Code:10015
--- a/metadata/org.openintents.flashlight.yml
+++ b/metadata/org.openintents.flashlight.yml
@ -0,0 +1,44 @@
+Categories:
+  - System
+License: Apache-2.0
+AuthorName: OpenIntents
+AuthorEmail: support@openintents.org
+WebSite: http://www.openintents.org/flashlight/
+SourceCode: https://github.com/openintents/flashlight
+IssueTracker: https://github.com/openintents/flashlight/issues
+Donate: http://openintents.org/contribute
+Bitcoin: 16MJeiftw9LRuvqoSH18v16kYTeNx7wJSZ
+
+AutoName: OI Flashlight
+Summary: Helps you find your way in the dark
+Description: |-
+    OI Flashlight is a simple and effective application that helps you find a way in
+    the dark. OI Flashlight locks the display backlight on, clearly illuminating the
+    surrounding area.
+
+    For devices with a camera flash, OI Flashlight can also use the flash as a
+    bright torch to brighten the room. The color of the backlight is completely
+    customizable with OI Color Picker.
+
+RepoType: git
+Repo: https://github.com/openintents/flashlight
+
+Builds:
+  - versionName: 1.2.1
+    versionCode: 10013
+    commit: 1.2.1
+    subdir: Flashlight
+    gradle:
+      - yes
+
+  - versionName: 1.2.3
+    versionCode: 10015
+    commit: 1.2.3
+    subdir: Flashlight
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 1.2.3
+CurrentVersionCode: 10015