From 03340c7b577d601742e33e28cab329dd166253ab Mon Sep 17 00:00:00 2001
From: Naveen Singh <36371707+naveensingh@users.noreply.github.com>
Date: Mon, 26 May 2025 14:13:36 +0530
Subject: [PATCH] build: move app version to gradle.properties (#158)

---
 app/build.gradle.kts      | 8 ++++----
 gradle.properties         | 5 +++++
 gradle/libs.versions.toml | 4 ----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 57045c1a..62927a17 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,11 +26,11 @@ android {
     compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt()
 
     defaultConfig {
-        applicationId = libs.versions.app.version.appId.get()
+        applicationId = project.property("APP_ID").toString()
         minSdk = project.libs.versions.app.build.minimumSDK.get().toInt()
         targetSdk = project.libs.versions.app.build.targetSDK.get().toInt()
-        versionName = project.libs.versions.app.version.versionName.get()
-        versionCode = project.libs.versions.app.version.versionCode.get().toInt()
+        versionName = project.property("VERSION_NAME").toString()
+        versionCode = project.property("VERSION_CODE").toString().toInt()
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
         setProperty("archivesBaseName", "keyboard-$versionCode")
@@ -106,7 +106,7 @@ android {
         kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get()
     }
 
-    namespace = libs.versions.app.version.appId.get()
+    namespace = project.property("APP_ID").toString()
 
     lint {
         checkReleaseBuilds = false
diff --git a/gradle.properties b/gradle.properties
index d1e2283e..3f027543 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,3 +2,8 @@ android.enableJetifier=true
 android.useAndroidX=true
 android.nonTransitiveRClass=false
 org.gradle.jvmargs=-Xmx4g
+
+# Versioning
+VERSION_NAME=1.1.1
+VERSION_CODE=3
+APP_ID=org.fossify.keyboard
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3fac665b..4b548060 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,10 +20,6 @@ app-build-targetSDK = "34"
 app-build-minimumSDK = "26"
 app-build-javaVersion = "VERSION_17"
 app-build-kotlinJVMTarget = "17"
-#versioning
-app-version-appId = "org.fossify.keyboard"
-app-version-versionCode = "3"
-app-version-versionName = "1.1.1"
 [libraries]
 #AndroidX
 androidx-autofill = { module = "androidx.autofill:autofill", version.ref = "androidx-autofill" }