Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix warning in Versions.kt: const and naming convention.

Browse source
This commit is contained in:
Benoit Marty 2024-10-31 09:21:43 +01:00 • committed by Benoit Marty
parent 5eeb46702f
commit 6a1e9d0321
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle.kts
View file

@ -48,9 +48,9 @@ android {
} else { } else {
"io.element.android.x" "io.element.android.x"
} }
targetSdk = Versions.targetSdk targetSdk = Versions.TARGET_SDK
versionCode = Versions.versionCode versionCode = Versions.VERSION_CODE
versionName = Versions.versionName versionName = Versions.VERSION_NAME
// Keep abiFilter for the universalApk // Keep abiFilter for the universalApk
ndk { ndk {

8
plugins/src/main/kotlin/Versions.kt
View file

@ -50,10 +50,10 @@ private const val versionMinor = 7
private const val versionPatch = 3 private const val versionPatch = 3
object Versions { object Versions {
val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch const val VERSION_CODE = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch
val versionName = "$versionMajor.$versionMinor.$versionPatch" const val VERSION_NAME = "$versionMajor.$versionMinor.$versionPatch"
const val compileSdk = 35 const val COMPILE_SDK = 35
const val targetSdk = 35 const val TARGET_SDK = 35
// When updating the `minSdk`, make sure to update the value of `minSdkVersion` in the file `tools/release/release.sh` // When updating the `minSdk`, make sure to update the value of `minSdkVersion` in the file `tools/release/release.sh`
val minSdk = if (isEnterpriseBuild) 26 else 24 val minSdk = if (isEnterpriseBuild) 26 else 24

2
plugins/src/main/kotlin/extension/CommonExtension.kt
View file

@ -15,7 +15,7 @@ import java.io.File
fun CommonExtension<*, *, *, *, *, *>.androidConfig(project: Project) { fun CommonExtension<*, *, *, *, *, *>.androidConfig(project: Project) {
defaultConfig { defaultConfig {
compileSdk = Versions.compileSdk compileSdk = Versions.COMPILE_SDK
minSdk = Versions.minSdk minSdk = Versions.minSdk
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

6
samples/minimal/build.gradle.kts
View file

@ -14,9 +14,9 @@ android {
defaultConfig { defaultConfig {
applicationId = "io.element.android.samples.minimal" applicationId = "io.element.android.samples.minimal"
targetSdk = Versions.targetSdk targetSdk = Versions.TARGET_SDK
versionCode = Versions.versionCode versionCode = Versions.VERSION_CODE
versionName = Versions.versionName versionName = Versions.VERSION_NAME
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }