Merge branch 'miscfixes416' into 'master'

Misc fixes

See merge request fdroid/fdroiddata!8161

metadata/com.tutpro.baresip.plus.yml

@@ -371,9 +371,9 @@ Builds:
       - popd
     ndk: r21d
 
-  - versionName: 10.0.0
+  - versionName: 10.1.0
-    versionCode: 24
+    versionCode: 25
-    commit: v10.0.0
+    commit: v10.1.0
     subdir: app
     sudo:
       - apt-get update || apt-get update
@@ -396,5 +396,5 @@ MaintainerNotes: make download-sources checks out master branches of several lib
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags v.*[0-9]$
-CurrentVersion: 10.0.0
+CurrentVersion: 10.1.0
-CurrentVersionCode: 24
+CurrentVersionCode: 25

metadata/com.tutpro.baresip.yml

@@ -1516,9 +1516,9 @@ Builds:
       - popd
     ndk: r21d
 
-  - versionName: 26.0.0
+  - versionName: 26.0.1
-    versionCode: 149
+    versionCode: 150
-    commit: 26.0.0
+    commit: 26.0.1
     subdir: app
     gradle:
       - yes
@@ -1538,5 +1538,5 @@ MaintainerNotes: make download-sources checks out master branches of several lib
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags ^[0-9.]+$
-CurrentVersion: 26.0.0
+CurrentVersion: 26.0.1
-CurrentVersionCode: 149
+CurrentVersionCode: 150

metadata/eu.faircode.email.yml

@@ -3638,9 +3638,19 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
+  - versionName: '1.1455'
+    versionCode: 1455
+    commit: '1.1455'
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
+    ndk: r21d
+
 MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '1.1453'
+CurrentVersion: '1.1455'
-CurrentVersionCode: 1453
+CurrentVersionCode: 1455

metadata/openfoodfacts.github.scrachx.openbeauty.yml

@@ -255,19 +255,9 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle
 
-  - versionName: 3.6.1
-    versionCode: 361
-    disable: fails to build
-    commit: 3.6.1
-    subdir: app
-    gradle:
-      - obf
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
   - versionName: 3.6.2
     versionCode: 362
+    disable: fails to build
     commit: 3.6.2
     subdir: app
     gradle:

metadata/openfoodfacts.github.scrachx.openfood.yml

@@ -416,19 +416,9 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle
 
-  - versionName: 3.6.1
-    versionCode: 361
-    disable: fails to build
-    commit: 3.6.1
-    subdir: app
-    gradle:
-      - 'off'
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
   - versionName: 3.6.2
     versionCode: 362
+    disable: fails to build
     commit: 3.6.2
     subdir: app
     gradle:

metadata/org.bandev.buddhaquotes.yml

@@ -58,13 +58,14 @@ Builds:
 
   - versionName: v2.0.0
     versionCode: 1011
+    disable: needs Java 11
     commit: v2.0.0
     subdir: app
     gradle:
       - yes
     prebuild: sed -i -e 's/6.8-rc-1/6.7/' ../gradle/wrapper/gradle-wrapper.properties
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: v2.0.0
 CurrentVersionCode: 1011

metadata/org.openpetfoodfacts.scanner.yml

@@ -202,19 +202,9 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle
 
-  - versionName: 3.6.1
-    versionCode: 361
-    disable: fails to build
-    commit: 3.6.1
-    subdir: app
-    gradle:
-      - opff
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
   - versionName: 3.6.2
     versionCode: 362
+    disable: fails to build
     commit: 3.6.2
     subdir: app
     gradle: