Merge branch 'miscfixes407' into 'master'

Misc fixes

See merge request fdroid/fdroiddata!7921

metadata/app.olauncher.yml

@@ -88,17 +88,9 @@ Builds:
     gradle:
       - yes
 
-  - versionName: v2.3
-    versionCode: 23
-    commit: v2.3
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: v2.4
     versionCode: 24
-    disable: fails to build
-    commit: v2.4
+    commit: c5f7ff59c71145aec7165f32f43975fc52a23e8a
     subdir: app
     gradle:
       - yes

metadata/eu.bauerj.paperless_app.yml

@@ -27,35 +27,6 @@ Builds:
       - $$flutter$$/bin/flutter pub run build_runner build
       - $$flutter$$/bin/flutter build apk
 
-  - versionName: 0.0.6
-    versionCode: 6
-    disable: beta
-    commit: 0.0.6
-    output: build/app/outputs/apk/release/app-release.apk
-    srclibs:
-      - flutter@1.17.3
-    prebuild: echo 'android.applicationVariants.all { variant -> variant.outputs.all
-        { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter pub get
-      - $$flutter$$/bin/flutter pub run build_runner build
-      - $$flutter$$/bin/flutter build apk
-
-  - versionName: 0.0.7
-    versionCode: 7
-    commit: 0.0.7
-    output: build/app/outputs/apk/release/app-release.apk
-    srclibs:
-      - flutter@1.22.5
-    prebuild: echo 'android.applicationVariants.all { variant -> variant.outputs.all
-        { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter pub get
-      - $$flutter$$/bin/flutter pub run build_runner build
-      - $$flutter$$/bin/flutter build apk
-
   - versionName: 0.0.8
     versionCode: 8
     disable: Unexpected version/version code in output

metadata/eu.faircode.email.yml

@@ -3548,9 +3548,19 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
+  - versionName: '1.1429'
+    versionCode: 1429
+    commit: '1.1429'
+    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.1426'
-CurrentVersionCode: 1426
+CurrentVersion: '1.1429'
+CurrentVersionCode: 1429

metadata/eu.kanade.tachiyomi.yml

@@ -363,16 +363,6 @@ Builds:
       - sed -i -e '/play-services/d; /firebase/d' build.gradle
       - sed -i -e '/google-services/d' -e '/oss-licenses/d' ../build.gradle.kts build.gradle
 
-  - versionName: 0.10.6
-    versionCode: 52
-    commit: v0.10.6
-    subdir: app
-    gradle:
-      - fdroid
-    prebuild:
-      - sed -i -e '/play-services/d; /firebase/d' build.gradle
-      - sed -i -e '/google-services/d' -e '/oss-licenses/d' ../build.gradle.kts build.gradle
-
   - versionName: 0.10.7
     versionCode: 53
     commit: v0.10.7

metadata/theredspy15.ltecleanerfoss.yml

@@ -85,6 +85,7 @@ Builds:
 
   - versionName: 4.2.1
     versionCode: 38
+    disable: fails to build
     commit: 4.2.1
     subdir: app
     gradle: