From 98f84fb6ea1521d4ba72ec8e0cc083d8e3b34f9d Mon Sep 17 00:00:00 2001
From: Chris H <zenchristo@gmail.com>
Date: Tue, 28 Nov 2023 21:48:56 -0500
Subject: [PATCH] Improve android versioning + autoupdate (#4240)

---
 .github/workflows/snapshots-android.yml | 29 ++++++++++++++++++++-----
 forge-gui-android/pom.xml               |  2 +-
 forge-gui-desktop/pom.xml               |  2 +-
 forge-gui-mobile/src/forge/Forge.java   |  2 +-
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/snapshots-android.yml b/.github/workflows/snapshots-android.yml
index fb613c59fe7..7c15afc6b53 100644
--- a/.github/workflows/snapshots-android.yml
+++ b/.github/workflows/snapshots-android.yml
@@ -87,16 +87,33 @@ jobs:
       - name: Build/Install/Publish to GitHub Packages Apache Maven
         run: |
           export _JAVA_OPTIONS="-Xmx2g"
+          d=$(date +%m-%d)
+          # Replace date in forge-gui-mobile/src/forge/Forge.java
+          sed -i -e "s/-SNAPSHOT/-SNAPSHOT-${d}/g" forge-gui-mobile/src/forge/Forge.java
           mvn -U -B -P android-release-build,android-release-sign install -e -Dsign.keystore=forge.keystore -Dsign.alias=Forge -Dsign.storepass=${{ secrets.SIGN_STORE_PASS }} -Dsign.keypass=${{ secrets.SIGN_STORE_PASS }}  -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=30.0.3 -Dmaven.test.skip=true
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Move important file
-        run: |
           mkdir -p  forge-gui-android/target/upload
           mv forge-gui-android/target/*-signed-aligned.apk forge-gui-android/target/upload/
           mv forge-gui-android/target/assets.zip forge-gui-android/target/upload/
-          ls forge-gui-android/target/upload/
+          cd forge-gui-android/target/upload/
+          # Get the first APK file in the folder
+          ls
+          apk_file=$(find . -maxdepth 1 -type f -name '*.apk' -print -quit)
+          
+          if [ -n "$apk_file" ]; then
+              version=$(echo "$apk_file" | grep -oP 'forge-android-\K\d+\.\d+\.\d+-SNAPSHOT' | sed 's/-signed-aligned.apk//')
+              echo "APK File: $apk_file"
+              echo "Version: $version"
+              mv *.apk "forge-android-$version-$d-signed-aligned.apk"
+
+              echo "$version-$d" > version.txt
+          else
+              echo "No .apk files found in the specified folder."
+          fi
+
+          cd -
+        
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
 
       - name: 📂 Sync files
         uses: SamKirkland/FTP-Deploy-Action@v4.3.4
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index d28f9685cd5..a95b556e9ad 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -6,7 +6,7 @@
         <packaging.type>jar</packaging.type>
         <build.min.memory>-Xms1024m</build.min.memory>
         <build.max.memory>-Xmx1536m</build.max.memory>
-        <alpha-version>1.6.59.001</alpha-version>
+        <alpha-version>1.6.59-SNAPSHOT</alpha-version>
         <sign.keystore>keystore</sign.keystore>
         <sign.alias>alias</sign.alias>
         <sign.storepass>storepass</sign.storepass>
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
index 6ca219c62c9..f68288dc302 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
@@ -118,7 +118,7 @@
                         </goals>
                         <configuration>
                             <!-- TODO: insert placeholder for latest version tag -->
-                            <fromRef>forge-1.6.55</fromRef>
+                            <fromRef>forge-1.6.58</fromRef>
                             <file>../forge-gui/release-files/CHANGES.txt</file>
                             <templateContent>
 <![CDATA[
diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index c5dd520ab42..73b608ab605 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -54,7 +54,7 @@ import java.nio.file.Paths;
 import java.util.*;
 
 public class Forge implements ApplicationListener {
-    public static final String CURRENT_VERSION = "1.6.59.001-SNAPSHOT";
+    public static final String CURRENT_VERSION = "1.6.59-SNAPSHOT";
 
     private static ApplicationListener app = null;
     static Scene currentScene = null;