Merge branch 'miscfixes37' into 'master'

Misc fixes after cycle

See merge request fdroid/fdroiddata!7156

metadata/at.bitfire.davdroid.yml

@@ -1348,14 +1348,6 @@ Builds:
     gradle:
       - standard
 
-  - versionName: 3.2.1.2-ose
-    versionCode: 302010201
-    commit: v3.2.1.2-ose
-    subdir: app
-    submodules: true
-    gradle:
-      - standard
-
   - versionName: 3.2.1.3-ose
     versionCode: 302010300
     commit: v3.2.1.3-ose

metadata/ch.bailu.aat.yml

@@ -197,6 +197,7 @@ Builds:
     subdir: app
     gradle:
       - yes
+    ndk: r21d
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/com.antony.muzei.pixiv.yml

@@ -74,7 +74,7 @@ Builds:
 
   - versionName: 3.1.2
     versionCode: 288
-    commit: 3.1.2
+    commit: 3.1.1
     subdir: app
     gradle:
       - yes

metadata/com.coboltforge.dontmind.multivnc.yml

@@ -19,8 +19,6 @@ Description: |-
     * Copy&paste to and from Android.
     * Bookmarking of connections.
 
-    Versions 1.x.x are based on android-vnc-viewer, so do NOT support encryption nor connecting to OS X. Please hang on till 2.x.x is released!
-
 RepoType: git
 Repo: https://github.com/bk138/multivnc
 
@@ -173,10 +171,14 @@ Builds:
     versionCode: 67
     commit: AndroidMultiVNC-1.9.0
     subdir: android/app
+    submodules: true
     gradle:
       - yes
+    prebuild: ../../prepareLibreSSL.sh
     scanignore:
       - contrib
+      - android/app/libs/
+    ndk: r21d
 
 AutoUpdateMode: Version AndroidMultiVNC-%v
 UpdateCheckMode: Tags

metadata/com.duckduckgo.mobile.android.yml

@@ -1,6 +1,5 @@
 AntiFeatures:
   - NonFreeNet
-  - Tracking
 Categories:
   - Internet
 License: Apache-2.0
@@ -48,7 +47,6 @@ Description: |-
     Antifeatures:
     * NonFreeNet - Uses DuckDuckGo as the exclusive search engine, for which the
     source code is not available.
-    * Tracking - Every website hostname is sent to DuckDuckGo's favicon proxy servers.
 
 RepoType: git
 Repo: https://github.com/duckduckgo/Android
@@ -282,6 +280,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r16b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.6.0
     versionCode: 50600
@@ -290,6 +290,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r16b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.6.1
     versionCode: 50601
@@ -298,6 +300,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r16b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.7.0
     versionCode: 50700
@@ -306,6 +310,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r16b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.7.1
     versionCode: 50701
@@ -314,6 +320,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r16b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.7.2
     versionCode: 50702
@@ -322,6 +330,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r16b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.7.3
     versionCode: 50703
@@ -330,6 +340,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r16b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.7.5
     versionCode: 50705
@@ -338,6 +350,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r16b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.8.0
     versionCode: 50800
@@ -346,6 +360,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r16b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.9.0
     versionCode: 50900
@@ -355,6 +371,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r17b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.9.1
     versionCode: 50901
@@ -364,6 +382,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r17b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.10.2
     versionCode: 51002
@@ -373,6 +393,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r17b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.10.3
     versionCode: 51003
@@ -382,6 +404,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r17b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.10.4
     versionCode: 51004
@@ -391,6 +415,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r17b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.13.0
     versionCode: 51300
@@ -400,6 +426,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r17b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.15.1
     versionCode: 51501
@@ -409,6 +437,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.18.0
     versionCode: 51800
@@ -418,6 +448,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.19.0
     versionCode: 51900
@@ -427,6 +459,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.20.0
     versionCode: 52000
@@ -436,6 +470,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.21.1
     versionCode: 52101
@@ -445,6 +481,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.21.2
     versionCode: 52102
@@ -454,6 +492,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.24.0
     versionCode: 52400
@@ -463,6 +503,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.26.0
     versionCode: 52600
@@ -472,6 +514,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.26.1
     versionCode: 52601
@@ -481,6 +525,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.27.0
     versionCode: 52700
@@ -490,6 +536,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.28.3
     versionCode: 52803
@@ -499,6 +547,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.32.1
     versionCode: 53201
@@ -508,6 +558,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.34.0
     versionCode: 53400
@@ -517,6 +569,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.36.3
     versionCode: 53603
@@ -526,6 +580,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r18b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.40.3
     versionCode: 54003
@@ -535,6 +591,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r20b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.41.0
     versionCode: 54100
@@ -544,6 +602,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r20b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.43.0
     versionCode: 54300
@@ -553,6 +613,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r20b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.46.0
     versionCode: 54600
@@ -562,6 +624,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r20b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.48.0
     versionCode: 54800
@@ -571,6 +635,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r20b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.49.1
     versionCode: 54901
@@ -580,6 +646,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r20b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.50.1
     versionCode: 55001
@@ -589,6 +657,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r20b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.51.0
     versionCode: 55100
@@ -598,6 +668,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r20b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.53.1
     versionCode: 55301
@@ -607,6 +679,8 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     ndk: r21
+    antifeatures:
+      - Tracking
 
   - versionName: 5.55.1
     versionCode: 55501
@@ -617,6 +691,8 @@ Builds:
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     prebuild: sed -i -e 's/21.0.6113669/21.1.6352462/' app/build.gradle
     ndk: r21b
+    antifeatures:
+      - Tracking
 
   - versionName: 5.55.1
     versionCode: 55501
@@ -627,20 +703,24 @@ Builds:
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
     prebuild: sed -i -e 's/21.0.6113669/21.1.6352462/' app/build.gradle
     ndk: r21b
+    antifeatures:
+      - Tracking
 
-  - versionName: 5.56.0
+  - versionName: 5.59.2
-    versionCode: 55600
+    versionCode: 55902
-    commit: 5.56.0
+    commit: 5.59.2
     submodules: true
     gradle:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
-    prebuild: sed -i -e 's/21.0.6113669/21.1.6352462/' app/build.gradle
+    rm:
-    ndk: r21b
+      - styleguide/ddg-settings.zip
+    prebuild: sed -i -e 's/21.0.6113669/21.3.6528147/' app/build.gradle
+    ndk: r21d
 
 MaintainerNotes: Cannot use AUM/UCM because version code and version name are dynamic.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 5.56.0
+CurrentVersion: 5.59.2
-CurrentVersionCode: 55600
+CurrentVersionCode: 55902

metadata/com.etesync.syncadapter.yml

@@ -765,14 +765,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 1.15.0
-    versionCode: 110
-    commit: v1.15.0
-    subdir: app
-    submodules: true
-    gradle:
-      - yes
-
   - versionName: 1.15.1
     versionCode: 111
     commit: v1.15.1

metadata/com.gh4a.yml

@@ -172,20 +172,9 @@ Builds:
       - echo 'ClientId="f0f32f2ee4a709ba3640"' >> client.properties
       - echo 'ClientSecret="f94cffda88486696c2762ad986bc0b8b830c9cff"' >> client.properties
 
-  - versionName: 4.6.1
-    versionCode: 63
-    commit: v4.6.1
-    subdir: app
-    gradle:
-      - yes
-    prebuild:
-      - sed -i -e '/fabric/d' -e '/playstoreImplementation(.*) {/,/}/d' build.gradle
-      - echo 'ClientId="f0f32f2ee4a709ba3640"' >> client.properties
-      - echo 'ClientSecret="f94cffda88486696c2762ad986bc0b8b830c9cff"' >> client.properties
-
   - versionName: 4.6.2
     versionCode: 64
-    commit: v4.6.2
+    commit: 4.6.2
     subdir: app
     gradle:
       - yes
@@ -194,7 +183,7 @@ Builds:
       - echo 'ClientId="f0f32f2ee4a709ba3640"' >> client.properties
       - echo 'ClientSecret="f94cffda88486696c2762ad986bc0b8b830c9cff"' >> client.properties
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 CurrentVersion: 4.6.2
 CurrentVersionCode: 64

metadata/com.gianlu.aria2android.yml

@@ -300,7 +300,7 @@ Builds:
         ../CommonUtils/build.gradle
     scandelete:
       - aria2lib/src/main/jniLibs
-    ndk: r21
+    ndk: r21d
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/com.github.catfriend1.syncthingandroid.yml

@@ -1299,7 +1299,7 @@ Builds:
 
   - versionName: 1.8.0.0
     versionCode: 1080000
-    commit: v1.8.0.0
+    commit: v1.8.0.0.1
     submodules: true
     gradle:
       - yes

metadata/com.github.premnirmal.tickerwidget.yml

@@ -942,6 +942,7 @@ Builds:
 
   - versionName: 3.9.702
     versionCode: 300900702
+    disable: DOS newlines
     commit: '300900702'
     subdir: app
     gradle:

metadata/com.mookie.circo.yml

@@ -37,14 +37,14 @@ Builds:
 
   - versionName: 1.4.7
     versionCode: 23
-    commit: v1.4.7
+    commit: 1.4.7
     init:
       - sed -i -e "s/gradleVersion = '2\.12'/gradleVersion = '4.1'/" build.gradle
       - sed -i -e '/jcenter()/a\ google()' build.gradle
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 CurrentVersion: 1.4.7
 CurrentVersionCode: 23

metadata/com.wireguard.android.yml

@@ -433,7 +433,7 @@ Builds:
     submodules: true
     gradle:
       - yes
-    ndk: r21
+    ndk: r21d
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: HTTP

metadata/de.baumann.weather.yml

@@ -235,14 +235,14 @@ Builds:
 
   - versionName: 5.0.1
     versionCode: 62
-    commit: 5.0.1
+    commit: v5.0.1
     subdir: app
     gradle:
       - yes
     prebuild: sed -i -e "/legacy/aimplementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'"
         build.gradle
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
 CurrentVersion: 5.0.1
 CurrentVersionCode: 62

metadata/de.marmaro.krt.ffupdater.yml

@@ -209,21 +209,13 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 68.4.0
-    versionCode: 46
-    commit: 68.4.0
-    subdir: ffupdater
-    gradle:
-      - yes
-    prebuild: sed -i -e 's/6.5-milestone-1/6.5/' gradle/wrapper/gradle-wrapper.properties
-
   - versionName: 68.4.1
     versionCode: 47
     commit: 68.4.1
     subdir: ffupdater
     gradle:
       - yes
-    prebuild: sed -i -e 's/6.5-milestone-1/6.5/' gradle/wrapper/gradle-wrapper.properties
+    prebuild: sed -i -e 's/6.5-milestone-1/6.5/' ../gradle/wrapper/gradle-wrapper.properties
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/de.tutao.tutanota.yml

@@ -835,12 +835,16 @@ Builds:
       - cp -a node-v10.11.0-linux-x64/. /usr/local/
     gradle:
       - yes
+    rm:
+      - app-ios
     prebuild:
       - cd ../..
-      - rm -rf app-ios
       - node fdroid-fix-deps
       - npm install
       - node dist prod
+    scandelete:
+      - node_modules/mithril/dist/archive/*/mithril.min.zip
+      - node_modules/semver/*.gz
 
 AutoUpdateMode: Version tutanota-android-release-%v
 UpdateCheckMode: Tags tutanota-android-release-*

metadata/dev.msfjarvis.aps.yml

@@ -63,19 +63,6 @@ Builds:
     scanignore:
       - app/src/main/assets/publicsuffixes
 
-  - versionName: 1.10.0
-    versionCode: 11000
-    commit: v1.10.0
-    subdir: app
-    gradle:
-      - yes
-    prebuild:
-      - mkdir -p $HOME/.gradle
-      - echo "org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
-        -Dfile.encoding=UTF-8" >> $HOME/.gradle/gradle.properties
-    scanignore:
-      - app/src/main/assets/publicsuffixes
-
   - versionName: 1.10.1
     versionCode: 11010
     commit: v1.10.1

metadata/eu.pretix.pretixscan.droid.yml

@@ -75,14 +75,14 @@ Builds:
 
   - versionName: 1.4.2
     versionCode: 25
-    commit: v1.4.2
+    commit: 1.4.2
     subdir: pretixscan/app
     submodules: true
     gradle:
       - yes
     output: build/outputs/apk/pretix/release/app-pretix-release-unsigned.apk
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 CurrentVersion: 1.4.2
 CurrentVersionCode: 25

metadata/me.wolszon.fastshopping.yml

@@ -30,7 +30,7 @@ Builds:
 
   - versionName: 2.0.5
     versionCode: 10
-    commit: v2.0.5
+    commit: 20c2f990cb29541742a5395f683df5818d9252cf
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
       - flutter@1.18.0-11.1.pre

metadata/nightlock.peppercarrot.yml

@@ -47,8 +47,6 @@ Builds:
     subdir: app
     gradle:
       - yes
-    rm:
-      - app/libs
     prebuild:
       - echo -e '\nbuildscript { repositories { google() } }' >> ../build.gradle
       - sed -i -e '/maven {/,+2d' ../build.gradle

metadata/nl.asymmetrics.droidshows.yml

@@ -1,3 +1,5 @@
+AntiFeatures:
+  - NonFreeAssets
 Categories:
   - Multimedia
   - Internet
@@ -317,6 +319,10 @@ Builds:
   - versionName: 7.11.0
     versionCode: 71100
     commit: 7.11.0
+    rm:
+      - icon/material-adaptive-render-icon.zip
+      - icon/material-render-actionbar.zip
+      - icon/material-render-icon.zip
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/opencontacts.open.com.opencontacts.yml

@@ -127,7 +127,7 @@ Builds:
 
   - versionName: '20.0'
     versionCode: 20
-    commit: v20.0
+    commit: f87db6f471729e1d505649d1542f569e6b57ab86
     subdir: app
     gradle:
       - yes

metadata/org.adaway.yml

@@ -509,22 +509,13 @@ Builds:
       - yes
     ndk: r21
 
-  - versionName: 4.3.5
-    versionCode: 40305
-    commit: v4.3.5
-    subdir: app
-    gradle:
-      - yes
-    scanignore:
-      - Resources/symlink_hosts_to_data.zip
-    ndk: r21d
-
   - versionName: 4.3.6
     versionCode: 40306
     commit: v4.3.6
     subdir: app
     gradle:
       - yes
+    prebuild: sed -i -e 's/21.0.6113669/21.3.6528147/' build.gradle
     scanignore:
       - Resources/symlink_hosts_to_data.zip
     ndk: r21d

metadata/org.asteroidos.sync.yml

@@ -119,21 +119,14 @@ Builds:
     gradle:
       - yes
 
-  - versionName: '0.17'
-    versionCode: 17
-    commit: v0.17
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: '0.18'
     versionCode: 18
-    commit: v0.18
+    commit: '0.18'
     subdir: app
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 CurrentVersion: '0.18'
 CurrentVersionCode: 18

metadata/org.atalk.android.yml

@@ -1066,54 +1066,6 @@ Builds:
       - mv jni/static_library_built/openssl/output/android/ jni/openssl/
     ndk: r15c
 
-  - versionName: 2.3.1
-    versionCode: 1131
-    commit: 2.3.1
-    subdir: aTalk/
-    gradle:
-      - fdroid
-    srclibs:
-      - fmj@r122
-      - jitsi-zrtp4j@7cbd8101108191089aad871002567c2a0eb2b512
-    rm:
-      - aTalk/lib/src_reference/*/*.jar
-      - aTalk/lib/bundles/*.jar
-      - aTalk/jni/ffmpeg/android/
-      - aTalk/jni/openssl/android/
-      - aTalk/jni/vpx/android/
-    prebuild: sed -i -e "/clean.dependsOn 'ndkClean'/d" build.gradle
-    scanignore:
-      - aTalk/build.gradle
-    scandelete:
-      - aTalk/lib/src_reference/*/*.zip
-      - aTalk/third_party/m2/org/igniterealtime/smack/*/*/*.jar
-      - aTalk/jni/static_library_built/libvpx/sources/*.gz
-    build:
-      - pushd $$fmj$$
-      - ant
-      - popd
-      - pushd $$jitsi-zrtp4j$$
-      - ant jar
-      - popd
-      - mv $$fmj$$/build/jars/fmj.jar lib/bundles/fmj-1.0-SNAPSHOT.jar
-      - mv $$jitsi-zrtp4j$$/dist/zrtp4j-light.jar lib/bundles/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
-      - pushd jni/static_library_built/ffmpeg-x264/
-      - ./init_update_libs.sh
-      - ./ffmpeg-atalk_build.sh
-      - popd
-      - mv jni/static_library_built/ffmpeg-x264/android/ jni/ffmpeg/
-      - pushd jni/static_library_built/libvpx/
-      - ./init_libvpx.sh
-      - ./build-libvpx4android.sh
-      - popd
-      - mv jni/static_library_built/libvpx/output/android/ jni/vpx/
-      - pushd jni/static_library_built/openssl/
-      - ./init_libopenssl.sh
-      - ./build-openssl4android.sh
-      - popd
-      - mv jni/static_library_built/openssl/output/android/ jni/openssl/
-    ndk: r15c
-
   - versionName: 2.3.2
     versionCode: 1132
     commit: 2.3.2
@@ -1124,8 +1076,7 @@ Builds:
       - fmj@r122
       - jitsi-zrtp4j@7cbd8101108191089aad871002567c2a0eb2b512
     rm:
-      - aTalk/lib/src_reference/*/*.jar
+      - aTalk/lib/src_reference/
-      - aTalk/lib/bundles/*.jar
       - aTalk/jni/ffmpeg/android/
       - aTalk/jni/openssl/android/
       - aTalk/jni/vpx/android/
@@ -1133,9 +1084,8 @@ Builds:
     scanignore:
       - aTalk/build.gradle
     scandelete:
-      - aTalk/lib/src_reference/*/*.zip
-      - aTalk/third_party/m2/org/igniterealtime/smack/*/*/*.jar
       - aTalk/jni/static_library_built/libvpx/sources/*.gz
+      - aTalk/third_party/m2/org/igniterealtime/smack/*/*/*.jar
     build:
       - pushd $$fmj$$
       - ant
@@ -1143,6 +1093,7 @@ Builds:
       - pushd $$jitsi-zrtp4j$$
       - ant jar
       - popd
+      - mkdir -p lib/bundles
       - mv $$fmj$$/build/jars/fmj.jar lib/bundles/fmj-1.0-SNAPSHOT.jar
       - mv $$jitsi-zrtp4j$$/dist/zrtp4j-light.jar lib/bundles/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
       - pushd jni/static_library_built/ffmpeg-x264/

metadata/org.commonvoice.saverio.yml

@@ -119,14 +119,6 @@ Builds:
       - FD-GH
     output: build/outputs/apk/FD-GH/release/app-FD-GH-release-unsigned.apk
 
-  - versionName: 2.0.2
-    versionCode: 115
-    commit: 2.0.2
-    subdir: app
-    gradle:
-      - FD-GH
-    output: build/outputs/apk/FD-GH/release/app-FD-GH-release-unsigned.apk
-
   - versionName: 2.0.2
     versionCode: 116
     commit: 2.0.2

metadata/org.midorinext.android.yml

@@ -51,13 +51,13 @@ Builds:
 
   - versionName: 1.1.3
     versionCode: 22
-    commit: 1.1.3
+    commit: v1.1.4
     subdir: app
     gradle:
       - yes
     prebuild: sed -i -e '/minifyEnabled/d' -e '/debuggable/d' build.gradle
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
 CurrentVersion: 1.1.3
 CurrentVersionCode: 22

metadata/org.transdroid.full.yml

@@ -229,7 +229,7 @@ Builds:
 
   - versionName: 2.5.19
     versionCode: 239
-    commit: v2.5.19
+    commit: v.2.5.19
     gradle:
       - full
     output: app/build/outputs/apk/full/release/app-full-release-unsigned.apk
@@ -238,7 +238,7 @@ Builds:
         app/src/*/res/values/bools.xml
       - sed -i -e '/lintOptions/a\        abortOnError false' app/build.gradle
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version v.%v
 UpdateCheckMode: Tags
 CurrentVersion: 2.5.19
 CurrentVersionCode: 239

metadata/posidon.launcher.yml

@@ -38,6 +38,8 @@ Builds:
     subdir: app
     gradle:
       - yes
+    rm:
+      - posidonLauncher.zip
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/ru.gelin.android.weather.notification.yml

@@ -117,13 +117,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 0.3.11
-    versionCode: 58
-    commit: v.0.3.11
-    subdir: core
-    gradle:
-      - yes
-
   - versionName: 0.3.12
     versionCode: 59
     commit: v0.3.12

metadata/ru.yanus171.feedexfork.yml

@@ -282,13 +282,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 0.14.4
-    versionCode: 210
-    commit: v0.14.4
-    subdir: FlymFork
-    gradle:
-      - yes
-
   - versionName: 0.15.1
     versionCode: 212
     commit: v0.15.1