From ec2eb15118d99016203e1d8efed5bf51dd43221e Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Mon, 21 Oct 2024 23:45:57 -0500
Subject: [PATCH] Move app version to gradle catalog

---
 app/build.gradle.kts      | 4 ++--
 gradle/libs.versions.toml | 2 ++
 wear/build.gradle.kts     | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f316a7dc5..20f98a2f3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -51,8 +51,8 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 131107
-        versionName = "13.11.2"
+        versionCode = libs.versions.versionCode.get().toInt()
+        versionName = libs.versions.versionName.get()
         targetSdk = libs.versions.android.targetSdk.get().toInt()
         minSdk = libs.versions.android.minSdk.get().toInt()
         testInstrumentationRunner = "org.tasks.TestRunner"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 299d84b5e..4a0997657 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,4 +1,6 @@
 [versions]
+versionCode = "131107"
+versionName = "13.11.2"
 agp = "8.7.1"
 android-compileSdk = "34"
 android-minSdk = "24"
diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts
index 3ace2f483..38caa2ea6 100644
--- a/wear/build.gradle.kts
+++ b/wear/build.gradle.kts
@@ -7,14 +7,14 @@ plugins {
 
 android {
     namespace = "org.tasks"
-    compileSdk = 34
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "org.tasks"
+        versionCode = libs.versions.versionCode.get().toInt()
+        versionName = libs.versions.versionName.get()
+        targetSdk = libs.versions.android.targetSdk.get().toInt()
         minSdk = 30
-        targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
     }
 
     signingConfigs {