Merge branch 'misfixes21' into 'master'

Misc fixes after last cycle

See merge request fdroid/fdroiddata!6666

metadata/ar.rulosoft.mimanganu.yml

@@ -1398,55 +1398,9 @@ Builds:
       - sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g'
         ../build.gradle
 
-  - versionName: '1.124'
-    versionCode: 124
-    disable: unknown maven
-    commit: '1.124'
-    subdir: app
-    gradle:
-      - fdroid
-    srclibs:
-      - RapidDecoder@7cdfca4
-    prebuild:
-      - cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/
-      - sed -i -e '/rapid.decoder/d' -e '/githubImplementation/d' -e '/versionNameSuffix/d'
-        build.gradle
-      - sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g'
-        ../build.gradle
-
-  - versionName: '1.126'
-    versionCode: 126
-    disable: fails to build
-    commit: '1.126'
-    subdir: app
-    gradle:
-      - fdroid
-    srclibs:
-      - RapidDecoder@7cdfca4
-    prebuild:
-      - cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/
-      - sed -i -e '/rapid.decoder/d' -e '/githubImplementation/d' -e '/versionNameSuffix/d'
-        build.gradle
-      - sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g'
-        ../build.gradle
-
-  - versionName: '1.128'
-    versionCode: 128
-    commit: '1.128'
-    subdir: app
-    gradle:
-      - fdroid
-    srclibs:
-      - RapidDecoder@7cdfca4
-    prebuild:
-      - cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/
-      - sed -i -e '/rapid.decoder/d' -e '/githubImplementation/d' -e '/versionNameSuffix/d'
-        build.gradle
-      - sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g'
-        ../build.gradle
-
   - versionName: '1.129'
     versionCode: 129
+    disable: fails to build
     commit: '1.129'
     subdir: app
     gradle:

metadata/com.aefyr.sai.fdroid.yml

@@ -126,25 +126,6 @@ Builds:
       - popd
       - cp $$aefyr-android-filepicker$$/build/outputs/aar/filepicker-release.aar libs/filepicker-release.aar
 
-  - versionName: '3.10'
-    versionCode: 52
-    commit: '3.10'
-    subdir: app
-    patch:
-      - build.patch
-    gradle:
-      - fdroid
-    srclibs:
-      - aefyr-android-filepicker@56c1921965c680a3b0a62c8f8f6467c92ee8ee48
-    rm:
-      - app/libs/filepicker-release.aar
-    prebuild: sed -i -e '/io.fabric/d' -e '/google-services/d' build.gradle
-    build:
-      - pushd $$aefyr-android-filepicker$$
-      - gradle assembleRelease
-      - popd
-      - cp $$aefyr-android-filepicker$$/build/outputs/aar/filepicker-release.aar libs/filepicker-release.aar
-
   - versionName: '3.11'
     versionCode: 53
     commit: '3.11'

metadata/com.aefyr.sai.fdroid/build.patch

@@ -1,6 +1,6 @@
 --- a/build.gradle
 +++ b/build.gradle
-@@ -8,14 +8,9 @@
+@@ -7,14 +7,9 @@
          flatDir {
              dirs 'libs'
          }
@@ -10,20 +10,17 @@
      }
      dependencies {
 -        classpath 'com.google.gms:google-services:4.3.3'
-         classpath 'com.android.tools.build:gradle:3.6.1'
+         classpath 'com.android.tools.build:gradle:3.6.3'
--        classpath 'io.fabric.tools:gradle:1.31.0'
+-        classpath 'io.fabric.tools:gradle:1.31.2'
  
          // NOTE: Do not place your application dependencies here; they belong
          // in the individual module build.gradle files
-@@ -26,12 +21,6 @@
+@@ -25,9 +20,6 @@
      repositories {
          google()
          jcenter()
 -        maven {
 -            url 'https://maven.fabric.io/public'
--        }
--        maven {
--            url 'https://dl.bintray.com/rikkaw/Shizuku'
 -        }
          maven { url "https://jitpack.io" }
      }

metadata/com.foobnix.pro.pdf.reader.yml

@@ -332,32 +332,6 @@ Builds:
       - ./link_to_mupdf_1.16.1.sh
     ndk: r21
 
-  - versionName: 8.3.40-fdroid
-    versionCode: 3730
-    commit: 8.3.40
-    subdir: app/
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y g++ mesa-common-dev libxcursor-dev libxrandr-dev libxinerama-dev
-        libglu1-mesa-dev libxi-dev
-    gradle:
-      - fdroid
-    srclibs:
-      - MuPDF@1.16.1
-    rm:
-      - Builder/libs/
-    prebuild:
-      - sed -i -e '/F-DROID REMOVE THIS LINE/,+1d' ../build.gradle
-      - sed -i -e '/com.google.gms.google-services/d' -e '/com.google.android.gms/d'
-        -e '/com.cloudrail/d' -e '/include "armeabi-v7a", "arm64-v8a"/d' build.gradle
-      - sed -i -e '/^#!/a\set -e' -e 's|git clone .*|ln -s $$MuPDF$$ mupdf-$VERSION|'
-        -e 's/ndk-build $1/& -j`nproc` || exit 1/' ../Builder/link_to_mupdf_1.16.1.sh
-      - mkdir src/main/jniLibs/
-    build:
-      - pushd ../Builder/
-      - ./link_to_mupdf_1.16.1.sh
-    ndk: r21
-
   - versionName: 8.3.45-fdroid
     versionCode: 3772
     commit: 8.3.45

metadata/com.metinkale.prayer.yml

@@ -306,21 +306,22 @@ Builds:
 
   - versionName: 3.7.4 F-Droid
     versionCode: 215
-    commit: fdroid-v3.7.4 F-Droid
+    commit: fdroid-v3.7.4
     subdir: app
     submodules: true
     gradle:
       - fdroid
     prebuild:
       - cd ..
-      - bash fdroidPrep.sh
       - sed -i -e '/io.fabric/d; /com.crashlytics/d; /com.google.android.gms/d; /GoogleApiKey/d'
         features/{base,compass}/build.gradle
+      - sed -i -e 's/excludeInFDroid //' app/build.gradle
+      - bash fdroidPrep.sh
 
 MaintainerNotes: Also need to fill in bogus bintray user/api-key/gpg-passphrase in
     library's build.gradle file.
 
 AutoUpdateMode: Version fdroid-v%v
 UpdateCheckMode: Tags ^fdroid-
-CurrentVersion: 3.7.4 F-Droid
+CurrentVersion: 3.7.4
 CurrentVersionCode: 215

metadata/com.standardnotes.yml

@@ -172,6 +172,7 @@ Builds:
 
   - versionName: 3.0.21
     versionCode: 3000210
+    disable: fails to build
     commit: 3.0.21
     subdir: android/app/
     submodules: true

metadata/de.schildbach.wallet.yml

@@ -1574,6 +1574,7 @@ Builds:
 
   - versionName: '7.34'
     versionCode: 434
+    disable: never gets published for some reason
     commit: v7.34
     subdir: wallet
     init:

metadata/de.schildbach.wallet_test.yml

@@ -1592,6 +1592,7 @@ Builds:
 
   - versionName: '7.34'
     versionCode: 434
+    disable: never gets published for some reason
     commit: v7.34
     subdir: wallet
     init:

metadata/info.dvkr.screenstream.yml

@@ -333,35 +333,20 @@ Builds:
         build.gradle
       - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
 
-  - versionName: 3.4.6
+  - versionName: 3.4.8
-    versionCode: 30406
+    versionCode: 30408
-    commit: 3.4.6
+    commit: 3.4.8
     subdir: app
     gradle:
-      - fabricfree
+      - firebasefree
     prebuild:
-      - sed -i -e '/fabric\.io/d; s|= uri("https://jitpack\.io")|"https://jitpack.io"|'
+      - sed -i -e 's|= uri("https://jitpack\.io")|"https://jitpack.io"|' ../build.gradle
-        ../build.gradle
+      - sed -i -e '/com\.google\.firebase/d; /com\.google\.gms/d' ../build.gradle
-      - sed -i -e '/io\.fabric/d; /com\.google\.gms/d' ../build.gradle build.gradle
-      - sed -i -e '/releaseImplementation/d; /^android\.applicationVariants\.all {/,/^}$/d'
         build.gradle
-      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
+      - sed -i -e '/firebaseCrashlytics/,+2d' -e '/^android\.applicationVariants\.all
-
+        {/,/^}$/d' build.gradle
-  - versionName: 3.4.7
-    versionCode: 30407
-    commit: 3.4.7
-    subdir: app
-    gradle:
-      - fabricfree
-    prebuild:
-      - sed -i -e '/fabric\.io/d; s|= uri("https://jitpack\.io")|"https://jitpack.io"|'
-        ../build.gradle
-      - sed -i -e '/io\.fabric/d; /com\.google\.gms/d' ../build.gradle build.gradle
-      - sed -i -e '/releaseImplementation/d; /^android\.applicationVariants\.all {/,/^}$/d'
-        build.gradle
-      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 3.4.7
+CurrentVersion: 3.4.8
-CurrentVersionCode: 30407
+CurrentVersionCode: 30408

metadata/io.trezor.app.yml

@@ -127,7 +127,7 @@ Builds:
 
   - versionName: 2.3.0
     versionCode: 21
-    commit: v2.3.0
+    commit: v2.3.0-fix
     subdir: trezor-app
     gradle:
       - yes

metadata/net.ivpn.client.yml

@@ -27,9 +27,9 @@ Builds:
     prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     ndk: r21
 
-  - versionName: 1.66.2
+  - versionName: '1.66'
     versionCode: 78
-    commit: v1.66.2
+    commit: v1.66
     subdir: app
     init:
       - git submodule init
@@ -43,5 +43,5 @@ Builds:
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
-CurrentVersion: 1.66.2
+CurrentVersion: '1.66'
 CurrentVersionCode: 78

metadata/org.adaway.yml

@@ -501,31 +501,15 @@ Builds:
       - yes
     ndk: r20
 
-  - versionName: 4.3.3
+  - versionName: 4.3.4
-    versionCode: 40303
+    versionCode: 40304
-    commit: v4.3.3
+    commit: v4.3.4
     subdir: app
     gradle:
       - yes
-    ndk: r20
+    ndk: r20b
-
-  - versionName: 5.0.0
-    versionCode: 50000
-    commit: v5.0.0
-    subdir: app
-    gradle:
-      - yes
-    ndk: r20
-
-  - versionName: 5.0.1
-    versionCode: 50001
-    commit: v5.0.1
-    subdir: app
-    gradle:
-      - yes
-    ndk: r20
 
 AutoUpdateMode: Version v%v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
-CurrentVersion: 5.0.1
+CurrentVersion: 4.3.4
-CurrentVersionCode: 50001
+CurrentVersionCode: 40304

metadata/org.emunix.insteadlauncher.yml

@@ -61,7 +61,7 @@ Builds:
     subdir: app
     gradle:
       - yes
-    ndk: r20
+    ndk: r20b
     preassemble:
       - downloadDependencies
 

metadata/org.koreader.launcher.yml

@@ -301,6 +301,7 @@ Builds:
     rm:
       - platform/ubuntu-touch/
       - platform/win32/
+      - platform/kindle/wmctrl
     prebuild: sed -i -e 's#./gradlew#gradle#' platform/android/luajit-launcher/Makefile
     scandelete:
       - base/thirdparty/

metadata/org.ligi.passandroid.yml

@@ -752,6 +752,7 @@ Builds:
 
   - versionName: 3.5.6
     versionCode: 356
+    disable: unknown maven
     commit: 3.5.6
     subdir: android
     gradle:

metadata/org.midorinext.android.yml

@@ -39,9 +39,9 @@ Builds:
       - yes
     prebuild: sed -i -e '/minifyEnabled/d' -e '/debuggable/d' build.gradle
 
-  - versionName: 1.0.3-beta
+  - versionName: 1.0.4
     versionCode: 4
-    commit: 1.0.3-beta
+    commit: 2938e458e5c7cf1fd05fd086050c1fbcf3d7432f
     subdir: app
     gradle:
       - yes
@@ -49,5 +49,5 @@ Builds:
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 1.0.3-beta
+CurrentVersion: 1.0.4
 CurrentVersionCode: 4

metadata/org.nonononoki.hendroid.yml

@@ -70,15 +70,15 @@ Builds:
       - yes
     prebuild: sed -i -e '/fabric/d' build.gradle ../build.gradle
 
-  - versionName: 1.11.4
+  - versionName: 1.11.4.1
-    versionCode: 148
+    versionCode: 149
-    commit: 1.11.4
+    commit: 1.11.4.1
     subdir: app
     gradle:
       - yes
-    prebuild: sed -i -e '/fabric/d' build.gradle ../build.gradle
+    prebuild: sed -i -e '/fabric/d' -e '/osborn/d' build.gradle ../build.gradle
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 1.11.4
+CurrentVersion: 1.11.4.1
-CurrentVersionCode: 148
+CurrentVersionCode: 149

metadata/org.twistedappdeveloper.statocovid19italia.yml

@@ -30,13 +30,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 1.2.1.1
-    versionCode: 21
-    commit: v1.2.1.1
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: 1.2.2
     versionCode: 22
     commit: v1.2.2

metadata/pc.javier.seguime.yml

@@ -190,6 +190,7 @@ Builds:
 
   - versionName: '4.6'
     versionCode: 46
+    disable: wrong versionName
     commit: '4.6'
     subdir: app
     gradle: