appmachine 0.0.8 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "appmachine",
-	"version": "0.0.8",
+	"version": "0.0.10",
 	"description": "Native iOS/Android shell generator via GitHub Actions",
 	"author": "Max Matinpalo",
 	"type": "module",

package/src/android.yml

@@ -14,6 +14,7 @@ jobs:
       APP_SERVER_URL: ${{ vars.APP_SERVER_URL }}
       APP_ID: ${{ vars.APP_ID }}
       APP_NAME: ${{ vars.APP_NAME }}
+      APP_VERSION: ${{ vars.APP_VERSION }} # 🆕 Added here
       ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
       ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
 
@@ -69,11 +70,22 @@ jobs:
         set -euo pipefail
         rm -rf android && npx --no-install cap add android
         mkdir -p assets
-        if [ -f "appmachine/icon.png" ]; then
-          echo "✅ Custom icon found"
-          for f in logo logo-dark splash splash-dark; do cp "appmachine/icon.png" "assets/$f.png"; done
+        
+        # Smart Icon Selection
+        ICON="appmachine/icon.png"
+        if [[ "${{ github.ref }}" == "refs/tags/androiddev" && -f "appmachine/icon.dev.png" ]]; then
+          echo "🎨 Dev Build detected: Using icon.dev.png"
+          ICON="appmachine/icon.dev.png"
+        fi
+
+        if [ -f "$ICON" ]; then
+          echo "✅ Generating assets from: $ICON"
+          for f in logo logo-dark splash splash-dark; do cp "$ICON" "assets/$f.png"; done
           npx --no-install capacitor-assets generate --android --assetPath assets
+        else
+          echo "⚠️ No icon found at $ICON - skipping asset generation"
         fi
+        
         npx --no-install cap sync android
 
     - name: 🔐 Configure Signing
@@ -102,6 +114,31 @@ jobs:
           if (!s.includes("signing.gradle")) fs.appendFileSync(p, "\napply from: \"signing.gradle\"\n");
         '
 
+    - name: 🔧 Update Version
+      run: |
+        # Updates versionCode (to Run Number) and versionName (if APP_VERSION set)
+        node -e '
+          const fs = require("fs");
+          const p = "android/app/build.gradle";
+          let s = fs.readFileSync(p, "utf8");
+          
+          // 1. Version Code (Build Number)
+          const buildNum = process.env.GITHUB_RUN_NUMBER;
+          console.log(`🔢 Updating versionCode to: ${buildNum}`);
+          s = s.replace(/versionCode\s+\d+/, `versionCode ${buildNum}`);
+          
+          // 2. Version Name (Marketing Version) - Only if APP_VERSION is set
+          const vName = process.env.APP_VERSION;
+          if (vName) {
+             console.log(`🚀 Updating versionName to: ${vName}`);
+             s = s.replace(/versionName\s+"[^"]+"/, `versionName "${vName}"`);
+          } else {
+             console.log("ℹ️ APP_VERSION not set; keeping existing versionName");
+          }
+          
+          fs.writeFileSync(p, s);
+        '
+
     - name: 🏗️ Gradle Build
       run: |
         set -euo pipefail

package/src/ios.yml

@@ -15,6 +15,7 @@ jobs:
       APP_SERVER_URL: ${{ vars.APP_SERVER_URL }}
       APP_ID: ${{ vars.APP_ID }}
       APP_NAME: ${{ vars.APP_NAME }}
+      APP_VERSION: ${{ vars.APP_VERSION }}
       IOS_CERT_BASE64: ${{ secrets.IOS_CERT_BASE64 }}
       IOS_CERT_PASSWORD: ${{ secrets.IOS_CERT_PASSWORD }}
       IOS_PROFILE_BASE64: ${{ secrets.IOS_PROFILE_BASE64 }}
@@ -74,11 +75,22 @@ jobs:
           npx --no-install cap add ios
         fi
 
+        # 4. Assets (Smart Icon Selection)
         mkdir -p assets
-        if [ -f "appmachine/icon.png" ]; then
-          echo "✅ Custom icon found"
-          for f in logo logo-dark splash splash-dark; do cp "appmachine/icon.png" "assets/$f.png"; done
+        ICON="appmachine/icon.png"
+
+        # Logic: If tag is "iosdev" AND "icon.dev.png" exists, use it.
+        if [[ "${{ github.ref }}" == "refs/tags/iosdev" && -f "appmachine/icon.dev.png" ]]; then
+          echo "🎨 Dev Build detected: Using icon.dev.png"
+          ICON="appmachine/icon.dev.png"
+        fi
+
+        if [ -f "$ICON" ]; then
+          echo "✅ Generating assets from: $ICON"
+          for f in logo logo-dark splash splash-dark; do cp "$ICON" "assets/$f.png"; done
           npx --no-install capacitor-assets generate --ios --assetPath assets
+        else
+          echo "⚠️ No icon found at $ICON - skipping asset generation"
         fi
 
         npx --no-install cap sync ios
@@ -146,13 +158,22 @@ jobs:
         echo "📂 ios/App contents:"
         ls -la ios/App
 
-        # 1. Bump Build Number
+        # 1. Update Marketing Version (Only if APP_VERSION exists)
+        if [ -n "${APP_VERSION:-}" ]; then
+          echo "🚀 Updating Marketing Version to: $APP_VERSION"
+          /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $APP_VERSION" ios/App/App/Info.plist \
+            || /usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string $APP_VERSION" ios/App/App/Info.plist
+        else
+          echo "ℹ️  APP_VERSION not set; keeping existing ShortVersionString"
+        fi
+
+        # 2. Update Build Number
         BUILD_NUM="${{ github.run_number }}"
         echo "🔢 Updating CFBundleVersion to: $BUILD_NUM"
         /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $BUILD_NUM" ios/App/App/Info.plist \
           || /usr/libexec/PlistBuddy -c "Add :CFBundleVersion string $BUILD_NUM" ios/App/App/Info.plist
 
-        # 2. Set Non-Exempt Encryption to NO
+        # 3. Set Non-Exempt Encryption to NO
         echo "🚫 Setting ITSAppUsesNonExemptEncryption = NO"
         /usr/libexec/PlistBuddy -c "Set :ITSAppUsesNonExemptEncryption false" ios/App/App/Info.plist \
           || /usr/libexec/PlistBuddy -c "Add :ITSAppUsesNonExemptEncryption bool false" ios/App/App/Info.plist