Merge branch 'miscfixes' into 'master'

Misc fixes after builds

See merge request fdroid/fdroiddata!6244

metadata/com.github.cetoolbox.yml

@@ -14,13 +14,9 @@ RepoType: git
 Repo: https://github.com/cetoolbox/cetoolbox.git
 
 Builds:
-  - versionName: '1.0'
-    versionCode: 1
-    commit: ed60c
-
   - versionName: '1.3'
     versionCode: 5
-    commit: v1.3
+    commit: v1.3.0
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/com.mattermost.rnbeta.yml

@@ -305,51 +305,6 @@ Builds:
     scandelete:
       - node_modules
 
-  - versionName: 1.24.0
-    versionCode: 239
-    disable: fails to build
-    commit: v1.24.0
-    subdir: android/app
-    sudo:
-      - sysctl fs.inotify.max_user_watches=524288
-      - sysctl -p
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t stretch-backports npm
-    init:
-      - sed -i -e '/react-native-youtube/d' ../../package.json build.gradle ../settings.gradle
-        ../../app/components/post_body_additional_content/post_body_additional_content.js
-      - make -C ../.. pre-run
-    gradle:
-      - yes
-    rm:
-      - node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/gcm/
-      - node_modules/xdate/build/compiler.jar
-      - node_modules/react-native-video/android-exoplayer/build/
-      - node_modules/socketcluster/
-      - node_modules/shaka-player/third_party/closure/compiler.jar
-      - node_modules/.bin/socketcluster
-    prebuild:
-      - "sed -i -e '/play-services-gcm/,+2d' -e 's/bundleCommand: \"ram-bundle\",/bundleCommand:\
-        \ \"ram-bundle\", nodeExecutableAndArgs: [\"node\", \"--max-old-space-size=12000\"\
-        ],/' build.gradle"
-      - sed -i -e '/ReactNativeYouTube/d' src/main/java/com/mattermost/rnbeta/MainApplication.java
-      - sed -i -e '/com.google.android.gms.iid.InstanceID.getInstance/d' ../../node_modules/react-native-device-info/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
-      - sed -i -e '/play-services/d' ../../node_modules/react-native-device-info/android/build.gradle
-      - sed -i -e '/firebase/d' ../../node_modules/react-native-notifications/android/build.gradle
-        build.gradle
-      - sed -i -e '/hasPermission/d' -e '/tokenFetchIntent/d' -e '/FcmInstance/d'
-        -e '/FirebaseApp/'d ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
-        ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
-      - sed -i -e '/maven {/,+2d' ../../node_modules/react-native-document-picker/android/build.gradle
-      - truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel
-    scanignore:
-      - android/build.gradle
-      - node_modules/react-native-svg/android/build.gradle
-      - node_modules/react-native-image-picker/android/build.gradle
-      - node_modules/react-native-webview/android/build.gradle
-    scandelete:
-      - node_modules
-
 MaintainerNotes: |-
     sed is used to:
     * Remove push notifications (see [https://github.com/wix/react-native-notifications/issues/207 this issue])

metadata/de.luhmer.owncloudnewsreader.yml

@@ -1297,6 +1297,7 @@ Builds:
 
   - versionName: 0.9.9.31
     versionCode: 150
+    disable: fails to build
     commit: v.0.9.9.31
     subdir: News-Android-App
     init:
@@ -1325,6 +1326,7 @@ Builds:
 
   - versionName: 0.9.9.32
     versionCode: 151
+    disable: fails to build
     commit: v.0.9.9.32
     subdir: News-Android-App
     init:

metadata/eu.pretix.pretixscan.droid.yml

@@ -37,25 +37,16 @@ Builds:
       - yes
     output: build/outputs/apk/pretix/release/app-pretix-release-unsigned.apk
 
-  - versionName: 1.2.3
-    versionCode: 18
-    commit: v1.2.3
-    subdir: pretixscan/app
-    submodules: true
-    gradle:
-      - yes
-    output: build/outputs/apk/pretix/release/app-pretix-release-unsigned.apk
-
   - versionName: 1.2.4
     versionCode: 19
-    commit: v1.2.4
+    commit: 1.2.4
     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.2.4
 CurrentVersionCode: 19

metadata/net.bible.android.activity.yml

@@ -489,86 +489,6 @@ Builds:
       - cd -
       - cp $$AndBibleJSwordTweaks$$/jsword.jar libs/jsword.jar
 
-  - versionName: 3.2.333
-    versionCode: 333
-    commit: v3.2.333-fdroid
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t stretch-backports npm g++ build-essential
-    gradle:
-      - yes
-    srclibs:
-      - AndBibleJSword@build-2
-      - AndBibleJSwordTweaks@v0.1.3
-    rm:
-      - app/libs/*
-    build:
-      - cd $$AndBibleJSwordTweaks$$
-      - TARGET_DIR="." JSWORD_PATH=$$AndBibleJSword$$ gradle install
-      - cd -
-      - cp $$AndBibleJSwordTweaks$$/jsword.jar libs/jsword.jar
-
-  - versionName: 3.2.334
-    versionCode: 334
-    commit: v3.2.334-fdroid
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t stretch-backports npm g++ build-essential
-    gradle:
-      - yes
-    srclibs:
-      - AndBibleJSword@build-2
-      - AndBibleJSwordTweaks@v0.1.3
-    rm:
-      - app/libs/*
-    build:
-      - cd $$AndBibleJSwordTweaks$$
-      - TARGET_DIR="." JSWORD_PATH=$$AndBibleJSword$$ gradle install
-      - cd -
-      - cp $$AndBibleJSwordTweaks$$/jsword.jar libs/jsword.jar
-
-  - versionName: 3.2.336
-    versionCode: 336
-    commit: v3.2.336-fdroid
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t stretch-backports npm g++ build-essential
-    gradle:
-      - yes
-    srclibs:
-      - AndBibleJSword@build-2
-      - AndBibleJSwordTweaks@v0.1.3
-    rm:
-      - app/libs/*
-    build:
-      - cd $$AndBibleJSwordTweaks$$
-      - TARGET_DIR="." JSWORD_PATH=$$AndBibleJSword$$ gradle install
-      - cd -
-      - cp $$AndBibleJSwordTweaks$$/jsword.jar libs/jsword.jar
-
-  - versionName: 3.2.339
-    versionCode: 339
-    commit: v3.2.339-fdroid
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t stretch-backports npm g++ build-essential
-    gradle:
-      - yes
-    srclibs:
-      - AndBibleJSword@build-2
-      - AndBibleJSwordTweaks@v0.1.3
-    rm:
-      - app/libs/*
-    build:
-      - cd $$AndBibleJSwordTweaks$$
-      - TARGET_DIR="." JSWORD_PATH=$$AndBibleJSword$$ gradle install
-      - cd -
-      - cp $$AndBibleJSwordTweaks$$/jsword.jar libs/jsword.jar
-
   - versionName: 3.2.340
     versionCode: 340
     commit: v3.2.340-fdroid

metadata/nl.asymmetrics.droidshows.yml

@@ -294,10 +294,6 @@ Builds:
     versionCode: 800
     commit: 8.0.0
 
-  - versionName: 7.9.9d
-    versionCode: 801
-    commit: 7.9.9d
-
   - versionName: 7.9.10
     versionCode: 70910
     commit: 7.9.10

metadata/org.dslul.openboard.inputmethod.latin.yml

@@ -19,21 +19,13 @@ Builds:
       - yes
     ndk: r20
 
-  - versionName: '1.1'
-    versionCode: 3
-    commit: v1.1
-    subdir: app
-    gradle:
-      - yes
-    ndk: r20
-
   - versionName: '1.2'
     versionCode: 4
     commit: v1.2
     subdir: app
     gradle:
       - yes
-    ndk: r20
+    ndk: r20b
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/org.walleth.yml

@@ -469,22 +469,12 @@ Builds:
       - online
     prebuild: sed -i -e '/kotlin.bintray.com/d' ../build.gradle
 
-  - versionName: 0.47.4
-    versionCode: 474
-    commit: 0.47.4
-    subdir: app
-    gradle:
-      - noGeth
-      - forFDroid
-      - online
-    prebuild: sed -i -e '/kotlin.bintray.com/d' ../build.gradle
-
 MaintainerNotes: |-
     We remove https://kotlin.bintray.com/kotlinx Maven repo from build.gradle
     because it isn't whitelisted while all needed artifacts are available via
     JCenter.
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.47.4
 CurrentVersionCode: 474