From 8cdb3a45738ff9e2e78c5dfb04c748100cc7aadd Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Fri, 26 Jul 2024 15:14:45 +0800
Subject: [PATCH] misc fixes

---
 metadata/ac.mdiq.podcini.R.yml            | 11 +----------
 metadata/ch.threema.app.libre.yml         |  1 -
 metadata/com.anthonyla.paperize.yml       | 12 ------------
 metadata/de.tadris.fitness.yml            |  2 +-
 metadata/org.avmedia.gshockGoogleSync.yml | 11 +----------
 metadata/sushi.hardcore.droidfs.yml       |  1 +
 6 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/metadata/ac.mdiq.podcini.R.yml b/metadata/ac.mdiq.podcini.R.yml
index 5940986dc7..b0731477eb 100644
--- a/metadata/ac.mdiq.podcini.R.yml
+++ b/metadata/ac.mdiq.podcini.R.yml
@@ -56,18 +56,9 @@ Builds:
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
-  - versionName: 6.1.5
-    versionCode: 3020219
-    commit: 109a8b1274a582fbebad6d9b58c524056ab669d0
-    subdir: app
-    gradle:
-      - free
-    prebuild: sed -i -e '/wearable/d' build.gradle
-    ndk: r26d
-
   - versionName: 6.1.6
     versionCode: 3020220
-    commit: 0c9c13dbdae2f14e5eae8b5ea0ebc4ed86927466
+    commit: b9b7a9e5ee6ed8ca432c28d33ff34db901e1baff
     subdir: app
     gradle:
       - free
diff --git a/metadata/ch.threema.app.libre.yml b/metadata/ch.threema.app.libre.yml
index 36d6eec351..d0b3719727 100644
--- a/metadata/ch.threema.app.libre.yml
+++ b/metadata/ch.threema.app.libre.yml
@@ -169,7 +169,6 @@ Builds:
       - app/src/main/java/ch/threema/app/libs
       - app/libs
     prebuild:
-      - rm -rf ../.git
       - sed -i -e 's/enable true/enable false/' -e '/def googleDependencies/,/^    }/d'
         -e 's/maplibreDependency,.*/maplibreDependency/' build.gradle
       - sed -i -e '/exclusiveContent {/,/^        }/d' -e '/agconnect/d' ../build.gradle
diff --git a/metadata/com.anthonyla.paperize.yml b/metadata/com.anthonyla.paperize.yml
index 37a9339937..ee9a7a3056 100644
--- a/metadata/com.anthonyla.paperize.yml
+++ b/metadata/com.anthonyla.paperize.yml
@@ -11,18 +11,6 @@ Repo: https://github.com/Anthonyy232/Paperize.git
 Binaries: https://github.com/Anthonyy232/Paperize/releases/download/v%v/paperize-v%v.apk
 
 Builds:
-  - versionName: 1.6.3
-    versionCode: 28
-    commit: e5fab5cb5e5524a541a250c49144bebe7ac2a94d
-    subdir: app
-    gradle:
-      - yes
-    srclibs:
-      - reproducible-apk-tools@v0.2.7
-    ndk: 26.3.11579264
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-newlines
-      $$OUT$$ 'META-INF/services/*' 'res/*.json'
-
   - versionName: 1.6.4
     versionCode: 29
     commit: edfc942a6d42594ff76d3213302d75ef47e53ca9
diff --git a/metadata/de.tadris.fitness.yml b/metadata/de.tadris.fitness.yml
index 3070bc99ce..0652576e75 100644
--- a/metadata/de.tadris.fitness.yml
+++ b/metadata/de.tadris.fitness.yml
@@ -291,7 +291,7 @@ Builds:
     subdir: app
     sudo:
       - apt-get update
-      - apt-get install -y git-lfs openjdk-17-jdk-headless
+      - apt-get install -y git-lfs
     gradle:
       - yes
 
diff --git a/metadata/org.avmedia.gshockGoogleSync.yml b/metadata/org.avmedia.gshockGoogleSync.yml
index f13f937f34..fd4c35ab8b 100644
--- a/metadata/org.avmedia.gshockGoogleSync.yml
+++ b/metadata/org.avmedia.gshockGoogleSync.yml
@@ -582,22 +582,13 @@ Builds:
       - yes
     prebuild: sed -i -e 's/8.3-rc-2/8.3/' ../gradle/wrapper/gradle-wrapper.properties
 
-  - versionName: '13.5'
-    versionCode: 135
-    disable: https://github.com/izivkov/CasioGShockSmartSync/issues/87#issuecomment-2245415498
-    commit: 3fc81ae103ae3541304f3ebfe5a4cacdb7b25c11
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e 's/8.3-rc-2/8.3/' ../gradle/wrapper/gradle-wrapper.properties
-
   - versionName: '13.6'
     versionCode: 136
+    disable: https://github.com/izivkov/CasioGShockSmartSync/issues/87#issuecomment-2245415498
     commit: 4a67d586e8eb94a4d5dba2120101e92a8fe513e7
     subdir: app
     gradle:
       - yes
-    prebuild: sed -i -e 's/8.3-rc-2/8.3/' ../gradle/wrapper/gradle-wrapper.properties
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/sushi.hardcore.droidfs.yml b/metadata/sushi.hardcore.droidfs.yml
index 712e655526..b7daa5d41a 100644
--- a/metadata/sushi.hardcore.droidfs.yml
+++ b/metadata/sushi.hardcore.droidfs.yml
@@ -521,6 +521,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 37
+    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/15456
     commit: a62f32e364277268a37d556bd3907d30b7b86a0d
     subdir: app
     submodules: true