codeplay-common 3.0.4 → 3.0.5

package/files/buildCodeplay/apk-store-builder.js

@@ -0,0 +1,92 @@
+const { spawn } = require("child_process");
+const path = require("path");
+const fs = require("fs");
+
+// Paths
+//const projectRoot = path.join(__dirname, "..");
+const projectRoot = process.cwd();
+const androidPath = path.join(projectRoot, "android");
+const capacitorConfigPath = path.join(projectRoot, "capacitor.config.json");
+
+// Read capacitor.config.json
+if (!fs.existsSync(capacitorConfigPath)) {
+  console.error("❌ capacitor.config.json not found!");
+  process.exit(1);
+}
+
+const config = JSON.parse(fs.readFileSync(capacitorConfigPath, "utf8"));
+
+const buildOptions = config.android?.buildOptions;
+
+if (!buildOptions) {
+  console.error("❌ android.buildOptions not found in capacitor.config.json");
+  process.exit(1);
+}
+
+// Resolve keystore path (relative → absolute)
+
+
+const storePassword = buildOptions.keystorePassword;
+const keyAlias = buildOptions.keystoreAlias;
+const keyPassword = buildOptions.keystoreAliasPassword;
+
+
+
+
+
+
+const rawKeystorePath = buildOptions.keystorePath;
+
+// First try normal resolve
+let keystorePath = path.resolve(projectRoot, rawKeystorePath);
+
+// If not found, try trimming one "../"
+if (!fs.existsSync(keystorePath)) {
+  console.log("⚠️ Keystore not found, attempting path correction...");
+
+  const trimmedPath = rawKeystorePath.replace(/^\.\.\//, ""); 
+  keystorePath = path.resolve(projectRoot, trimmedPath);
+}
+
+// Final validation
+if (!fs.existsSync(keystorePath)) {
+  console.error("❌ Keystore file not found even after correction:", keystorePath);
+  process.exit(1);
+}
+
+console.log("🔐 Using keystore:", keystorePath);
+
+
+
+
+
+
+
+
+
+
+// Gradle args
+const args = [
+  "/c",
+  "gradlew.bat",
+  "assembleRelease",
+  `-Pandroid.injected.signing.store.file=${keystorePath}`,
+  `-Pandroid.injected.signing.store.password=${storePassword}`,
+  `-Pandroid.injected.signing.key.alias=${keyAlias}`,
+  `-Pandroid.injected.signing.key.password=${keyPassword}`,
+];
+
+// Run Gradle
+const gradle = spawn("cmd.exe", args, {
+  cwd: androidPath,
+  stdio: "inherit",
+});
+
+gradle.on("close", (code) => {
+  if (code === 0) {
+    console.log("\n✅ Signed APK Generated Successfully!");
+  } else {
+    console.log("\n❌ Build Failed with code:", code);
+    process.exit(code);
+  }
+});

package/files/finalrelease

@@ -390,7 +390,7 @@ function writeCapacitorConfig(config) {
     fs.writeFileSync(capacitorConfigPath, JSON.stringify(config, null, 2), 'utf8');
 }
 
-function updateCapacitorConfig(releaseType, signingType) {
+/* function updateCapacitorConfig(releaseType, signingType) {
     const config = readCapacitorConfig();
 
     // Save original values once
@@ -405,9 +405,9 @@ function updateCapacitorConfig(releaseType, signingType) {
 
     writeCapacitorConfig(config);
     console.log(`ℹ️ capacitor.config.json updated: releaseType=${releaseType}, signingType=${signingType}`);
-}
+} */
 
-function restoreCapacitorConfig() {
+/* function restoreCapacitorConfig() {
     const config = readCapacitorConfig();
     if (originalReleaseType !== undefined) config.android.buildOptions.releaseType = originalReleaseType;
     if (originalSigningType !== undefined) config.android.buildOptions.signingType = originalSigningType;
@@ -423,7 +423,7 @@ process.on('SIGINT', () => {
 
 process.on('exit', () => {
     restoreCapacitorConfig();
-});
+}); */
 
 
 
@@ -690,20 +690,33 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
                 let buildType = ["VivoStore","OppoStore","MiStore"].includes(storeName) ? "APK" : "AAB";
                 let signingType = buildType === "APK" ? "apksigner" : "jarsigner";
 
-                // Update capacitor.config.json for this store
-                updateCapacitorConfig(buildType, signingType);
+                // Update capacitor.config.json for this store - This is not needed
+                //updateCapacitorConfig(buildType, signingType);
 
 
 
+/*                 execSync('npx cap sync android', { stdio: 'inherit' });
+                execSync(`npx cap build android --androidreleasetype=${buildType}`, { stdio: 'inherit' }); */
+
+
                 execSync('npx cap sync android', { stdio: 'inherit' });
-                execSync(`npx cap build android --androidreleasetype=${buildType}`, { stdio: 'inherit' });
+
+                if (buildType === "APK") {
+                    console.log("📦 Using custom Node signing script for APK build...");
+                    execSync('node buildCodeplay/apk-store-builder.js', { stdio: 'inherit' });
+                } else {
+                    execSync(`npx cap build android --androidreleasetype=${buildType}`, { stdio: 'inherit' });
+                }
+
+
 
                 // Determine output paths
                 let oldFilePath;
                 let newExt = buildType === "APK" ? "apk" : "aab";
 
                 if (buildType === "APK") {
-                    oldFilePath = join("android", "app", "build", "outputs", "apk", "release", "app-release-signed.apk");
+                    //oldFilePath = join("android", "app", "build", "outputs", "apk", "release", "app-release-signed.apk");
+                    oldFilePath = join("android", "app", "build", "outputs", "apk", "release", "app-release.apk");
                 } else {
                     oldFilePath = join("android", "app", "build", "outputs", "bundle", "release", "app-release-signed.aab");
                 }
@@ -848,8 +861,8 @@ function updateAndroidManifest(store, addPermission) {
     }
 }
 
-restoreCapacitorConfig();
-console.log("🏁 All builds completed, capacitor.config.json restored.");
+/* restoreCapacitorConfig();
+console.log("🏁 All builds completed, capacitor.config.json restored."); */
 
 
 /* function updateAndroidManifest1(store, addPermission) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeplay-common",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "Common build scripts and files",
   "scripts": {
 	"postinstall": "node scripts/sync-files.js",