From d3dcb52aadd27204fa05d4e2c66862bf69bb6d0c Mon Sep 17 00:00:00 2001
From: LionZXY <nikita@kulikof.ru>
Date: Tue, 30 May 2023 06:44:55 +0000
Subject: [PATCH] Fix build for Flipper Mobile App

---
 metadata/com.flipperdevices.app.yml | 56 +++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/metadata/com.flipperdevices.app.yml b/metadata/com.flipperdevices.app.yml
index b758a7245b..1dcc8361a7 100644
--- a/metadata/com.flipperdevices.app.yml
+++ b/metadata/com.flipperdevices.app.yml
@@ -1,5 +1,3 @@
-AntiFeatures:
-  - Tracking
 Categories:
   - Security
 License: MIT
@@ -28,6 +26,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.3.0
     versionCode: 671
@@ -44,6 +44,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.3.0
     versionCode: 677
@@ -60,6 +62,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.3.0
     versionCode: 679
@@ -76,6 +80,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.3.0
     versionCode: 681
@@ -92,6 +98,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.3.0
     versionCode: 689
@@ -108,6 +116,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.3.0
     versionCode: 691
@@ -124,6 +134,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.3.0
     versionCode: 695
@@ -140,6 +152,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.3.0
     versionCode: 713
@@ -158,6 +172,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.4.0
     versionCode: 724
@@ -175,6 +191,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.4.0
     versionCode: 729
@@ -192,6 +210,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.4.0
     versionCode: 739
@@ -209,6 +229,8 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
   - versionName: 1.4.0
     versionCode: 747
@@ -226,27 +248,33 @@ Builds:
     ndk: r25b
     gradleprops:
       - IS_GOOGLE_FEATURE_AVAILABLE=false
+    antifeatures:
+      - Tracking
 
-  - versionName: 1.4.0
-    versionCode: 761
-    disable: https://github.com/flipperdevices/Flipper-Android-App/issues/494
-    commit: 01d0656bd005aaa08f7f4291abf02461dc9aac9a
+  - versionName: 1.5.0
+    versionCode: 998
+    commit: 9438ad1af3d5f537f07110e0e02ecd4e31bf4d31
     subdir: instances/app
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     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
-      - sed -i -e '/glitchless.ru/d' ../../{build-logic,.}/settings.gradle.kts
+      - printf "\nversion_code=$$VERCODE$$\nversion_name=$$VERSION$$" >> ../../gradle.properties
       - sdkmanager 'cmake;3.22.1'
     scandelete:
       - build-logic/plugins/convention/build
     ndk: r25b
     gradleprops:
-      - IS_GOOGLE_FEATURE_AVAILABLE=false
+      - is_google_feature=false
+      - is_sentry_publish=false
+      - is_metric_enabled=false
 
-AutoUpdateMode: None
-UpdateCheckMode: Tags (\d+\.){3}\d+
-UpdateCheckData: '|[\d.]+\.(\d+)||([\d.]+)\.\d+'
+AutoUpdateMode: Version
+UpdateCheckMode: Tags (\d+\.){3}\d+-release
+UpdateCheckData: '|[\d.]+\.(\d+)-release||([\d.]+)\.\d+-release'
 CurrentVersion: 1.5.0
-CurrentVersionCode: 1000
+CurrentVersionCode: 998