From 6452cea4efad0698573e5393294670d183bf53ef Mon Sep 17 00:00:00 2001
From: jcesarmobile <jcesarmobile@gmail.com>
Date: Wed, 10 Nov 2021 19:05:56 +0100
Subject: [PATCH 1/2] fix(cli): sync gradle from android folder

---
 cli/src/android/add.ts | 12 ++++++------
 cli/src/tasks/add.ts   |  5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/cli/src/android/add.ts b/cli/src/android/add.ts
index 97681f05b..e4f88f7dd 100644
--- a/cli/src/android/add.ts
+++ b/cli/src/android/add.ts
@@ -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 = `
@@ -57,5 +55,7 @@ sdk.dir=${defaultAndroidPath}
 }
 
 async function gradleSync(platformDir: string) {
-  await runCommand(`${platformDir}/gradlew`, []);
+  await runCommand(`./gradlew`, [], {
+    cwd: platformDir,
+  });
 }
diff --git a/cli/src/tasks/add.ts b/cli/src/tasks/add.ts
index 54cc362b6..5e4d34c87 100644
--- a/cli/src/tasks/add.ts
+++ b/cli/src/tasks/add.ts
@@ -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,
@@ -105,6 +105,9 @@ export async function addCommand(
 
       if (await pathExists(config.app.webDirAbs)) {
         await sync(config, platformName, false);
+        await runTask('Syncing Gradle', async () => {
+          return createLocalProperties(config.android.platformDirAbs);
+        });
       } else {
         logger.warn(
           `${c.success(c.strong('sync'))} could not run--missing ${c.strong(

From 261e308415e575c64346eb72cbd6335e08dfb548 Mon Sep 17 00:00:00 2001
From: jcesarmobile <jcesarmobile@gmail.com>
Date: Wed, 10 Nov 2021 19:43:30 +0100
Subject: [PATCH 2/2] gradle sync android only

---
 cli/src/tasks/add.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cli/src/tasks/add.ts b/cli/src/tasks/add.ts
index 5e4d34c87..e027eb528 100644
--- a/cli/src/tasks/add.ts
+++ b/cli/src/tasks/add.ts
@@ -105,9 +105,11 @@ export async function addCommand(
 
       if (await pathExists(config.app.webDirAbs)) {
         await sync(config, platformName, false);
-        await runTask('Syncing Gradle', async () => {
-          return createLocalProperties(config.android.platformDirAbs);
-        });
+        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(