Skip to content

Commit 604f2ae

Browse files
committed
execute "android update project"
1 parent 806aa30 commit 604f2ae

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

lib/services/project-service.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,8 @@ class AndroidProjectService implements IAndroidProjectService {
212212
shell.cp("-r", path.join(this.frameworkDir, "libs"), projectDir);
213213
shell.cp("-r", path.join(this.frameworkDir, "res"), projectDir);
214214

215-
shell.cp("-f", path.join(this.frameworkDir, ".classpath"), projectDir);
216215
shell.cp("-f", path.join(this.frameworkDir, ".project"), projectDir);
217216
shell.cp("-f", path.join(this.frameworkDir, "AndroidManifest.xml"), projectDir);
218-
shell.cp("-f", path.join(this.frameworkDir, "project.properties"), projectDir);
219217

220218
// Interpolate the activity name and package
221219
shell.sed('-i', /__NAME__/, projectData.projectName, path.join(projectDir, 'res', 'values', 'strings.xml'));
@@ -226,9 +224,19 @@ class AndroidProjectService implements IAndroidProjectService {
226224
// Copy app into assets
227225
shell.cp("-r", path.join(projectData.projectDir, ProjectService.APP_FOLDER_NAME), path.join(projectDir, "assets"));
228226

227+
this.runAndroidUpdate(projectDir, targetApi).wait();
228+
229+
this.$logger.out("Project successfully created.");
230+
229231
}).future<any>()();
230232
}
231233

234+
private runAndroidUpdate(projectPath: string, targetApi): IFuture<void> {
235+
return (() => {
236+
this.$childProcess.exec("android update project --subprojects --path " + projectPath + " --target " + targetApi).wait();
237+
}).future<void>()();
238+
}
239+
232240
private validatePackageName(packageName: string): boolean {
233241
//Make the package conform to Java package types
234242
//Enforce underscore limitation

0 commit comments

Comments
 (0)