daniel/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android synced 2024-12-23 08:31:20 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

android: Clean up app build.gradle

Browse Source 
Removes the conflicting declaration of "version" and changes to versionCode that did nothing.
This commit is contained in:
Charles Lombardo 2023-05-27 17:13:46 -04:00 committed by bunnei
parent cf9f4f67dd
commit 8426e97f45
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/android/app/build.gradle.kts
View File

@ -11,7 +11,6 @@ plugins {
* next 680 years. * next 680 years.
*/ */
val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toInt() val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toInt()
var buildType = ""
@Suppress("UnstableApiUsage") @Suppress("UnstableApiUsage")
android { android {
@ -48,7 +47,7 @@ android {
applicationId = "org.yuzu.yuzu_emu" applicationId = "org.yuzu.yuzu_emu"
minSdk = 30 minSdk = 30
targetSdk = 33 targetSdk = 33
versionName = getVersion() versionName = getGitVersion()
ndk { ndk {
abiFilters += listOf("arm64-v8a", "x86_64") abiFilters += listOf("arm64-v8a", "x86_64")
@ -58,20 +57,6 @@ android {
buildConfigField("String", "BRANCH", "\"${getBranch()}\"") buildConfigField("String", "BRANCH", "\"${getBranch()}\"")
} }
signingConfigs {
//release {
// storeFile file('')
// storePassword System.getenv('ANDROID_KEYPASS')
// keyAlias = 'key0'
// keyPassword System.getenv('ANDROID_KEYPASS')
//}
}
applicationVariants.all { variant ->
buildType = variant.buildType.name // sets the current build type
true
}
// Define build types, which are orthogonal to product flavors. // Define build types, which are orthogonal to product flavors.
buildTypes { buildTypes {
@ -84,7 +69,6 @@ android {
getDefaultProguardFile("proguard-android.txt"), getDefaultProguardFile("proguard-android.txt"),
"proguard-rules.pro" "proguard-rules.pro"
) )
defaultConfig.versionCode = 1
} }
register("relWithVersionCode") { register("relWithVersionCode") {
@ -95,7 +79,6 @@ android {
getDefaultProguardFile("proguard-android.txt"), getDefaultProguardFile("proguard-android.txt"),
"proguard-rules.pro" "proguard-rules.pro"
) )
defaultConfig.versionCode = autoVersion
} }
// builds a release build that doesn't need signing // builds a release build that doesn't need signing
@ -109,9 +92,7 @@ android {
"proguard-rules.pro" "proguard-rules.pro"
) )
versionNameSuffix = "-debug" versionNameSuffix = "-debug"
enableAndroidTestCoverage = false
isJniDebuggable = true isJniDebuggable = true
defaultConfig.versionCode = 1
} }
// Signed by debug key disallowing distribution on Play Store. // Signed by debug key disallowing distribution on Play Store.
@ -120,7 +101,6 @@ android {
isDebuggable = true isDebuggable = true
isJniDebuggable = true isJniDebuggable = true
versionNameSuffix = "-debug" versionNameSuffix = "-debug"
defaultConfig.versionCode = 1
} }
} }
@ -187,7 +167,7 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
} }
fun getVersion(): String { fun getGitVersion(): String {
var versionName = "0.0" var versionName = "0.0"
try { try {