Merge branch 'miscfixes406' into 'master'

Misc fixes after cycle

See merge request fdroid/fdroiddata!7991

metadata/agersant.polaris.yml

@@ -27,23 +27,7 @@ Builds:
       - yes
     ndk: r21d
 
-  - versionName: 0.8.7
-    versionCode: 415293113
-    commit: v0.8.7
-    subdir: app
-    gradle:
-      - yes
-    ndk: r21d
-
-  - versionName: 0.8.7
-    versionCode: 415293114
-    commit: v0.8.7
-    subdir: app
-    gradle:
-      - yes
-    ndk: r21d
-
 AutoUpdateMode: Version v%v
-UpdateCheckMode: Tags
-CurrentVersion: 0.8.7
-CurrentVersionCode: 415293114
+UpdateCheckMode: Tags ^v[0-9.]*$
+CurrentVersion: 0.8.6
+CurrentVersionCode: 415293112

metadata/app.fedilab.fedilabtube.yml

@@ -158,7 +158,7 @@ Builds:
     commit: 1.10.2
     subdir: app
     gradle:
-      - fdroid_acad
+      - fdroid_peertube_apps_educ
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/net.redsolver.noteless.yml

@@ -14,6 +14,7 @@ Repo: https://github.com/redsolver/noteless.git
 Builds:
   - versionName: 1.3.1
     versionCode: 131
+    disable: fails to build
     commit: v1.3.1
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:

metadata/net.vonforst.evmap.yml

@@ -27,9 +27,9 @@ Builds:
       - GOOGLE_MAPS_API_KEY=
       - MAPBOX_API_KEY=pk.eyJ1IjoiZXZtYXAiLCJhIjoiY2tkbHQwdmNwMTF3YTJxbzhpbTVmZTlhaSJ9.jPLwERG4o6fAPP98wneezg
 
-  - versionName: 0.4.0-foss-foss
+  - versionName: 0.4.0
     versionCode: 27
-    commit: 0.4.0-foss
+    commit: 0.4.0
     subdir: app
     gradle:
       - foss
@@ -41,7 +41,7 @@ Builds:
       - GOOGLE_MAPS_API_KEY=
       - MAPBOX_API_KEY=pk.eyJ1IjoiZXZtYXAiLCJhIjoiY2tkbHQwdmNwMTF3YTJxbzhpbTVmZTlhaSJ9.jPLwERG4o6fAPP98wneezg
 
-AutoUpdateMode: Version +-foss %v
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 0.4.0-foss
+CurrentVersion: 0.4.0
 CurrentVersionCode: 27

metadata/openfoodfacts.github.scrachx.openbeauty.yml

@@ -255,41 +255,9 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle
 
-  - versionName: 3.4.3
-    versionCode: 343
-    disable: fails to build
-    commit: 3.4.3
-    subdir: app
-    gradle:
-      - obf
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
-  - versionName: 3.5.0
-    versionCode: 350
-    disable: fails to build
-    commit: 3.5.0
-    subdir: app
-    gradle:
-      - obf
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
-  - versionName: 3.6.0
-    versionCode: 360
-    disable: fails to build
-    commit: 3.6.0
-    subdir: app
-    gradle:
-      - obf
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
   - versionName: 3.6.1
     versionCode: 361
+    disable: fails to build
     commit: 3.6.1
     subdir: app
     gradle:

metadata/openfoodfacts.github.scrachx.openfood.yml

@@ -416,41 +416,9 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle
 
-  - versionName: 3.4.3
-    versionCode: 343
-    disable: fails to build
-    commit: 3.4.3
-    subdir: app
-    gradle:
-      - 'off'
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
-  - versionName: 3.5.0
-    versionCode: 350
-    disable: fails to build
-    commit: 3.5.0
-    subdir: app
-    gradle:
-      - 'off'
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
-  - versionName: 3.6.0
-    versionCode: 360
-    disable: fails to build
-    commit: 3.6.0
-    subdir: app
-    gradle:
-      - 'off'
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
   - versionName: 3.6.1
     versionCode: 361
+    disable: fails to build
     commit: 3.6.1
     subdir: app
     gradle:

metadata/org.openpetfoodfacts.scanner.yml

@@ -202,41 +202,9 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle
 
-  - versionName: 3.4.3
-    versionCode: 343
-    disable: fails to build
-    commit: 3.4.3
-    subdir: app
-    gradle:
-      - opff
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
-  - versionName: 3.5.0
-    versionCode: 350
-    disable: fails to build
-    commit: 3.5.0
-    subdir: app
-    gradle:
-      - opff
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
-  - versionName: 3.6.0
-    versionCode: 360
-    disable: fails to build
-    commit: 3.6.0
-    subdir: app
-    gradle:
-      - opff
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
   - versionName: 3.6.1
     versionCode: 361
+    disable: fails to build
     commit: 3.6.1
     subdir: app
     gradle: