From 1c0c36c6b148d06279195075ce9670aca329d013 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Tue, 8 Oct 2024 15:06:41 +0800
Subject: [PATCH] misc fixes

---
 metadata/ac.mdiq.podcini.R.yml             | 10 ----------
 metadata/audio.omgsoundboard.yml           |  1 +
 metadata/com.btcontract.wallet.yml         |  1 +
 metadata/com.infomaniak.drive.yml          |  1 +
 metadata/org.nutritionfacts.dailydozen.yml | 23 +++++++++++-----------
 5 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/metadata/ac.mdiq.podcini.R.yml b/metadata/ac.mdiq.podcini.R.yml
index 59c449e07e..2bf86a0813 100644
--- a/metadata/ac.mdiq.podcini.R.yml
+++ b/metadata/ac.mdiq.podcini.R.yml
@@ -249,16 +249,6 @@ Builds:
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
-  - versionName: 6.9.0
-    versionCode: 3020265
-    commit: 72f28ce9b757c2f45c65a1ba76d43c668041ba14
-    subdir: app
-    gradle:
-      - free
-    output: build/outputs/apk/free/release/*_.apk
-    prebuild: sed -i -e '/wearable/d' build.gradle
-    ndk: r26d
-
   - versionName: 6.9.1
     versionCode: 3020266
     commit: ceb6979d4abe7fcdd301089ee37d3cf3ce905c5b
diff --git a/metadata/audio.omgsoundboard.yml b/metadata/audio.omgsoundboard.yml
index 037d756f90..fcd9c3365d 100644
--- a/metadata/audio.omgsoundboard.yml
+++ b/metadata/audio.omgsoundboard.yml
@@ -35,6 +35,7 @@ Builds:
 
   - versionName: '12.0'
     versionCode: 12
+    disable: https://github.com/OMGSoundboard/android-app/issues/109
     commit: 3ef822856893674fc9626dee1c735e4a4fc0c091
     subdir: app
     gradle:
diff --git a/metadata/com.btcontract.wallet.yml b/metadata/com.btcontract.wallet.yml
index 8416ee1eed..0352f48e8e 100644
--- a/metadata/com.btcontract.wallet.yml
+++ b/metadata/com.btcontract.wallet.yml
@@ -401,6 +401,7 @@ Builds:
 
   - versionName: 2.5.9
     versionCode: 111
+    disable: https://github.com/akumaigorodski/wallet/issues/191
     commit: 453028c8724902661f27c1c7c4b10972f7a7f4ab
     subdir: app
     gradle:
diff --git a/metadata/com.infomaniak.drive.yml b/metadata/com.infomaniak.drive.yml
index e193cd96a8..25ef10e1e9 100644
--- a/metadata/com.infomaniak.drive.yml
+++ b/metadata/com.infomaniak.drive.yml
@@ -1220,6 +1220,7 @@ Builds:
     prebuild:
       - sed -i -e '/amazonaws/d;/gms/d' ../build.gradle
       - sed -i -e '/geniusscansdk/d;/gms/d' build.gradle
+      - echo 'android { lintOptions { checkReleaseBuilds false } }' >> build.gradle
     ndk: r25b
 
 AutoUpdateMode: Version
diff --git a/metadata/org.nutritionfacts.dailydozen.yml b/metadata/org.nutritionfacts.dailydozen.yml
index 0517e10811..9c8c6a49cd 100644
--- a/metadata/org.nutritionfacts.dailydozen.yml
+++ b/metadata/org.nutritionfacts.dailydozen.yml
@@ -232,26 +232,25 @@ Builds:
       - archive/OriginalApp.zip
     prebuild: sed -i -e '/gms/d' -e '/firebase/d' {.,..}/build.gradle
 
-  - versionName: '26'
-    versionCode: 90
-    disable: https://github.com/nutritionfactsorg/daily-dozen-android/issues/255
-    commit: 1f741381f10dfba0b4e80cefecaccc6c4eb2ae2a
-    subdir: app
-    gradle:
-      - fdroid
-    rm:
-      - archive/OriginalApp.zip
-    prebuild: sed -i -e '/gms/d' -e '/firebase/d' {.,..}/build.gradle
-
   - versionName: '27'
     versionCode: 91
     commit: d70853e16f3d7cd54ef93bb34d8597c714363b66
     subdir: app
     gradle:
       - fdroid
+    srclibs:
+      - ActiveAndroid@08c6335cd7324c6e72da536b0c6fffa5a798f6a2
     rm:
       - archive/OriginalApp.zip
-    prebuild: sed -i -e '/gms/d' -e '/firebase/d' {.,..}/build.gradle
+      - app/libs/*.jar
+    prebuild:
+      - sed -i -e '/gms/d' -e '/firebase/d' {.,..}/build.gradle
+      - sed -i -e 's/-XX:MaxPermSize=512m//' ../gradle.properties
+      - cp -a $$ActiveAndroid$$/src/com src/main/java
+      - sed -i -e '/dependencies {/a implementation "androidx.collection:collection:1.4.3"'
+        build.gradle
+      - sed -i -e 's/android.support.v4.util.LruCache/androidx.collection.LruCache/'
+        src/main/java/com/activeandroid/Cache.java
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v[0-9.]*$