From eae819f0d6a75c92e8c78c109507054bccf61f56 Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 16 Jun 2025 14:38:48 -0400 Subject: [PATCH] Migrate BuildConfig Signed-off-by: crueter --- src/android/app/build.gradle.kts | 14 +++++--------- src/android/gradle.properties | 5 +++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index de5d891f01..b1b5a8bebf 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -1,9 +1,9 @@ -// SPDX-FileCopyrightText: Copyright yuzu/Citra Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-FileCopyrightText: Copyright yuzu/Citra Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + import android.annotation.SuppressLint import kotlin.collections.setOf import org.jlleitschuh.gradle.ktlint.reporter.ReporterType @@ -35,6 +35,7 @@ android { buildFeatures { viewBinding = true + buildConfig = true } compileOptions { @@ -62,11 +63,7 @@ android { targetSdk = 35 versionName = getGitVersion() - versionCode = if (System.getenv("AUTO_VERSIONED") == "true") { - autoVersion - } else { - 1 - } + versionCode = autoVersion ndk { @SuppressLint("ChromeOsAbiSupport") @@ -121,7 +118,6 @@ android { isDefault = true resValue("string", "app_name_suffixed", "eden Debug Release") signingConfig = signingConfigs.getByName("default") - isMinifyEnabled = true isDebuggable = true proguardFiles( getDefaultProguardFile("proguard-android.txt"), diff --git a/src/android/gradle.properties b/src/android/gradle.properties index 4fca1b5769..1efd91043f 100644 --- a/src/android/gradle.properties +++ b/src/android/gradle.properties @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Copyright 2025 yuzu Emulator Project +# SPDX-License-Identifier: GPL-3.0-or-later + # SPDX-FileCopyrightText: 2023 yuzu Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later @@ -14,7 +17,5 @@ android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official kotlin.parallel.tasks.in.project=true -android.defaults.buildfeatures.buildconfig=true - # Android Gradle plugin 8.0.2 android.suppressUnsupportedCompileSdk=34