Merge branch 'miscfixes38' into 'master'

Misc fixes after cycle

See merge request fdroid/fdroiddata!7202

metadata/com.github.premnirmal.tickerwidget.yml

@@ -940,20 +940,6 @@ Builds:
       - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
         build.gradle
 
-  - versionName: 3.9.702
-    versionCode: 300900702
-    disable: DOS newlines
-    commit: '300900702'
-    subdir: app
-    gradle:
-      - purefoss
-    prebuild:
-      - touch translate.properties
-      - sed -i -e '/fabric/d' -e '/crashlytics/,+2d' -e '/play-services/d' -e '/google-services/d'
-        build.gradle
-      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
-        build.gradle
-
   - versionName: 3.9.703
     versionCode: 300900703
     commit: '300900703'

metadata/dev.msfjarvis.aps.yml

@@ -63,32 +63,6 @@ Builds:
     scanignore:
       - app/src/main/assets/publicsuffixes
 
-  - versionName: 1.10.1
-    versionCode: 11010
-    commit: v1.10.1
-    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.2
-    versionCode: 11020
-    commit: v1.10.2
-    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.3
     versionCode: 11030
     commit: v1.10.3

metadata/org.midorinext.android.yml

@@ -31,26 +31,9 @@ RepoType: git
 Repo: https://gitlab.com/midori-web/midori-android
 
 Builds:
-  - versionName: 1.0.1-beta
-    versionCode: 2
-    disable: remove from repo
-    commit: 1.0.1
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/minifyEnabled/d' -e '/debuggable/d' build.gradle
-
-  - versionName: 1.0.4
-    versionCode: 4
-    disable: remove from repo
-    commit: 2938e458e5c7cf1fd05fd086050c1fbcf3d7432f
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/minifyEnabled/d' -e '/debuggable/d' build.gradle
-
   - versionName: 1.1.3
     versionCode: 22
+    disable: Huawei Serices Push and Analytics
     commit: v1.1.4
     subdir: app
     gradle:

metadata/org.runnerup.free.yml

@@ -137,19 +137,8 @@ Builds:
       - ANT-Android-SDKs
     prebuild: sed -i -e '/play-services/d' build.gradle
 
-  - versionName: 2.2.0.0
-    versionCode: 14000250
-    commit: v2.2.0.0
-    subdir: app
-    gradle:
-      - latest
-    rm:
-      - wear
-      - ANT-Android-SDKs
-    prebuild: sed -i -e '/play-services/d' build.gradle
-
   - versionName: 2.2.0.3
-    versionCode: 14000253
+    versionCode: 15000253
     commit: v2.2.0.3
     subdir: app
     gradle:
@@ -164,6 +153,6 @@ MaintainerNotes: This replaces RunnerUp 1.x [[org.runnerup]]
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
 UpdateCheckIgnore: (alpha|beta|rc|RC|dev)
-VercodeOperation: '%c + 14000000'
+VercodeOperation: '%c + 15000000'
 CurrentVersion: 2.2.0.3
-CurrentVersionCode: 14000253
+CurrentVersionCode: 15000253

metadata/se.leap.bitmaskclient.yml

@@ -197,13 +197,18 @@ Builds:
     gradle:
       - normalProductionFat
     rm:
-      - ics-openvpn/main/src/main/cpp/mbedtls/tests
+      - go/src/github.com/agl/ed25519/testdata/sign.input.gz
+      - go/src/github.com/shadowsocks/shadowsocks-go/script/shadowsocks.exe
+      - go/src/golang.org/x/crypto/ed25519/testdata/sign.input.gz
       - go/src/golang.org/x/tools/cmd/splitdwarf/internal/macho/testdata
       - go/src/golang.org/x/tools/go/gccgoexportdata/testdata
       - go/src/golang.org/x/tools/go/gcexportdata/testdata
       - go/src/golang.org/x/tools/go/internal/gccgoimporter/testdata/
       - go/src/golang.org/x/tools/go/internal/gcimporter/testdata/
-      - go/src/github.com/shadowsocks/shadowsocks-go/script/shadowsocks.exe
+      - go/src/golang.org/x/tools/go/packages/testdata/TestName_ModulesDedup/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/*.zip
+      - go/src/golang.org/x/tools/go/packages/testdata/TestName_ModulesDedup/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/*.zip
+      - ics-openvpn/main/src/main/cpp/mbedtls/programs/fuzz/corpuses/*
+      - ics-openvpn/main/src/main/cpp/mbedtls/tests
       - shapeshifter/*.?ar
     prebuild: sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
     build:

metadata/se.manyver.yml

@@ -1454,6 +1454,7 @@ Builds:
 
   - versionName: 0.2007.3-beta-fdroid
     versionCode: 88
+    disable: fails to build
     commit: v0.2007.3-beta
     timeout: 30000
     subdir: android/app