From 6a1e9d0321dae7a571711254278c658493510f5f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 31 Oct 2024 09:21:43 +0100
Subject: [PATCH] Fix warning in Versions.kt: const and naming convention.

---
 app/build.gradle.kts                                 | 6 +++---
 plugins/src/main/kotlin/Versions.kt                  | 8 ++++----
 plugins/src/main/kotlin/extension/CommonExtension.kt | 2 +-
 samples/minimal/build.gradle.kts                     | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 74e8abcad8..52fb01f067 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -48,9 +48,9 @@ android {
         } else {
             "io.element.android.x"
         }
-        targetSdk = Versions.targetSdk
-        versionCode = Versions.versionCode
-        versionName = Versions.versionName
+        targetSdk = Versions.TARGET_SDK
+        versionCode = Versions.VERSION_CODE
+        versionName = Versions.VERSION_NAME
 
         // Keep abiFilter for the universalApk
         ndk {
diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt
index 61df38ebd7..8a14ce5161 100644
--- a/plugins/src/main/kotlin/Versions.kt
+++ b/plugins/src/main/kotlin/Versions.kt
@@ -50,10 +50,10 @@ private const val versionMinor = 7
 private const val versionPatch = 3
 
 object Versions {
-    val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch
-    val versionName = "$versionMajor.$versionMinor.$versionPatch"
-    const val compileSdk = 35
-    const val targetSdk = 35
+    const val VERSION_CODE = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch
+    const val VERSION_NAME = "$versionMajor.$versionMinor.$versionPatch"
+    const val COMPILE_SDK = 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`
     val minSdk = if (isEnterpriseBuild) 26 else 24
diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt
index 4f3f23d707..7c96386a6b 100644
--- a/plugins/src/main/kotlin/extension/CommonExtension.kt
+++ b/plugins/src/main/kotlin/extension/CommonExtension.kt
@@ -15,7 +15,7 @@ import java.io.File
 
 fun CommonExtension<*, *, *, *, *, *>.androidConfig(project: Project) {
     defaultConfig {
-        compileSdk = Versions.compileSdk
+        compileSdk = Versions.COMPILE_SDK
         minSdk = Versions.minSdk
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/samples/minimal/build.gradle.kts b/samples/minimal/build.gradle.kts
index e32054a272..48713af442 100644
--- a/samples/minimal/build.gradle.kts
+++ b/samples/minimal/build.gradle.kts
@@ -14,9 +14,9 @@ android {
 
     defaultConfig {
         applicationId = "io.element.android.samples.minimal"
-        targetSdk = Versions.targetSdk
-        versionCode = Versions.versionCode
-        versionName = Versions.versionName
+        targetSdk = Versions.TARGET_SDK
+        versionCode = Versions.VERSION_CODE
+        versionName = Versions.VERSION_NAME
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }