Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions cli/src/tasks/migrate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,6 @@ export async function migrateCommand(config: Config, noprompt: boolean, packagem
join(config.android.platformDirAbs, 'gradle', 'wrapper', 'gradle-wrapper.properties'),
);

await runTask(`Migrating root build.gradle file.`, () => {
return updateBuildGradle(join(config.android.platformDirAbs, 'build.gradle'), variablesAndClasspaths);
});

await runTask(`Migrating app build.gradle file.`, () => {
return updateAppBuildGradle(join(config.android.appDirAbs, 'build.gradle'));
});
Expand All @@ -227,6 +223,7 @@ export async function migrateCommand(config: Config, noprompt: boolean, packagem
})();
});

// Always run before root build.gradle changes as the AGP update could be incompatible with current gradle
if (!installFailed && gte(gradleVersion, gradleWrapperVersion)) {
try {
await runTask(`Upgrading gradle wrapper`, () => {
Expand All @@ -253,6 +250,10 @@ export async function migrateCommand(config: Config, noprompt: boolean, packagem
logger.warn('Skipped upgrading gradle wrapper files');
}

await runTask(`Migrating root build.gradle file.`, () => {
return updateBuildGradle(join(config.android.platformDirAbs, 'build.gradle'), variablesAndClasspaths);
});

// Variables gradle
await runTask(`Migrating variables.gradle file.`, () => {
return (async (): Promise<void> => {
Expand Down
Loading