Merge branch 'omw37' into 'master'

OMW - stable 0.46

See merge request fdroid/fdroiddata!7371

metadata/is.xyz.omw.yml

@@ -78,17 +78,16 @@ Builds:
       - app/src/main/jniLibs
     ndk: r18b
 
-  - versionName: 0.46.0-17
-    versionCode: 35
-    disable: updatebot blunder
-    commit: 0.46.0-17
-    timeout: 40000
+  - versionName: 0.46.0-37
+    versionCode: 37
+    commit: 0.46.0-37
+    timeout: 30000
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y doxygen g++ pkgconf wget
     gradle:
-      - yes
-    output: app/build/outputs/apk/release/omw_release_*.apk
+      - mainline
+    output: app/build/outputs/apk/mainline/release/omw_release_*.apk
     prebuild:
       - sed -i -e '/Unzip/,+5d' buildscripts/include/setup-ndk.sh
       - sed -i -e 's/\ -Wl,-plugin-opt=-emulated-tls//' -e '/download-ndk/d' -e '/debugging\
@@ -106,7 +105,8 @@ Builds:
     scanignore:
       - app/src/main/assets
       - app/src/main/jniLibs
-    ndk: r18b
+      - buildscripts/downloads/*
+    ndk: r20b
 
 MaintainerNotes: |-
     - we use prebuild else fdroid scanner will detect the built libs as binaries on the second pass before running build, and we can't scanignore them (at start) since they don't exist yet, see https://gitlab.com/fdroid/fdroidserver/issues/635
@@ -114,5 +114,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags .*[0-9]$
-CurrentVersion: 0.46.0-18
-CurrentVersionCode: 18
+CurrentVersion: 0.46.0-37
+CurrentVersionCode: 37