From c3f04f594275969db4ccf62205586d2e4541f5de Mon Sep 17 00:00:00 2001
From: rhunk <101876869+rhunk@users.noreply.github.com>
Date: Wed, 1 Nov 2023 01:08:25 +0100
Subject: [PATCH] build: debug properties

---
 app/build.gradle.kts     | 13 ++++++-------
 build.gradle.kts         |  2 +-
 manager/build.gradle.kts |  2 +-
 native/build.gradle.kts  |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 345baf14..b5f316c9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.api.BaseVariantOutputImpl
+import org.gradle.configurationcache.extensions.capitalized
 
 plugins {
     alias(libs.plugins.androidApplication)
@@ -33,7 +34,7 @@ android {
             proguardFiles += file("proguard-rules.pro")
         }
         debug {
-            (properties["debug_assemble_task"] == null).also {
+            (properties["debug_flavor"] == null).also {
                 isDebuggable = !it
                 isMinifyEnabled = it
                 isShrinkResources = it
@@ -150,16 +151,14 @@ dependencies {
 }
 
 afterEvaluate {
-    properties["debug_assemble_task"]?.let { tasks.findByName(it.toString()) }?.doLast {
+    properties["debug_flavor"]?.toString()?.let { tasks.findByName("install${it.capitalized()}Debug") }?.doLast {
         runCatching {
             exec {
-                commandLine("adb", "shell", "am", "force-stop", "com.snapchat.android")
+                commandLine("adb", "shell", "am", "force-stop", properties["debug_package_name"])
             }
+            Thread.sleep(1000L)
             exec {
-                commandLine("adb", "install", "-r", "-d", apkDebugFile.absolutePath)
-            }
-            exec {
-                commandLine("adb", "shell", "am", "start", "com.snapchat.android")
+                commandLine("adb", "shell", "am", "start", properties["debug_package_name"])
             }
         }
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index 6aa3c859..f5987e9b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ var versionCode = 1 //"1" for now until stable release
 rootProject.ext.set("appVersionName", versionName)
 rootProject.ext.set("appVersionCode", versionCode)
 rootProject.ext.set("applicationId", "me.rhunk.snapenhance")
-rootProject.ext.set("buildHash", properties["custom_build_hash"] ?: java.security.SecureRandom().nextLong(1000000000, 99999999999).toString(16))
+rootProject.ext.set("buildHash", properties["debug_build_hash"] ?: java.security.SecureRandom().nextLong(1000000000, 99999999999).toString(16))
 
 tasks.register("getVersion") {
     doLast {
diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts
index d8207de6..60ee6a7f 100644
--- a/manager/build.gradle.kts
+++ b/manager/build.gradle.kts
@@ -42,7 +42,7 @@ android {
             proguardFiles += file("proguard-rules.pro")
         }
         debug {
-            (properties["debug_assemble_task"] == null).also {
+            (properties["debug_flavor"] == null).also {
                 isDebuggable = !it
                 isMinifyEnabled = it
                 isShrinkResources = it
diff --git a/native/build.gradle.kts b/native/build.gradle.kts
index 9f0acdbc..8ac64c17 100644
--- a/native/build.gradle.kts
+++ b/native/build.gradle.kts
@@ -29,7 +29,7 @@ android {
             }
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters += properties["custom_abi_filters"]?.toString()?.split(",")
+                abiFilters += properties["debug_abi_filters"]?.toString()?.split(",")
                     ?: listOf("arm64-v8a", "armeabi-v7a")
             }
         }