@livx.cc/appwrap 0.39.10 → 0.39.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livx.cc/appwrap",
-  "version": "0.39.10",
+  "version": "0.39.12",
   "description": "Wrap any PWA into a native app with native capabilities (appwrap runtime + @livx.cc/native-kit).",
   "license": "MIT",
   "author": "Elya Livshitz",

package/src/cli.ts

@@ -1259,13 +1259,45 @@ async function dev(cwd: string, flags: Record<string, string>): Promise<void> {
  * install when node_modules is absent — if ns later reinstalls on package.json drift it uses npm
  * (NativeScript has no bun package-manager mode), so trustedDependencies in the shell package.json
  * is what keeps the bun-installed tree behaving like npm's (parcel/watcher, ns CLI hooks). */
+/** Resolve a usable Android SDK dir: an already-valid ANDROID_HOME/ANDROID_SDK_ROOT, else the first
+ * common install location that actually contains an SDK. Lets `deploy/run android` work without the
+ * user having exported ANDROID_HOME in their shell (the #1 "ns can't find the SDK" foot-gun). */
+function resolveAndroidSdk(): string | undefined {
+  const env = process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT;
+  if (env && existsSync(env)) return env;
+  const home = process.env.HOME || '';
+  const candidates = [
+    join(home, 'Library/Android/sdk'),    // macOS (Android Studio default)
+    join(home, 'Library/Android/Sdk'),
+    join(home, 'Android/Sdk'),            // Linux (Android Studio default)
+    '/usr/local/share/android-sdk',       // homebrew cask
+    '/opt/android-sdk',
+  ];
+  // A usable SDK has platform-tools (adb) or installed platforms; cmdline-tools-only dirs don't count.
+  return candidates.find((d) => existsSync(join(d, 'platform-tools')) || existsSync(join(d, 'platforms')));
+}
+
 function runNs(outDir: string, args: string[]): void {
+  const env: NodeJS.ProcessEnv = { ...process.env };
+  // Android: inject a discovered SDK so `ns` finds it even when the user's shell never exported
+  // ANDROID_HOME (new terminal not sourced, conda base shell, etc.) — the common deploy blocker.
+  if (args.includes('android')) {
+    const sdk = resolveAndroidSdk();
+    if (sdk) {
+      env.ANDROID_HOME = sdk;
+      env.ANDROID_SDK_ROOT = sdk;
+      env.PATH = [process.env.PATH, join(sdk, 'platform-tools'), join(sdk, 'emulator')].filter(Boolean).join(':');
+      if (!process.env.ANDROID_HOME) console.log(`  android SDK ← ${sdk}  (ANDROID_HOME not set; auto-detected)`);
+    } else {
+      console.warn('  ⚠ No Android SDK found (set ANDROID_HOME). Install Android Studio or the command-line tools, then `sdkmanager "platform-tools" "platforms;android-35" "build-tools;35.0.0"`.');
+    }
+  }
   if (!existsSync(join(outDir, 'node_modules'))) {
     console.log(`▶ bun install  (cwd: ${outDir})`);
-    execFileSync('bun', ['install'], { cwd: outDir, stdio: 'inherit' });
+    execFileSync('bun', ['install'], { cwd: outDir, stdio: 'inherit', env });
   }
   console.log(`▶ ns ${args.join(' ')}  (cwd: ${outDir})`);
-  execFileSync('ns', args, { cwd: outDir, stdio: 'inherit' });
+  execFileSync('ns', args, { cwd: outDir, stdio: 'inherit', env });
 }
 
 /** Read the loader currently stamped into the generated shell (app/shell/config.ts). Used to

package/templates/ci/github/workflows/appwrap-release-android.yml

@@ -30,17 +30,28 @@ jobs:
         with: { node-version: 22 }
       - uses: actions/setup-java@v4
         with: { distribution: temurin, java-version: 17 }
+      # Cache the Gradle distribution + dependency/build caches — the Android build is ~70% of CI time;
+      # without this every run re-downloads everything (~4–5 min). Warms on the first run.
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('bun.lock', 'package.json') }}
+          restore-keys: gradle-${{ runner.os }}-
       - uses: android-actions/setup-android@v3
+      - run: sudo apt-get update -qq && sudo apt-get install -y -qq imagemagick   # appwrap icon-gen needs an image tool (no sips on Linux) — else the default NS icon ships
       - run: bun install && bun run build        # → dist/ (the PWA bundle the wrapper ships)
       # Pin global tools — unpinned installs can grab a breaking release mid-flight. Bump deliberately.
-      - run: npm i -g nativescript@9.0.6
+      - run: bun add -g nativescript@9.0.6
       - run: bunx @livx.cc/appwrap init                      # native/ is generated (gitignored) — regenerate fresh in CI
       - working-directory: native
-        run: npm install
+        run: bun install
       - name: Decode upload keystore
         run: echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > "$RUNNER_TEMP/upload.keystore"
       - name: Build signed AAB
         env:
+          GRADLE_OPTS: "-Dorg.gradle.caching=true -Dorg.gradle.parallel=true -Dorg.gradle.daemon=false"
           APPWRAP_ANDROID_KEYSTORE: ${{ runner.temp }}/upload.keystore
           APPWRAP_ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
           APPWRAP_ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}