From 2c2eee7a3201036d31a39f03c2045b0dd5cd4574 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Mon, 26 Dec 2022 17:12:25 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.flipperdevices.app.yml        | 18 ++----------------
 metadata/de.yaacc.yml                      | 11 ++++++++---
 metadata/org.nutritionfacts.dailydozen.yml |  4 +---
 metadata/org.tuxpaint.yml                  |  5 ++++-
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/metadata/com.flipperdevices.app.yml b/metadata/com.flipperdevices.app.yml
index fb2710cc4d..5dab92b395 100644
--- a/metadata/com.flipperdevices.app.yml
+++ b/metadata/com.flipperdevices.app.yml
@@ -141,24 +141,9 @@ Builds:
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
 
-  - versionName: 1.3.0
-    versionCode: 711
-    commit: e4dedc5ac6d539157f0e33a1f69a183668be2b7e
-    subdir: instances/app
-    gradle:
-      - yes
-    prebuild:
-      - sed -i -e 's/ApkConfig.VERSION_CODE/$$VERCODE$$/' -e 's/ApkConfig.VERSION_NAME/"$$VERSION$$"/'
-        ../../build-logic/plugins/convention/src/main/kotlin/commonAndroid.kt
-      - sdkmanager 'cmake;3.22.1'
-    scandelete:
-      - build-logic/plugins/convention/build
-    ndk: r25b
-    gradleprops:
-      - IS_GOOGLE_FEATURE_AVAILABLE=false
-
   - versionName: 1.3.0
     versionCode: 713
+    disable: https://github.com/flipperdevices/Flipper-Android-App/issues/476
     commit: 9cb156e34a9a2d007c101636b521c16b324c0e49
     subdir: instances/app
     gradle:
@@ -166,6 +151,7 @@ Builds:
     prebuild:
       - sed -i -e 's/ApkConfig.VERSION_CODE/$$VERCODE$$/' -e 's/ApkConfig.VERSION_NAME/"$$VERSION$$"/'
         ../../build-logic/plugins/convention/src/main/kotlin/commonAndroid.kt
+      - sed -i -e '/glitchless.ru/d' ../../{build-logic,.}/settings.gradle.kts
       - sdkmanager 'cmake;3.22.1'
     scandelete:
       - build-logic/plugins/convention/build
diff --git a/metadata/de.yaacc.yml b/metadata/de.yaacc.yml
index 21fc4adbad..d2498c2a92 100644
--- a/metadata/de.yaacc.yml
+++ b/metadata/de.yaacc.yml
@@ -96,13 +96,18 @@ Builds:
   - versionName: 2.3.1
     versionCode: 27
     commit: a1ed73188aa2413a42a77807a548af8b976daab4
+    subdir: yaacc
+    sudo:
+      - apt-get update
+      - apt-get install -y maven
     gradle:
       - yes
-    output: yaacc/build/outputs/apk/release/yaacc-release-unsigned.apk
+    rm:
+      - test/libs
     preassemble:
-      - build
+      - :clingbuild:build
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 2.3.1
 CurrentVersionCode: 27
diff --git a/metadata/org.nutritionfacts.dailydozen.yml b/metadata/org.nutritionfacts.dailydozen.yml
index 587c4d4ba0..598b4366b9 100644
--- a/metadata/org.nutritionfacts.dailydozen.yml
+++ b/metadata/org.nutritionfacts.dailydozen.yml
@@ -189,9 +189,7 @@ Builds:
       - fdroid
     rm:
       - archive/OriginalApp.zip
-    prebuild:
-      - sed -i -e '/fabric/d; /com.google.gms/d' ../build.gradle build.gradle
-      - sed -i -e '/com.crashlytics.sdk/d; /firebase/d' build.gradle
+    prebuild: sed -i -e '/gms/d' -e '/firebase/d' {.,..}/build.gradle
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags ^v[0-9.]*$
diff --git a/metadata/org.tuxpaint.yml b/metadata/org.tuxpaint.yml
index a40154434c..6c9b116819 100644
--- a/metadata/org.tuxpaint.yml
+++ b/metadata/org.tuxpaint.yml
@@ -309,6 +309,9 @@ Builds:
     versionCode: 9283
     commit: 916a52be8221ab293372773373dc364c2f2f9b05
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y make pkg-config gettext
     gradle:
       - yes
     prebuild:
@@ -318,7 +321,7 @@ Builds:
       - app/src/main/jni/
     ndk: r19c
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 0.9.28c
 CurrentVersionCode: 9283