Misc fixes after cycle

metadata/com.android.keepass.yml

@@ -419,7 +419,7 @@ Builds:
     rm:
       - app/libs
     prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
-    ndk: r21
+    ndk: r21b
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/com.duckduckgo.mobile.android.yml

@@ -611,7 +611,7 @@ Builds:
     gradle:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
-    ndk: r21
+    ndk: r21b
 
 MaintainerNotes: Cannot use AUM/UCM because version code and version name are dynamic.
 

metadata/com.gianlu.aria2app.yml

@@ -578,7 +578,7 @@ Builds:
       - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     scandelete:
       - aria2lib/src/main/jniLibs
-    ndk: r21
+    ndk: r21b
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/com.mmazzarolo.breathly.yml

@@ -67,56 +67,9 @@ Builds:
     scandelete:
       - node_modules/
 
-  - versionName: '1.5'
-    versionCode: 6
-    commit: android-1.5
-    subdir: android/app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t stretch-backports npm
-      - npm -g install yarn
-    init: yarn install
-    gradle:
-      - yes
-    rm:
-      - node_modules/@react-native-community/async-storage/packages/storage-legacy/android/build/
-      - node_modules/react-native/template/
-      - node_modules/jetifier/lib/
-    prebuild:
-      - truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel
-      - sed -i -e 's/enableSeparateBuildPerCPUArchitecture = true/enableSeparateBuildPerCPUArchitecture
-        = false/' build.gradle
-    scanignore:
-      - android/build.gradle
-    scandelete:
-      - node_modules/
-
-  - versionName: '1.7'
-    versionCode: 8
-    commit: android-1.7
-    subdir: android/app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t stretch-backports npm
-      - npm -g install yarn
-    init: yarn install
-    gradle:
-      - yes
-    rm:
-      - node_modules/@react-native-community/async-storage/packages/storage-legacy/android/build/
-      - node_modules/react-native/template/
-      - node_modules/jetifier/lib/
-    prebuild:
-      - truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel
-      - sed -i -e 's/enableSeparateBuildPerCPUArchitecture = true/enableSeparateBuildPerCPUArchitecture
-        = false/' build.gradle
-    scanignore:
-      - android/build.gradle
-    scandelete:
-      - node_modules/
-
   - versionName: '1.8'
     versionCode: 9
+    disable: fails to build nodejs too old
     commit: android-1.8
     subdir: android/app
     sudo:

metadata/com.nextcloud.android.beta.yml

@@ -4682,22 +4682,6 @@ Builds:
     scandelete:
       - src/androidTest
 
-  - versionName: '20200521'
-    versionCode: 20200521
-    commit: dev-20200521
-    submodules: true
-    gradle:
-      - versionDev
-    rm:
-      - user_manual
-      - gplay.gradle
-    prebuild:
-      - mkdir -p $HOME/.gradle
-      - echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
-        > $HOME/.gradle/gradle.properties
-    scandelete:
-      - src/androidTest
-
   - versionName: '20200523'
     versionCode: 20200523
     commit: dev-20200523

metadata/com.rfo.LASKmobile.yml

@@ -20,12 +20,12 @@ Builds:
 
   - versionName: v0.7.9
     versionCode: 501
-    commit: vv0.7.9
+    commit: v0.7.9
     subdir: app
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 CurrentVersion: v0.7.9
 CurrentVersionCode: 501

metadata/com.samco.trackandgraph.yml

@@ -34,14 +34,7 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 1.6.0
-    versionCode: 10600
-    commit: v1.6.0
-    subdir: app
-    gradle:
-      - yes
-
 AutoUpdateMode: Version v%v
-UpdateCheckMode: Tags
-CurrentVersion: 1.6.0
-CurrentVersionCode: 10600
+UpdateCheckMode: Tags v
+CurrentVersion: 1.5.1
+CurrentVersionCode: 10501

metadata/com.servoz.appsdisabler.yml

@@ -27,13 +27,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: '1.7'
-    versionCode: 3
-    commit: v1.7
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: '1.8'
     versionCode: 4
     commit: v1.8

metadata/com.tutpro.baresip.yml

@@ -1215,7 +1215,7 @@ Builds:
       - make download-sources
       - make install-all
       - popd
-    ndk: r21
+    ndk: r21b
 
 MaintainerNotes: make download-sources checks out master branches of several libraries;
     this can cause build failures.

metadata/com.zoffcc.applications.trifa.yml

@@ -294,15 +294,6 @@ Builds:
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
 
-  - versionName: 1.0.39
-    versionCode: 10039
-    commit: 1.0.39
-    subdir: android-refimpl-app/app
-    gradle:
-      - yes
-    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk: r13b
-
   - versionName: 1.0.41
     versionCode: 10041
     commit: 1.0.41

metadata/eu.faircode.email.yml

@@ -2426,7 +2426,7 @@ Builds:
     gradle:
       - full
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
-    ndk: r21
+    ndk: r21b
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/eu.siacs.conversations.yml

@@ -1830,7 +1830,7 @@ Builds:
     prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
         -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.30039'" -e
         '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
-    ndk: r21
+    ndk: r21b
 
 MaintainerNotes: |-
     For 2.8.0 we replace the webrtc.aar with the latest M79 from maven, but

metadata/freemap.opentrail.yml

@@ -59,34 +59,9 @@ Builds:
       - pushd $$freemaplibProj$$
       - $$MVN3$$ install
 
-  - versionName: 0.5-final
-    versionCode: 6
-    disable: fails to build, missing srclib deps
-    commit: 0.5-final
-    subdir: app
-    gradle:
-      - yes
-    srclibs:
-      - andromaps@ec817a0b869ad41d0dc661bcca0b8595dc719003
-      - freemaplib@d409e3db4b84509108e4e406f8b4e721d9223d1b
-      - freemaplibProj@a15388343b5cd0498efe70586c2c863a4870959f
-      - JCoord@aa4c5aa25fee1179c57817bbb2c7f61aa1c5328d
-      - javaproj@fecb0f3a6b52a4eb4e44889f10c07183cc592a3d
-    build:
-      - pushd $$freemaplib$$
-      - $$MVN3$$ install
-      - popd
-      - pushd $$JCoord$$
-      - $$MVN3$$ install -DskipTests
-      - popd
-      - pushd $$javaproj$$
-      - $$MVN3$$ install -DskipTests
-      - popd
-      - pushd $$freemaplibProj$$
-      - $$MVN3$$ install
-
   - versionName: 0.5.3
     versionCode: 9
+    disable: fails to build, missing srclib deps
     commit: 0.5.3
     subdir: app
     gradle:

metadata/me.zhanghai.android.files.yml

@@ -77,7 +77,7 @@ Builds:
     rm:
       - app/src/main/java/me/zhanghai/android/files/nonfree
     prebuild: find -type f -exec sed -i '/\/\/#ifdef NONFREE/,/\/\/#endif/d' {} +
-    ndk: r21
+    ndk: r21b
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags ^v.+$

metadata/net.osmand.plus.yml

@@ -3166,102 +3166,6 @@ Builds:
       - cp $$icu50-2-1-patched$$/icu4j/icu4j.jar ../OsmAnd-java/libs/
     ndk: r17c
 
-  - versionName: 3.7.1
-    versionCode: 371
-    commit: v3.7.1
-    subdir: android/OsmAnd
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install --yes swig
-    gradle:
-      - full
-      - legacy
-      - fat
-    srclibs:
-      - icu50-2-1-patched@0d825a9779eeb8ee35977ddf8bb4bea4119bf638
-      - osmand-external-skia@android/oreo
-    rm:
-      - android/OsmAnd-java/libs/*.jar
-      - android/OsmAnd-java/*.jar
-      - android/OsmAnd/libs/*.jar
-      - android/OsmAndCore-sample
-    prebuild:
-      - sed -i -e "/.*OsmAndCore.*SNAPSHOT.*/d" ../OsmAnd/build.gradle
-      - sed -i -e "/ivy {/,+6d" ../OsmAnd/build.gradle
-      - sed -i -e '/qt.*Compile/d' -e '/com.google.firebase/d' build.gradle ../plugins/Osmand-ParkingPlugin/build.gradle
-        ../plugins/Osmand-SRTMPlugin/build.gradle ../plugins/Osmand-Skimaps/build.gradle
-        ../plugins/Osmand-Nautical/build.gradle
-      - sed -i -e "s/System.getenv(\"APK_VERSION\")/\"$$VERSION$$\"/g" build.gradle
-      - sed -i -e "s/System.getenv(\"APK_NUMBER_VERSION\")/\"$$VERCODE$$\"/g" build.gradle
-      - sed -i -e "s/System.getenv(\"APP_FEATURES\")/\"+play_market +gps_status -parking_plugin
-        -blackberry -amazon -route_nav\"/g" build.gradle
-      - sed -i -e "s/System.getenv(\"APP_NAME\")/\"OsmAnd~\"/g" build.gradle
-      - sed -i -e "s/System.getenv(\"TARGET_APP_NAME\")/\"OsmAnd~\"/g" build.gradle
-      - sed -i -e '/com.android.vending.BILLING/d' AndroidManifest.xml
-      - "sed -i -e \"s/implementation fileTree.*/ implementation fileTree(include:\
-        \ ['icu4j.jar'], dir: 'libs')\\n implementation 'commons-logging:commons-logging:1.1.1'\\\
-        n implementation group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3'\\\
-        n implementation 'org.json:json:20090211'\\n implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'\\\
-        n implementation 'net.sf.kxml:kxml2:2.3.0'\\n implementation 'org.beanshell:bsh-core:2.0b4'\\\
-        n implementation 'fr.univ-valenciennes:bzip2:1.0'\\n implementation 'com.moparisthebest:junidecode:0.1.1'\\\
-        n implementation 'com.vividsolutions:jts-core:1.14.0'/\" ../OsmAnd-java/build.gradle"
-      - "sed -i -e \"s/implementation fileTree.*/implementation fileTree(include:\
-        \ ['classes.jar','icu4j.jar'], dir: 'libs')\\n implementation group: 'net.sf.trove4j',\
-        \ name: 'trove4j', version: '3.0.3'\\n/\" build.gradle"
-      - sed -i -e '/facebook/d' build.gradle
-      - sed -i -e "s/, ':OsmAndCore-sample'//" ../settings.gradle
-      - pushd ../../core-legacy/externals
-      - sed -i "s/# Extract/sha256sum \$SRCLOC\/upstream.tar.bz2 | grep 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677
-        || { echo 'Failed checksum' 1>\&2; exit; }/" protobuf/configure.sh
-      - sed -i "/# Download/,+8d" skia/configure.sh
-      - sed -i "s/# Patch/cp -r $(echo $$osmand-external-skia$$ | sed 's/\//\\\//g')
-        \$SRCLOC\/upstream.original/" skia/configure.sh
-      - popd
-      - echo "org.gradle.jvmargs=-XX:MaxHeapSize=2048m" >> ../gradle.properties
-    scanignore:
-      - help/website/help/map-legend_nautical.png
-      - help/website/help/map-legend_default.png
-      - help/website/images/dvr/4p-en.png
-      - help/website/images/blog/ios-2-0/con-scrn-1.png
-      - help/website/images/blog/ios-2-0/con-scrn-2.png
-      - help/website/images/blog/ios-2-0/interf-2.png
-      - help/website/images/blog/ios-2-0/navigat-6.png
-      - android/OsmAnd/assets/fonts/RobotoSlab-Regular.ttf
-      - help/website/fonts/Roboto-Regular-webfont.ttf
-      - help/website/fonts/Roboto-Bold-webfont.woff
-      - help/website/fonts/Roboto-Regular-webfont.eot
-      - help/website/fonts/Roboto-Bold-webfont.ttf
-      - help/website/fonts/Roboto-Regular-webfont.woff
-      - help/website/fonts/Roboto-Bold-webfont.eot
-    build:
-      - pushd ../../OsmAnd-core/wrappers/android/
-      - sed -i -e "/Native/d" settings.gradle
-      - sed -i -e "/Native/d" build.gradle
-      - sed -i -e "/compileTask.*copyNdkSharedLibs/d" build.gradle
-      - sed -i -e "/compileTask.*copyQtSharedLibs/d" build.gradle
-      - sed -i -e "/compileTask.*copyQtJarLibs/d" build.gradle
-      - sed -i -e "s/mavenCentral()/mavenCentral()\n google()\n jcenter()/" build.gradle
-      - gradle assembleRelease
-      - cd build/outputs/aar
-      - unzip OsmAndCore_android-release.aar
-      - cp classes.jar ../../../../../../android/OsmAnd/libs/
-      - popd
-      - pushd $$icu50-2-1-patched$$/icu4j
-      - ant jar
-      - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/brkitr/*"
-      - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/coll/*"
-      - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/curr/*"
-      - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/lang/*"
-      - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/rbnf/*"
-      - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/region/*"
-      - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/translit/*"
-      - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/zone/*"
-      - popd
-      - cp $$icu50-2-1-patched$$/icu4j/icu4j.jar libs/
-      - cp $$icu50-2-1-patched$$/icu4j/icu4j.jar ../OsmAnd-java/libs/
-    ndk: r17c
-
   - versionName: 3.7.2
     versionCode: 372
     commit: v3.7.2

metadata/org.blitzortung.android.app.yml

@@ -195,14 +195,7 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 2.1-beta1
-    versionCode: 253
-    commit: 2.1-beta1_253
-    subdir: app
-    gradle:
-      - yes
-
 AutoUpdateMode: Version %v_%c
-UpdateCheckMode: Tags
-CurrentVersion: 2.1-beta1
-CurrentVersionCode: 253
+UpdateCheckMode: Tags ^[0-9]+\.[0-9]+\.[0-9]+\_[0-9]+$
+CurrentVersion: 2.0.19_252
+CurrentVersionCode: 252

metadata/org.nonononoki.hendroid.yml

@@ -78,14 +78,6 @@ Builds:
       - yes
     prebuild: sed -i -e '/fabric/d' -e '/osborn/d' build.gradle ../build.gradle
 
-  - versionName: 1.11.5
-    versionCode: 150
-    commit: 1.11.5
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/fabric/d' -e '/osborn/d' build.gradle ../build.gradle
-
   - versionName: 1.11.6
     versionCode: 151
     commit: 1.11.6

metadata/ru.evgeniy.dpitunnel.yml

@@ -68,7 +68,7 @@ Builds:
     gradle:
       - yes
     prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
-    ndk: r20b
+    ndk: r21b
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags