litruv/cinny-mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 52 Wiki Activity

fix: patch capacitor.settings.gradle after cap sync (sed, post-prepare)
All checks were successful
Build / increment-version (push) Successful in 5s
Details
Build / build-android (push) Successful in 4m25s
Details
Build / create-release (push) Successful in 7s
Details

Browse Source
This commit is contained in:
Litruv
2026-04-07 16:01:49 +10:00
parent 5c0b649ddc
commit 6a87b449da
2 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package.json
View File

@@ -7,15 +7,16 @@
},
"scripts": {
"android:prepare": "node scripts/apply-overlay.mjs && cd cinny && npm install && npm run build && npx cap sync android",
"android:patch-settings:linux": "sed -i 's|../node_modules/|../cinny/node_modules/|g' android/capacitor.settings.gradle",
"android:restore": "node scripts/restore-cinny.mjs",
"android:open": "cd cinny && npx cap open android",
"android:run": "cd cinny && npx cap run android",
"android:apk": "npm run android:prepare && cd cinny/android && gradlew.bat assembleDebug && cd ../.. && node scripts/restore-cinny.mjs",
"android:apk:linux": "npm run android:prepare && cd cinny/android && ./gradlew assembleDebug && cd ../.. && node scripts/restore-cinny.mjs",
"android:apk:linux": "npm run android:prepare && npm run android:patch-settings:linux && cd cinny/android && ./gradlew assembleDebug && cd ../.. && node scripts/restore-cinny.mjs",
"android:apk:release": "npm run android:prepare && cd cinny/android && gradlew.bat assembleRelease && cd ../.. && node scripts/restore-cinny.mjs",
"android:apk:release:linux": "npm run android:prepare && cd cinny/android && ./gradlew assembleRelease && cd ../.. && node scripts/restore-cinny.mjs",
"android:apk:release:linux": "npm run android:prepare && npm run android:patch-settings:linux && cd cinny/android && ./gradlew assembleRelease && cd ../.. && node scripts/restore-cinny.mjs",
"android:aab": "npm run android:prepare && cd cinny/android && gradlew.bat bundleRelease && cd ../.. && node scripts/restore-cinny.mjs",
"android:aab:linux": "npm run android:prepare && cd cinny/android && ./gradlew bundleRelease && cd ../.. && node scripts/restore-cinny.mjs"
"android:aab:linux": "npm run android:prepare && npm run android:patch-settings:linux && cd cinny/android && ./gradlew bundleRelease && cd ../.. && node scripts/restore-cinny.mjs"
},
"keywords": [],
"author": {

21
scripts/apply-overlay.mjs
View File

@@ -9,9 +9,6 @@
* 5. Copies capacitor.config.json (root) into cinny/capacitor.config.json with webDir reset to "dist"
* 6. Creates a cinny/android symlink/junction -> root android/ so Capacitor can find it
* 7. Writes android/local.properties from ANDROID_HOME env var (so it works on any machine)
* 8. Patches android/capacitor.settings.gradle to use ../cinny/node_modules instead of
* ../node_modules, so Gradle resolves the correct path on both Windows (junction) and
* Linux (symlink, where Java resolves CWD to the real ROOT/android/ path)
*
* Run before every Android build to keep the cinny submodule clean while layering
* the Capacitor / Android platform changes on top of it.
@@ -136,22 +133,4 @@ if (androidHome) {
console.warn('[apply-overlay] Warning: ANDROID_HOME not set, skipping local.properties update');
}
// 8. Patch android/capacitor.settings.gradle to use ../cinny/node_modules
// On Linux, Java resolves the symlink for CWD so Gradle sees ROOT/android/ as its project
// directory, making ../node_modules point to ROOT/node_modules (wrong). On Windows, the
// junction keeps the logical path cinny/android so ../node_modules resolves correctly to
// cinny/node_modules. Patching to ../cinny/node_modules works on both:
// Linux: ROOT/android/../cinny/node_modules = ROOT/cinny/node_modules ✓
// Windows: cinny/android/../cinny/node_modules = cinny/node_modules ✓
console.log('[apply-overlay] Patching android/capacitor.settings.gradle...');
const capSettingsPath = join(androidTarget, 'capacitor.settings.gradle');
const original = readFileSync(capSettingsPath, 'utf8');
const patched = original.replaceAll('../node_modules/', '../cinny/node_modules/');
if (patched !== original) {
writeFileSync(capSettingsPath, patched, 'utf8');
console.log(' patched ../node_modules/ -> ../cinny/node_modules/');
} else {
console.log(' already patched or no replacements needed');
}
console.log('[apply-overlay] Done.');