From 15557d1a02ffb0268458f4d009eb352df85a8133 Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Thu, 8 Feb 2024 20:58:57 +1300
Subject: [PATCH] =?UTF-8?q?Push=20to=20play=20store=20last=20in=20deploy.m?=
 =?UTF-8?q?js=20-=202.12=20=F0=9F=9A=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/build.gradle |  4 ++--
 deploy.mjs               | 25 +++++++++++++++----------
 package.json             |  4 ++--
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index bb4830c..e679ebe 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -85,8 +85,8 @@ android {
         applicationId "com.massive"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 36226
-        versionName "2.11"
+        versionCode 36227
+        versionName "2.12"
     }
     signingConfigs {
         release {
diff --git a/deploy.mjs b/deploy.mjs
index d52e36c..9c2c56d 100644
--- a/deploy.mjs
+++ b/deploy.mjs
@@ -29,16 +29,21 @@ let packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
 packageJson.version = versionName;
 writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
 
+const git = simpleGit();
+await git.add([packageJsonPath, buildFilePath]);
+await git.log(['-1']).then(log => {
+    const lastCommitMessage = log.latest.message;
+    const newCommitMessage = lastCommitMessage + ` - ${versionName} 🚀`;
+    return git.commit(newCommitMessage, [], ['--amend']);
+}).then(() => {
+    return git.addTag(versionCode.toString());
+}).then(() => {
+    return git.push('origin', 'HEAD', ['--tags']);
+}).catch(err => {
+    console.error('Error amending commit:', err);
+});
+
 const isWindows = os.platform() === 'win32';
 execSync(isWindows ? '.\\gradlew.bat bundleRelease' : './gradlew bundleRelease', { stdio: 'inherit' });
 execSync('bundle install', { stdio: 'inherit' });
-execSync('bundle exec fastlane supply --aab app/build/outputs/bundle/release/app-release.aab', { stdio: 'inherit' });
-
-const git = simpleGit();
-git.log(['-1']).then(log => {
-    const lastCommitMessage = log.latest.message;
-    const newCommitMessage = lastCommitMessage + ` - ${versionName} 🚀`;
-    return git.commit(newCommitMessage, [buildFilePath, packageJsonPath]);
-}).then(() => git.addTag(versionCode.toString()))
-    .then(() => git.push('origin', 'HEAD'))
-    .then(() => git.pushTags('origin'));
\ No newline at end of file
+execSync('bundle exec fastlane supply --aab app/build/outputs/bundle/release/app-release.aab', { stdio: 'inherit' });
\ No newline at end of file
diff --git a/package.json b/package.json
index 2e6d84a..30704cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "massive",
-  "version": "2.11",
+  "version": "2.12",
   "private": true,
   "license": "GPL-3.0-only",
   "scripts": {
@@ -70,4 +70,4 @@
   "engines": {
     "node": ">=16"
   }
-}
+}
\ No newline at end of file