commit c3f04f594275969db4ccf62205586d2e4541f5de
parent 93716bd236d6f607da6b89b1e2e0690fd4870e5c
Author: rhunk <101876869+rhunk@users.noreply.github.com>
Date:   Wed,  1 Nov 2023 01:08:25 +0100

build: debug properties

Diffstat:
Mapp/build.gradle.kts | 13++++++-------
Mbuild.gradle.kts | 2+-
Mmanager/build.gradle.kts | 2+-
Mnative/build.gradle.kts | 2+-
4 files changed, 9 insertions(+), 10 deletions(-)

diff --git 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 @@ -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 @@ -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 @@ -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") } }