Better management of SDK version

.github/ISSUE_TEMPLATE/release.yml

@@ -36,6 +36,7 @@ body:
         - [ ] Push `main` and the new tag `v1.1.10` to origin
         - [ ] Checkout `develop`
         - [ ] Increase version in `./vector/build.gradle`
+        - [ ] Change the value of SDK_VERSION in the file `./matrix-sdk-android/build.gradle`
         - [ ] Commit and push `develop`
         - [ ] Wait for [Buildkite](https://buildkite.com/matrix-dot-org/element-android/builds?branch=main) to build the `main` branch.
         - [ ] Run the script `~/scripts/releaseElement.sh`. It will download the APKs from Buildkite check them and sign them.

matrix-sdk-android/build.gradle

@@ -31,9 +31,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        // Seems that the build tools 4.1.0 does not generate BuildConfig.VERSION_NAME anymore.
-        // Add it manually here. We may remove this trick in the future
-        buildConfigField "String", "VERSION_NAME", "\"0.0.1\""
+        buildConfigField "String", "SDK_VERSION", "\"1.2.2\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         resValue "string", "git_sdk_revision", "\"${gitRevision()}\""

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt

@@ -117,7 +117,7 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         }
 
         fun getSdkVersion(): String {
-            return BuildConfig.VERSION_NAME + " (" + BuildConfig.GIT_SDK_REVISION + ")"
+            return BuildConfig.SDK_VERSION + " (" + BuildConfig.GIT_SDK_REVISION + ")"
         }
     }
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt

@@ -111,7 +111,7 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         }
 
         fun getSdkVersion(): String {
-            return BuildConfig.VERSION_NAME + " (" + BuildConfig.GIT_SDK_REVISION + ")"
+            return BuildConfig.SDK_VERSION + " (" + BuildConfig.GIT_SDK_REVISION + ")"
         }
     }
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt

@@ -74,13 +74,13 @@ internal class UserAgentHolder @Inject constructor(private val context: Context,
         // if there is no user agent or cannot parse it
         if (null == systemUserAgent || systemUserAgent.lastIndexOf(")") == -1 || !systemUserAgent.contains("(")) {
             userAgent = (appName + "/" + appVersion + " ( Flavour " + flavorDescription
-                    + "; MatrixAndroidSDK_X " + BuildConfig.VERSION_NAME + ")")
+                    + "; MatrixAndroidSDK_X " + BuildConfig.SDK_VERSION + ")")
         } else {
             // update
             userAgent = appName + "/" + appVersion + " " +
                     systemUserAgent.substring(systemUserAgent.indexOf("("), systemUserAgent.lastIndexOf(")") - 1) +
                     "; Flavour " + flavorDescription +
-                    "; MatrixAndroidSDK_X " + BuildConfig.VERSION_NAME + ")"
+                    "; MatrixAndroidSDK_X " + BuildConfig.SDK_VERSION + ")"
         }
     }
 }