Skip to content

Commit

Permalink
fix(cli): sync gradle from android folder (#5233)
Browse files Browse the repository at this point in the history
  • Loading branch information
jcesarmobile authored Nov 11, 2021
1 parent 67a996c commit cd779c4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
12 changes: 6 additions & 6 deletions cli/src/android/add.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@ export async function addAndroid(config: Config): Promise<void> {
);
},
);

await runTask('Syncing Gradle', async () => {
return createLocalProperties(config.android.platformDirAbs);
});
}

async function createLocalProperties(platformDir: string) {
export async function createLocalProperties(
platformDir: string,
): Promise<void> {
const defaultAndroidPath = join(homedir(), 'Library/Android/sdk');
if (await pathExists(defaultAndroidPath)) {
const localSettings = `
Expand Down Expand Up @@ -57,5 +55,7 @@ sdk.dir=${defaultAndroidPath}
}

async function gradleSync(platformDir: string) {
await runCommand(`${platformDir}/gradlew`, []);
await runCommand(`./gradlew`, [], {
cwd: platformDir,
});
}
7 changes: 6 additions & 1 deletion cli/src/tasks/add.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { pathExists } from '@ionic/utils-fs';
import { prettyPath } from '@ionic/utils-terminal';

import { addAndroid } from '../android/add';
import { addAndroid, createLocalProperties } from '../android/add';
import {
editProjectSettingsAndroid,
checkAndroidPackage,
Expand Down Expand Up @@ -105,6 +105,11 @@ export async function addCommand(

if (await pathExists(config.app.webDirAbs)) {
await sync(config, platformName, false);
if (platformName === config.android.name) {
await runTask('Syncing Gradle', async () => {
return createLocalProperties(config.android.platformDirAbs);
});
}
} else {
logger.warn(
`${c.success(c.strong('sync'))} could not run--missing ${c.strong(
Expand Down

0 comments on commit cd779c4

Please sign in to comment.