android: Clean up app build.gradle
Removes the conflicting declaration of "version" and changes to versionCode that did nothing.
This commit is contained in:
parent
cf9f4f67dd
commit
8426e97f45
1 changed files with 2 additions and 22 deletions
|
@ -11,7 +11,6 @@ plugins {
|
|||
* next 680 years.
|
||||
*/
|
||||
val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toInt()
|
||||
var buildType = ""
|
||||
|
||||
@Suppress("UnstableApiUsage")
|
||||
android {
|
||||
|
@ -48,7 +47,7 @@ android {
|
|||
applicationId = "org.yuzu.yuzu_emu"
|
||||
minSdk = 30
|
||||
targetSdk = 33
|
||||
versionName = getVersion()
|
||||
versionName = getGitVersion()
|
||||
|
||||
ndk {
|
||||
abiFilters += listOf("arm64-v8a", "x86_64")
|
||||
|
@ -58,20 +57,6 @@ android {
|
|||
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.
|
||||
buildTypes {
|
||||
|
||||
|
@ -84,7 +69,6 @@ android {
|
|||
getDefaultProguardFile("proguard-android.txt"),
|
||||
"proguard-rules.pro"
|
||||
)
|
||||
defaultConfig.versionCode = 1
|
||||
}
|
||||
|
||||
register("relWithVersionCode") {
|
||||
|
@ -95,7 +79,6 @@ android {
|
|||
getDefaultProguardFile("proguard-android.txt"),
|
||||
"proguard-rules.pro"
|
||||
)
|
||||
defaultConfig.versionCode = autoVersion
|
||||
}
|
||||
|
||||
// builds a release build that doesn't need signing
|
||||
|
@ -109,9 +92,7 @@ android {
|
|||
"proguard-rules.pro"
|
||||
)
|
||||
versionNameSuffix = "-debug"
|
||||
enableAndroidTestCoverage = false
|
||||
isJniDebuggable = true
|
||||
defaultConfig.versionCode = 1
|
||||
}
|
||||
|
||||
// Signed by debug key disallowing distribution on Play Store.
|
||||
|
@ -120,7 +101,6 @@ android {
|
|||
isDebuggable = true
|
||||
isJniDebuggable = true
|
||||
versionNameSuffix = "-debug"
|
||||
defaultConfig.versionCode = 1
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -187,7 +167,7 @@ dependencies {
|
|||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
|
||||
}
|
||||
|
||||
fun getVersion(): String {
|
||||
fun getGitVersion(): String {
|
||||
var versionName = "0.0"
|
||||
|
||||
try {
|
||||
|
|
Loading…
Reference in a new issue